diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
index b3e9a15b0f..2208a97f9d 100644
--- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
+++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
@@ -90,6 +90,7 @@ import com.vividsolutions.jts.geom.prep.PreparedGeometry;
  *                                         refactored WarngenLayer::filterArea.
  *    Mar  9, 2014 ASM #17190  D. Friedman Use fipsField and areaField for unique area ID.
  *    May  7, 2015 ASM #17438  D. Friedman Clean up debug and performance logging.
+ *    Dec 15, 2015 ASM #17933 mgamazaychikov Update calculation of partOfParentRegion.
  * </pre>
  * 
  * @author chammack
@@ -267,7 +268,7 @@ public class Area {
                         .get(parentAreaField));
                 String feArea = (String) regionFeature.attributes
                         .get("FE_AREA");
-                area.partOfParentRegion = converFeAreaToPartList(feArea);
+                area.partOfParentRegion = Arrays.asList(feArea);
             }
 
             // Search against point matches
diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/WatchUtil.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/WatchUtil.java
index 4ec890af5f..0e6260c54e 100644
--- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/WatchUtil.java
+++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/WatchUtil.java
@@ -91,6 +91,7 @@ import com.vividsolutions.jts.geom.Polygon;
  * May  7, 2015 ASM #17438 D. Friedman  Clean up debug and performance logging.
  * Jun 04, 2015 RODO #4522 randerso     Added proper primary key to ActiveTableRecord
  * Jul 16, 2015 ASM #17741 D. Friedman  Use acceptable timestamp format in query
+ * Dec 15, 2015 ASM #17933 mgamazaychikov Return feAreas from determineAffectedPortions.
  * </pre>
  * 
  * @author jsanchez
@@ -556,9 +557,7 @@ public class WatchUtil {
             }
         }
 
-        Set<String> affectedPortions = new HashSet(
-                Area.converFeAreaToPartList(mungeFeAreas(feAreas)));
-        return affectedPortions;
+        return feAreas;
     }
 
     private List<Watch> generateMarineWatchItems(Watch template,
diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
index fd5ba0ba91..c2a8e763f6 100644
--- a/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
+++ b/edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
@@ -65,6 +65,7 @@ import com.raytheon.uf.edex.database.dao.DaoConfig;
  * Dec 08, 2014  #4953     randerso    Updated Jep include path to allow use of
  *                                     LocalizationSupport
  * Jul 13, 2015   4500     rjpeter     Fix SQL Injection concerns.
+ * Dec 15, 2015 RM17933 mgamazaychikov Add four new corners to PART_OF_STATE.
  * </pre>
  * 
  * @author wldougher
@@ -121,6 +122,10 @@ public class AreaDictionaryMaker {
         PART_OF_STATE.put("wc", "west central");
         PART_OF_STATE.put("wu", "western upper");
         PART_OF_STATE.put("ww", "western");
+        PART_OF_STATE.put("ws", "southwest");
+        PART_OF_STATE.put("es", "southeast");
+        PART_OF_STATE.put("wn", "northwest");
+        PART_OF_STATE.put("en", "northeast");
     }
 
     protected IPathManager pathMgr = PathManagerFactory.getPathManager();
@@ -426,4 +431,4 @@ public class AreaDictionaryMaker {
             statusHandler.error(e.getLocalizedMessage(), e);
         }
     }
-}
\ No newline at end of file
+}