diff --git a/build/rsync.cave b/build/rsync.cave
index 54e7066a15..0700a45fee 100644
--- a/build/rsync.cave
+++ b/build/rsync.cave
@@ -31,3 +31,7 @@ javaUtilities/* rpms pythonPackages
 ../awips2-ogc/foss/*
 ../awips2-ogc/edex/*
 ../awips2-ogc/features/*
+../awips2-nws/edex/*
+../awips2-nws/common/*
+../awips2-nws/features/*
+../awips2-nws/viz/*
diff --git a/cave/build/features.txt b/cave/build/features.txt
index 3d6457ff18..f5505397a2 100644
--- a/cave/build/features.txt
+++ b/cave/build/features.txt
@@ -54,3 +54,4 @@ com.raytheon.uf.viz.d2d.skewt.feature
 com.raytheon.uf.viz.server.edex.feature
 com.raytheon.uf.viz.dataplugin.nswrc.feature
 edu.wisc.ssec.cimss.viz.probsevere.feature
+gov.noaa.nws.sti.mdl.viz.griddednucaps.feature
diff --git a/cave/build/p2-build.xml b/cave/build/p2-build.xml
index a0c3d771aa..149d95ce39 100644
--- a/cave/build/p2-build.xml
+++ b/cave/build/p2-build.xml
@@ -304,6 +304,9 @@
 		<antcall target="p2.build.repo">
 			<param name="feature" value="edu.wisc.ssec.cimss.viz.probsevere.feature" />
 		</antcall>
+                <antcall target="p2.build.repo">
+                        <param name="feature" value="gov.noaa.nws.sti.mdl.viz.griddednucaps.feature" />
+                </antcall>
 		<antcall target="cleanup.features" />
 	</target>
 
diff --git a/cave/com.raytheon.uf.viz.npp.feature/feature.xml b/cave/com.raytheon.uf.viz.npp.feature/feature.xml
index 8120c845ea..144acb07e2 100644
--- a/cave/com.raytheon.uf.viz.npp.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.npp.feature/feature.xml
@@ -39,5 +39,11 @@
          install-size="0"
          version="0.0.0"/>
 
+   <plugin
+         id="gov.noaa.nws.sti.mdl.viz.griddednucaps"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
 
 </feature>
diff --git a/cave/com.raytheon.viz.feature.awips.developer/feature.xml b/cave/com.raytheon.viz.feature.awips.developer/feature.xml
index 1dbbbd420c..0822425fa6 100644
--- a/cave/com.raytheon.viz.feature.awips.developer/feature.xml
+++ b/cave/com.raytheon.viz.feature.awips.developer/feature.xml
@@ -249,6 +249,10 @@
          id="edu.wisc.ssec.cimss.viz.probsevere.feature"
          version="0.0.0"/>
 
+   <includes
+         id="gov.noaa.nws.sti.mdl.viz.griddednucaps.feature"
+         version="0.0.0"/>
+
    <requires>
       <import feature="com.raytheon.uf.viz.application.feature" version="1.0.0.qualifier"/>
    </requires>
diff --git a/cave/com.raytheon.viz.product.awips/about.mappings b/cave/com.raytheon.viz.product.awips/about.mappings
index 47ce51dfb3..776a0b2e0d 100644
--- a/cave/com.raytheon.viz.product.awips/about.mappings
+++ b/cave/com.raytheon.viz.product.awips/about.mappings
@@ -1,3 +1,3 @@
-0=20.3.2-0.4
-1=Wed Jun 28 20:21:00 GMT 2023
+0=20.3.2-1
+1=Thu Nov 16 20:24:09 GMT 2023
 2=CentOS Linux release 7.9.2009 (Core)
diff --git a/cave/com.raytheon.viz.product.awips/awips.product b/cave/com.raytheon.viz.product.awips/awips.product
index e6dcb3f56a..ffd5ad9f36 100644
--- a/cave/com.raytheon.viz.product.awips/awips.product
+++ b/cave/com.raytheon.viz.product.awips/awips.product
@@ -129,6 +129,7 @@
       <feature id="com.raytheon.uf.viz.fssobs.feature"/>
       <feature id="edu.wisc.ssec.cimss.viz.probsevere.feature"/>
       <feature id="com.raytheon.uf.viz.satellite.goesr.feature" installMode="root"/>
+      <feature id="gov.noaa.nws.sti.mdl.viz.griddednucaps.feature" installMode="root"/>
    </features>
 
    <configurations>
diff --git a/dist/comps.xml b/dist/comps.xml
index ce39aedb90..785df920a3 100755
--- a/dist/comps.xml
+++ b/dist/comps.xml
@@ -74,6 +74,7 @@
          <packagereq type="mandatory">awips2-edex-dat</packagereq>
          <packagereq type="mandatory">awips2-edex-dataplugins</packagereq>
          <packagereq type="mandatory">awips2-edex-gfe</packagereq>
+         <packagereq type="mandatory">awips2-edex-griddednucaps</packagereq>
          <packagereq type="mandatory">awips2-edex-hydro</packagereq>
          <packagereq type="mandatory">awips2-edex-ost</packagereq>
          <packagereq type="mandatory">awips2-edex-radar</packagereq>
@@ -243,6 +244,7 @@
          <packagereq type="mandatory">awips2-edex-mping</packagereq>
          <packagereq type="mandatory">awips2-edex-nswrc-radar</packagereq>
          <packagereq type="mandatory">awips2-edex-grid</packagereq>
+         <packagereq type="mandatory">awips2-edex-griddednucaps</packagereq>
          <packagereq type="mandatory">awips2-edex-ogc-core</packagereq>
          <packagereq type="mandatory">awips2-edex-ogc-wfs</packagereq>
          <packagereq type="mandatory">awips2-edex-glmdecoder</packagereq>
@@ -858,6 +860,7 @@
          <packagereq type="mandatory">awips2-edex-dataplugins</packagereq>
          <packagereq type="mandatory">awips2-edex-dataprovideragent</packagereq>
          <packagereq type="mandatory">awips2-edex-grid</packagereq>
+         <packagereq type="mandatory">awips2-edex-griddednucaps</packagereq>
          <packagereq type="mandatory">awips2-edex-ogc-core</packagereq>
          <packagereq type="mandatory">awips2-edex-ogc-wfs</packagereq>
          <packagereq type="mandatory">awips2-edex</packagereq>
@@ -968,6 +971,7 @@
          <packagereq type="default">awips2-edex-dat</packagereq>
          <packagereq type="default">awips2-edex-dataplugins</packagereq>
          <packagereq type="default">awips2-edex-gfe</packagereq>
+         <packagereq type="default">awips2-edex-griddednucaps</packagereq>
          <packagereq type="default">awips2-edex-hydro</packagereq>
          <packagereq type="default">awips2-edex-ost</packagereq>
          <packagereq type="default">awips2-edex-probsevere</packagereq>
@@ -1103,6 +1107,7 @@
          <packagereq type="mandatory">awips2-edex-dat</packagereq>
          <packagereq type="mandatory">awips2-edex-dataplugins</packagereq>
          <packagereq type="mandatory">awips2-edex-gfe</packagereq>
+         <packagereq type="mandatory">awips2-edex-griddednucaps</packagereq>
          <packagereq type="mandatory">awips2-edex-hydro</packagereq>
          <packagereq type="mandatory">awips2-edex-ost</packagereq>
          <packagereq type="mandatory">awips2-edex-probsevere</packagereq>
diff --git a/edexOsgi/build.edex/build.xml b/edexOsgi/build.edex/build.xml
index 005b46326b..157701c31d 100644
--- a/edexOsgi/build.edex/build.xml
+++ b/edexOsgi/build.edex/build.xml
@@ -314,6 +314,9 @@
 		<antcall target="build">
 			<param name="feature" value="edu.wisc.ssec.cimss.edex.probsevere.feature" />
 		</antcall>
+    	<antcall target="build">
+    				<param name="feature" value="gov.noaa.nws.sti.mdl.edex.griddednucaps.feature"/>
+    	</antcall>
         <!-- SPECIAL CASE -->
         <if>
             <equals arg1="${lightning}" arg2="false" />
diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/bundles/glomosaic_bundle.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/bundles/glomosaic_bundle.xml
new file mode 100644
index 0000000000..9b0fc9ed82
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/bundles/glomosaic_bundle.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <bundle>
+            <displayList>
+                <displays xsi:type="d2DMapRenderableDisplay" magnification="1.0" density="1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+                    <descriptor xsi:type="mapDescriptor">
+                        <resource>
+                            <loadProperties xsi:type="gridLoadProperties" displayType="IMAGE" loadWithoutData="true">
+                                <resourceType>PLAN_VIEW</resourceType>
+                                <perspectiveProperty xsi:type="d2dLoadProperties" loadMode="VALID_TIME_SEQ" timeMatchBasis="true"/>
+                                <capabilities>
+                                    <capability xsi:type="densityCapability" density="1.0"/>
+                                    <capability xsi:type="outlineCapability" outlineWidth="1" outlineOn="true" lineStyle="DEFAULT"/>
+                                    <capability xsi:type="displayTypeCapability" displayType="IMAGE"/>
+                                    <capability xsi:type="magnificationCapability" magnification="1.0"/>
+                                    <capability xsi:type="colorMapCapability">
+                                        <colorMapParameters colorMapName="${colormap}">
+                                        </colorMapParameters>
+                                    </capability>
+                                    <capability xsi:type="imagingCapability" contrast="1.0" brightness="1.0" interpolationState="false" alpha="1.0"/>
+                                </capabilities>
+                            </loadProperties>
+                            <properties isVisible="true" isMapLayer="false" isBlinking="false" isSystemResource="false" renderingOrderId="IMAGE_WORLD">
+                            </properties>
+                            <resourceData xsi:type="gridResourceData" sampling="false" spatial="false" isRequeryNecessaryOnTimeMatch="true" isUpdatingOnMetadataOnly="false" retrieveData="true">
+                                <metadataMap>
+                                    <mapping key="info.parameter.abbreviation">
+                                        <constraint constraintType="EQUALS" constraintValue="${parameter}"/>
+                                    </mapping>
+                                    <mapping key="info.datasetId">
+                                        <constraint constraintType="EQUALS" constraintValue="${dataset}"/>
+                                    </mapping>
+                                    <mapping key="pluginName">
+                                        <constraint constraintType="EQUALS" constraintValue="grid"/>
+                                    </mapping>
+                                    <mapping key="info.level.leveltwovalue">
+                                        <constraint constraintType="EQUALS" constraintValue="-999999.0"/>
+                                    </mapping>
+                                    <mapping key="info.level.levelonevalue">
+                                        <constraint constraintType="EQUALS" constraintValue="0.0"/>
+                                    </mapping>
+                                    <mapping key="info.level.masterLevel.name">
+                                        <constraint constraintType="EQUALS" constraintValue="${mlevel}"/>
+                                    </mapping>
+                                </metadataMap>
+                                <alertParser xsi:type="gribDataCubeAlertMessageParser"/>
+                            </resourceData>
+                        </resource>
+                        <timeMatcher xsi:type="d2DTimeMatcher" forecastFilter="0" deltaFilter="0" />
+                    </descriptor>
+                </displays>
+            </displayList>
+    </bundle>
diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/baseDerivedProductsImagery.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/baseDerivedProductsImagery.xml
index eb949983f5..4240f4abae 100644
--- a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/baseDerivedProductsImagery.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/baseDerivedProductsImagery.xml
@@ -24,77 +24,6 @@
         of the file. 
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
-        menuText="Blended Rain Rate" id="rainfallRate">
-        <substitute key="element" value="Rain fall rate" />
-        <substitute key="entity" value="POES-NPOESS" />
-        <substitute key="colormap" value="Sat/Rain Rate" />
-    </contribute>
-    <contribute xsi:type="titleItem" titleText="------ GOES ------"
-        id="GOESLine" />
-    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
-        menuText="Lifted Index" id="liftedIndex">
-        <substitute key="element"
-            value="Sounder Based Derived Lifted Index (LI)" />
-        <substitute key="entity" value="Composite" />
-        <substitute key="colormap"
-            value="Sat/Lifted Index/Lifted Index Default" />
-    </contribute>
-    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
-        menuText="Total Precip Water" id="totalPrecipWater">
-        <substitute key="element"
-            value="Sounder Based Derived Precipitable Water (PW)" />
-        <substitute key="entity" value="Composite" />
-        <substitute key="colormap"
-            value="Sat/Precip Water/Precip Water Default" />
-    </contribute>
-    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
-        menuText="Cloud Amount" id="cloudAmount">
-        <substitute key="element" value="Gridded Cloud Amount" />
-        <substitute key="entity" value="Composite" />
-        <substitute key="colormap" value="Sat/Cloud Amount Default" />
-    </contribute>
-    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
-        menuText="Cloud Top Height" id="cloudTopHeight">
-        <substitute key="element"
-            value="Gridded Cloud Top Pressure or Height" />
-        <substitute key="entity" value="Composite" />
-        <substitute key="colormap" value="Sat/Cloud Top Height" />
-    </contribute>
-    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
-        menuText="Skin Temperature" id="skinTemp">
-        <substitute key="element"
-            value="Sounder Based Derived Surface Skin Temp (SFC Skin)" />
-        <substitute key="entity" value="Composite" />
-        <substitute key="colormap" value="Sat/Skin Temp/Skin Temp Default" />
-    </contribute>
-    <contribute xsi:type="bundleItem" file="bundles/DefaultCONUSSatellite.xml"
-        menuText="Low Cloud Base" id="lowCloudBase">
-        <substitute key="element" value="Low cloud base imagery" />
-        <substitute key="sector0" value="West CONUS" />
-        <substitute key="sector1" value="East CONUS" />
-        <substitute key="entity" value="GOES%" />
-        <substitute key="colormap" value="Sat/Low Cloud Base" />
-    </contribute>
-    <contribute xsi:type="titleItem" titleText="------ AMSU and SSM/I + GPS ------"
-        id="blendedofAMSUAndSSMIDataLine" />
-    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
-        menuText="Blended Total Precip Water" id="blendedTotalPrecipWater">
-        <substitute key="element"
-            value="Sounder Based Derived Precipitable Water (PW)" />
-        <substitute key="entity" value="Miscellaneous" />
-        <substitute key="colormap"
-            value="Sat/Precip Water/Blended Total Precip Water" />
-    </contribute>
-    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
-        menuText="Percent of Normal TPW" id="percentofNormalTPW">
-        <substitute key="element" value="Percent of Normal TPW" />
-        <substitute key="entity" value="Miscellaneous" />
-        <substitute key="colormap"
-            value="Sat/Precip Water/Percent of Normal TPW" />
-    </contribute>
-
-
     <contribute xsi:type="titleItem" titleText="------ Global Blended Hydro ------"
         id="BlendedHydroLine" />
 
diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/baseForSatCompositeMenuItems.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/baseForSatCompositeMenuItems.xml
new file mode 100644
index 0000000000..7f4463a415
--- /dev/null
+++ b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/baseForSatCompositeMenuItems.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+    <!-- 
+        This is an absolute override file, indicating that a higher priority 
+        version of the file will completely replace a lower priority version
+        of the file. 
+    -->
+    <!-- TOWRdocs Header
+         baseFourSatCompositeMenuItems.xml
+                        -->
+    <!-- TOWRdocs Description
+        5-sat composites menu items. This content is for the sub-menu off of the main Satellite button. It is referenced by
+        baseFourSatComposite.xml
+      -->
+    <!-- TOWRdocs Status
+     Titled FourSat for purposes of matching base/legacy, but the product is the new nc4 NESDIS 5-sat composite.
+     5/8/21 moves glomosaic_bundle.xml under /bundles (was under its own glomosaic sub-dir)
+    -->
+    <!-- TOWRdocs POC
+      Lee Byerle 5/8/2021
+    -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<!-- global blended imagery -->
+    <contribute xsi:type="bundleItem" file="bundles/glomosaic_bundle.xml"
+        menuText="Global Visible" id="glVisible">
+        <substitute key="dataset" value="GLOB_COMPVIS" />
+        <substitute key="parameter" value="GLOBALCOMPVIS" />
+        <substitute key="colormap" value="Sat/VIS/ZA (Vis Default)" />
+        <substitute key="mlevel" value="EA" />
+    </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/glomosaic_bundle.xml"
+        menuText="Global Window IR" id="glirWindow">
+        <substitute key="dataset" value="GLOB_COMPLIR" />
+        <substitute key="parameter" value="GLOBALCOMPLIR" />
+        <substitute key="colormap" value="Sat/IR/CIRA (IR Default)" />
+        <substitute key="mlevel" value="EA" />
+    </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/glomosaic_bundle.xml"
+        menuText="Global Water Vapor" id="glWaterVapor">
+        <substitute key="dataset" value="GLOB_COMPWV" />
+        <substitute key="parameter" value="GLOBALCOMPWV" />
+        <substitute key="colormap" value="Sat/WV/CIMSS_WV" />
+        <substitute key="mlevel" value="EA" />
+    </contribute>
+<!--    <contribute xsi:type="bundleItem" file="bundles/glomosaic_bundle.xml"
+        menuText="Global Shortwave IR" id="glswir">
+        <substitute key="dataset" value="GLOB_COMPSIR" />
+        <substitute key="parameter" value="GLOBALCOMPSIR" />
+        <substitute key="colormap" value="Grid/gridded data" />
+        <substitute key="mlevel" value="EA" />
+    </contribute> -->
+<!-- L. Byerle 4/8/20 below legacy G-15 -->
+<!--    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
+        menuText="Legacy IR Window" id="irWindow">
+        <substitute key="element" value="Imager 11 micron IR" />
+        <substitute key="colormap" value="Sat/IR/CIRA (IR Default)" />
+    </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
+        menuText="Legacy Water Vapor" id="waterVapor">
+        <substitute key="element" value="Imager 6.7-6.5 micron IR (WV)" />
+        <substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor" />
+    </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
+        menuText="Legacy Visible" id="visible">
+        <substitute key="element" value="Imager Visible" />
+        <substitute key="colormap" value="Sat/VIS/ZA (Vis Default)" />
+    </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/DerivedSatellite.xml"
+        menuText="Legacy WV/IR" id="WV/IR">
+        <substitute key="element" value="satDivWVIR" />
+        <substitute key="colormap" value="Sat/IR/IR WV" />
+    </contribute> -->
+</menuTemplate>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/baseFourSatComposite.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/baseFourSatComposite.xml
index af860071fc..e9d66c9b0b 100644
--- a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/baseFourSatComposite.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/baseFourSatComposite.xml
@@ -24,27 +24,5 @@
         of the file. 
     -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <contribute xsi:type="separator" id="MySeparatorId" />
-    <contribute xsi:type="titleItem" titleText="------ 4 Sat Composite ------"
-        id="NHLine" />
-    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
-        menuText="IR Window" id="irWindow">
-        <substitute key="element" value="Imager 11 micron IR" />
-        <substitute key="colormap" value="Sat/IR/CIRA (IR Default)" />
-    </contribute>
-    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
-        menuText="Water Vapor" id="waterVapor">
-        <substitute key="element" value="Imager 6.7-6.5 micron IR (WV)" />
-        <substitute key="colormap" value="Sat/WV/Gray Scale Water Vapor" />
-    </contribute>
-    <contribute xsi:type="bundleItem" file="bundles/DefaultSatellite.xml"
-        menuText="Visible" id="visible">
-        <substitute key="element" value="Imager Visible" />
-        <substitute key="colormap" value="Sat/VIS/ZA (Vis Default)" />
-    </contribute>
-    <contribute xsi:type="bundleItem" file="bundles/DerivedSatellite.xml"
-        menuText="WV/IR" id="WV/IR">
-        <substitute key="element" value="satDivWVIR" />
-        <substitute key="colormap" value="Sat/IR/IR WV" />
-    </contribute>
+    <contribute id="newFourSatMenu" xsi:type="subinclude" subMenu="Global 5 Sat Composites" fileName="menus/satellite/baseForSatCompositeMenuItems.xml" />
 </menuTemplate>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/index.xml b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/index.xml
index cde150bcc8..938afedcc3 100644
--- a/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/index.xml
+++ b/edexOsgi/com.raytheon.edex.plugin.satellite/utility/common_static/base/menus/satellite/index.xml
@@ -6,4 +6,19 @@
 	<include installTo="menu:satellite"
 		fileName="menus/satellite/baseSatellite.xml">
 	</include>
+    <include subMenu="Polar Derived Products Imagery" installTo="menu:satellite?after=NPPProducts"
+        fileName="menus/satellite/baseDerivedProductsImagery.xml">
+        <substitute key="sector" value="Supernational" />
+    </include> 
+    <include installTo="menu:satellite"
+        fileName="menus/satellite/baseFourSatComposite.xml">
+        <substitute key="sector"
+            value="NH Composite - Meteosat-GOES E-GOES W-GMS" />
+        <substitute key="entity" value="Composite" />
+    </include>
+<!--   
+	<include installTo="menu:satellite"
+	    fileName="menus/satellite/otherSatellite.xml">
+	</include>
+ -->
 </menuContributionFile>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid.netcdf/utility/common_static/base/distribution/netcdfGrid.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid.netcdf/utility/common_static/base/distribution/netcdfGrid.xml
index 0205a91b19..1cb251443d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid.netcdf/utility/common_static/base/distribution/netcdfGrid.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.grid.netcdf/utility/common_static/base/distribution/netcdfGrid.xml
@@ -18,14 +18,27 @@
     See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
     further_licensing_information.
 -->
-
-    <!--
-        This is an absolute override file, indicating that a higher priority
-        version of the file will completely replace a lower priority version
-        of the file.
+   <!-- TOWRdocs Header
+        netcdfGrid plugin distribution file, currently for GPM IMERG products.
+    -->
+    <!-- TOWRdocs Description
+         Adds patterns for global blended hydro and global multi-sat GOES composites.
+    -->
+    <!-- TOWRdocs Status
+         Modification to the base distribution file of the same name to handle
+         blended hydro products and global GOES composite imagery
+         10/3/2019 Adds header search for blended hydro
+         4/8/20 Adds pattern for global composite GOES Imagery
+         5/8/20 Adds pattern for global composite GOES Imagery over SBN (headers TICF*)
+         5/23/20 Remove TICF07/SWIR for multi-sat comp
+         3/18/22 Add LightningCast
+         1/15/23 Add VIIRS Flood Maps
+    -->
+    <!-- TOWRdocs POC
+         Lee Byerle 1/15/2023
     -->
 <requestPatterns xmlns:ns2="group">
-    <!-- NOS -->
+    <!-- NOS (three below are in 16.4.1 baseline -->
     <regex>^sst_geo-polar-blended.*</regex>
     <regex>^ncom_relo.*</regex>
     <regex>^NARR_[0-9]{8}_.*</regex>
@@ -33,11 +46,16 @@
     <regex>^BHP-TPW_v\d\dr\d_blend.*</regex>
     <regex>^BHP-RR_v\d\dr\d_blend.*</regex>
     <regex>^BHP-PCT_v\d\dr\d_blend.*</regex>
-<!--WMO Headers for Blended hydro TPW, Rain Rate, PCT:
+<!--WMO Headers for blended products:
     TITX38 KNES - BHP-TPW
     TICX70 KNES - BHP-PCT (Percent normal TPW)
     TITX39 KNES - BHP-RR (Rain Rate)     
-    Use the following pattern for Blended Hydro:
+     Use the following pattern for Blended Hydro:
 -->
     <regex>^TI[CT]X.*</regex>
+<!--GOES Multisat imagery SBN (1 line below)  or PDA (2 lines below) -->
+    <regex>^TICF(02|08|14).*</regex>
+    <regex>^GLOBCOMP(WV|SIR|LIR|VIS)_nc.*</regex>
+    <regex>LightningCast</regex>
+    <regex>^VIIRS-Flood-NWS.*</regex>
 </requestPatterns>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid.netcdf/utility/common_static/base/grid/netcdf/blended_hydro/blended_percent_of_tpw_normal.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid.netcdf/utility/common_static/base/grid/netcdf/blended_hydro/blended_percent_of_tpw_normal.xml
deleted file mode 100644
index 8166c376e3..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid.netcdf/utility/common_static/base/grid/netcdf/blended_hydro/blended_percent_of_tpw_normal.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-    This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
-    pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-
-    U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-    This_software_product_contains_export-restricted_data_whose
-    export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-    to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-    an_export_license_or_other_authorization.
-
-    Contractor_Name:________Raytheon_Company
-    Contractor_Address:_____6825_Pine_Street,_Suite_340
-    ________________________Mail_Stop_B8
-    ________________________Omaha,_NE_68106
-    ________________________402.291.0100
-
-    See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-    further_licensing_information.
--->
-    <!--
-        This is an absolute override file, indicating that a higher priority
-        version of the file will completely replace a lower priority version
-        of the file.
-    -->
-<gridProductDescriptions>
-  <default>
-    <matches>
-      <match pattern="^BHP-PCT_v\d\dr\d_blend.*"> 
-        <attribute name="Metadata_Link"/>
-      </match>
-    </matches>
-
-    <dataTime>
-      <formattedRefTime dateFormat="yyyy-MM-dd-'T'HH:mm:ss'Z'">
-        <attribute name="time_coverage_end" />
-      </formattedRefTime>
-    </dataTime>
-
-    <level>
-      <masterLevel>
-        <value value="EA" />
-      </masterLevel>
-      <levelOneValue>
-        <value value="0.0" />
-      </levelOneValue>
-    </level>
-
-    <datasetId>
-      <value value="BLENDED-PCT_TPW-Sat" />
-    </datasetId>
-
-
-<!--use lat and lon from file-->
-    <coverage>
-      <latLonGridCoverage />
-      <coordinateLists>
-        <latitude>
-          <variable name="lat" />
-        </latitude>
-        <longitude>
-          <variable name="lon" />
-        </longitude>
-      </coordinateLists>
-    </coverage>
-
-  </default>
-
-  <description>
-    <data>
-      <variable name="PCT" />  <!-- netCDF file variable -->
-    </data>
-
-   <parameter>
-      <abbreviation>
-        <value value="BLENDED_PCT" /> <!--Arbitrary assigned parameter, point to this in netcdfGrid style rules -->
-      </abbreviation>
-      <name>
-        <value value="Blended Percent of Normal TPW" /> <!--Appears in CAVE display legend -->
-      </name>
-      <units>
-        <value value="%" />  
-      </units>
-    </parameter>
-  </description>
-
-  <description>
-    <data>
-      <variable name="observation_age" />  <!-- netCDF file variable -->
-    </data>
-
-   <parameter>
-      <abbreviation>
-        <value value="BLENDED_PCT_Obs_age" /> <!--Arbitrary assigned parameter, point to this in netcdfGrid style rules -->
-      </abbreviation>
-      <name>
-        <value value="Age of Obs (Analysis time minus Obs time)" /> <!--Appears in CAVE display legend -->
-      </name>
-      <units>
-        <value value="hr" />  
-      </units>
-    </parameter>
-  </description>
-
-</gridProductDescriptions>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid.netcdf/utility/common_static/base/grid/netcdf/blended_hydro/blended_rain_rate.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid.netcdf/utility/common_static/base/grid/netcdf/blended_hydro/blended_rain_rate.xml
deleted file mode 100644
index e0c6fe5f89..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid.netcdf/utility/common_static/base/grid/netcdf/blended_hydro/blended_rain_rate.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-    This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
-    pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-
-    U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-    This_software_product_contains_export-restricted_data_whose
-    export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-    to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-    an_export_license_or_other_authorization.
-
-    Contractor_Name:________Raytheon_Company
-    Contractor_Address:_____6825_Pine_Street,_Suite_340
-    ________________________Mail_Stop_B8
-    ________________________Omaha,_NE_68106
-    ________________________402.291.0100
-
-    See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-    further_licensing_information.
--->
-    <!--
-        This is an absolute override file, indicating that a higher priority
-        version of the file will completely replace a lower priority version
-        of the file.
-    -->
-<gridProductDescriptions>
-  <default>
-    <matches>
-      <match pattern="^BHP-RR_v\d\dr\d_blend.*"> 
-        <attribute name="Metadata_Link"/>
-      </match>
-    </matches>
-
-    <dataTime>
-      <formattedRefTime dateFormat="yyyy-MM-dd-'T'HH:mm:ss'Z'">
-        <attribute name="time_coverage_end" />
-      </formattedRefTime>
-    </dataTime>
-
-    <level>
-      <masterLevel>
-        <value value="SFC" />
-      </masterLevel>
-      <levelOneValue>
-        <value value="0.0" />
-      </levelOneValue>
-    </level>
-
-    <datasetId>
-      <value value="BLENDED-Rain_Rate-Sat" />
-    </datasetId>
-
-
-<!--use lat and lon from file-->
-    <coverage>
-      <latLonGridCoverage />
-      <coordinateLists>
-        <latitude>
-          <variable name="lat" />
-        </latitude>
-        <longitude>
-          <variable name="lon" />
-        </longitude>
-      </coordinateLists>
-    </coverage>
-
-  </default>
-
-  <description>
-    <data>
-      <variable name="RR" />  <!-- netCDF file variable -->
-    </data>
-
-   <parameter>
-      <abbreviation>
-        <value value="BLENDED_RR" /> <!--Arbitrary assigned parameter, point to this in netcdfGrid style rules -->
-      </abbreviation>
-      <name>
-        <value value="Blended Rain Rate" /> <!--Appears in CAVE display legend -->
-      </name>
-      <units>
-        <value value="mm/hr" />  
-      </units>
-    </parameter>
-  </description>
-
-  <description>
-    <data>
-      <variable name="observation_age" />  <!-- netCDF file variable -->
-    </data>
-
-   <parameter>
-      <abbreviation>
-        <value value="BLENDED_RR_Obs_age" /> <!--Arbitrary assigned parameter, point to this in netcdfGrid style rules -->
-      </abbreviation>
-      <name>
-        <value value="Age of Obs (Analysis time minus Obs time)" /> <!--Appears in CAVE display legend -->
-      </name>
-      <units>
-        <value value="hr" />  
-      </units>
-    </parameter>
-  </description>
-
-  <description>
-    <data>
-      <variable name="Satellite_Number" />  <!-- netCDF file variable -->
-    </data>
-
-   <parameter>
-      <abbreviation>
-        <value value="BLENDED_RR_Sat_Number" /> <!--Arbitrary assigned parameter, point to this in netcdfGrid style rules -->
-      </abbreviation>
-      <name>
-        <value value="Satellite" /> <!--Appears in CAVE display legend -->
-      </name>
-      <units>
-        <value value="" />  
-      </units>
-    </parameter>
-  </description>
-
-</gridProductDescriptions>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.grid.netcdf/utility/common_static/base/grid/netcdf/blended_hydro/blended_tpw.xml b/edexOsgi/com.raytheon.uf.edex.plugin.grid.netcdf/utility/common_static/base/grid/netcdf/blended_hydro/blended_tpw.xml
deleted file mode 100644
index 8b1bc0174a..0000000000
--- a/edexOsgi/com.raytheon.uf.edex.plugin.grid.netcdf/utility/common_static/base/grid/netcdf/blended_hydro/blended_tpw.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-    This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
-    pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
-
-    U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
-    This_software_product_contains_export-restricted_data_whose
-    export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
-    to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
-    an_export_license_or_other_authorization.
-
-    Contractor_Name:________Raytheon_Company
-    Contractor_Address:_____6825_Pine_Street,_Suite_340
-    ________________________Mail_Stop_B8
-    ________________________Omaha,_NE_68106
-    ________________________402.291.0100
-
-    See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
-    further_licensing_information.
--->
-    <!--
-        This is an absolute override file, indicating that a higher priority
-        version of the file will completely replace a lower priority version
-        of the file.
-    -->
-<gridProductDescriptions>
-  <default>
-    <matches>
-      <match pattern="^BHP-TPW_v\d\dr\d_blend.*"> 
-      <attribute name="Metadata_Link"/>
-      </match>
-    </matches>
-
-    <dataTime>
-      <formattedRefTime dateFormat="yyyy-MM-dd-'T'HH:mm:ss'Z'">
-        <attribute name="time_coverage_end" />
-      </formattedRefTime>
-    </dataTime>
-
-    <level>
-      <masterLevel>
-        <value value="EA" />
-      </masterLevel>
-      <levelOneValue>
-        <value value="0.0" />
-      </levelOneValue>
-    </level>
-
-    <datasetId>
-      <value value="BLENDED-TPW-Sat" />
-    </datasetId>
-
-
-<!--use lat and lon from file-->
-    <coverage>
-      <latLonGridCoverage />
-      <coordinateLists>
-        <latitude>
-          <variable name="lat" />
-        </latitude>
-        <longitude>
-          <variable name="lon" />
-        </longitude>
-      </coordinateLists>
-    </coverage>
-
-  </default>
-
-  <description>
-    <data>
-      <variable name="TPW" />  <!-- netCDF file variable -->
-    </data>
-
-   <parameter>
-      <abbreviation>
-        <value value="BLENDED_TPW" /> <!--Arbitrary assigned parameter, point to this in netcdfGrid style rules -->
-      </abbreviation>
-      <name>
-        <value value="Blended Total Precipitable Water" /> <!--Appears in CAVE display legend -->
-      </name>
-      <units>
-        <value value="mm" />  
-      </units>
-    </parameter>
-  </description>
-
-  <description>
-    <data>
-      <variable name="observation_age" />  <!-- netCDF file variable -->
-    </data>
-
-   <parameter>
-      <abbreviation>
-        <value value="BLENDED_TPW_Obs_age" /> <!--Arbitrary assigned parameter, point to this in netcdfGrid style rules -->
-      </abbreviation>
-      <name>
-        <value value="Age of Obs (Analysis time minus Obs time)" /> <!--Appears in CAVE display legend -->
-      </name>
-      <units>
-        <value value="hr" />  
-      </units>
-    </parameter>
-  </description>
-
-  <description>
-    <data>
-      <variable name="Satellite_Number" />  <!-- netCDF file variable -->
-    </data>
-
-   <parameter>
-      <abbreviation>
-        <value value="BLENDED_TPW_Sat_Number" /> <!--Arbitrary assigned parameter, point to this in netcdfGrid style rules -->
-      </abbreviation>
-      <name>
-        <value value="Satellite" /> <!--Appears in CAVE display legend -->
-      </name>
-      <units>
-        <value value="" />  
-      </units>
-    </parameter>
-  </description>
-
-</gridProductDescriptions>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/bundles/npp/nucapsAvailability.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/bundles/npp/nucapsAvailability.xml
index e505116f82..51e6f4d37d 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/bundles/npp/nucapsAvailability.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/bundles/npp/nucapsAvailability.xml
@@ -1,4 +1,23 @@
 <?xml version="1.0" encoding="ISO-8859-1" standalone="no"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
     <!-- 
         This is an absolute override file, indicating that a higher priority 
         version of the file will completely replace a lower priority version
@@ -12,9 +31,11 @@
                 <resource>
                     <loadProperties />
                     <resourceData xsi:type="nucapsSoundingMapResourceData">
+                        <nsharpResourceData>${soundingResourceData}</nsharpResourceData>
+                        <resourceName>${name;Unknown}</resourceName>
                         <metadataMap>
                             <mapping key="pluginName">
-                                <constraint constraintValue="nucaps"
+                                <constraint constraintValue="${pluginName}"
                                     constraintType="EQUALS" />
                             </mapping>
                         </metadataMap>
@@ -23,4 +44,4 @@
             </descriptor>
         </displays>
     </displayList>
-</bundle>
+</bundle>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI1High.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI1High.xml
new file mode 100644
index 0000000000..2924d8c379
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI1High.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+    <!-- 
+        This is an incremental override file, indicating that the files
+        at different localization levels will be combined. 
+    -->
+<DerivedParameter name="Haines Stab Term" abbreviation="HI1High" xmlns:ns2="group">
+    <Method levels="Layer" name="Difference">
+        <Field level="700MB" abbreviation="T" />
+        <Field level="500MB" abbreviation="T" />
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI1Low.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI1Low.xml
new file mode 100644
index 0000000000..c2f11a6c8e
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI1Low.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+    <!-- 
+        This is an incremental override file, indicating that the files
+        at different localization levels will be combined. 
+    -->
+<DerivedParameter name="Haines Stab Term" abbreviation="HI1Low" xmlns:ns2="group">
+    <Method levels="Layer" name="Difference">
+        <Field level="950MB" abbreviation="T" />
+        <Field level="850MB" abbreviation="T" />
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI1Middle.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI1Middle.xml
new file mode 100644
index 0000000000..ee7b9c31b6
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI1Middle.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+    <!-- 
+        This is an incremental override file, indicating that the files
+        at different localization levels will be combined. 
+    -->
+<DerivedParameter name="Haines Stab Term" abbreviation="HI1Middle" xmlns:ns2="group">
+    <Method levels="Layer" name="Difference">
+        <Field level="850MB" abbreviation="T" />
+        <Field level="700MB" abbreviation="T" />
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI3High.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI3High.xml
new file mode 100644
index 0000000000..c5904b0acc
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI3High.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+    <!-- 
+        This is an incremental override file, indicating that the files
+        at different localization levels will be combined. 
+    -->
+<DerivedParameter name="HI1 Index Assign" abbreviation="HI3High" xmlns:ns2="group">
+    <Method levels="Layer" name="Test">
+        <Field abbreviation="HI1High" />
+        <ConstantField value="1" />
+        <ConstantField value="-1e37" />
+        <ConstantField value="3.5" />
+        <ConstantField value="1" />
+        <ConstantField value="1" />
+        <ConstantField value="3.0" />
+        <ConstantField value="7.5" />
+        <ConstantField value="2" />
+        <ConstantField value="1" />
+        <ConstantField value="7.0" />
+        <ConstantField value="1e37" />
+        <ConstantField value="3" />
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI3Low.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI3Low.xml
new file mode 100644
index 0000000000..9f45ba69be
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI3Low.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+    <!-- 
+        This is an incremental override file, indicating that the files
+        at different localization levels will be combined. 
+    -->
+<DerivedParameter name="HI1 Index Assign" abbreviation="HI3Low" xmlns:ns2="group">
+    <Method levels="Layer" name="Test">
+        <Field abbreviation="HI1Low" />
+        <ConstantField value="1" />
+        <ConstantField value="-1e37" />
+        <ConstantField value="3.5" />
+        <ConstantField value="1" />
+        <ConstantField value="1" />
+        <ConstantField value="3.0" />
+        <ConstantField value="7.5" />
+        <ConstantField value="2" />
+        <ConstantField value="1" />
+        <ConstantField value="7.0" />
+        <ConstantField value="1e37" />
+        <ConstantField value="3" />
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI3Middle.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI3Middle.xml
new file mode 100644
index 0000000000..c04e0019e1
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI3Middle.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+    <!-- 
+        This is an incremental override file, indicating that the files
+        at different localization levels will be combined. 
+    -->
+<DerivedParameter name="HI1 Index Assign" abbreviation="HI3Middle" xmlns:ns2="group">
+    <Method levels="Layer" name="Test">
+        <Field abbreviation="HI1Middle" />
+        <ConstantField value="1" />
+        <ConstantField value="-1e37" />
+        <ConstantField value="3.5" />
+        <ConstantField value="1" />
+        <ConstantField value="1" />
+        <ConstantField value="3.0" />
+        <ConstantField value="7.5" />
+        <ConstantField value="2" />
+        <ConstantField value="1" />
+        <ConstantField value="7.0" />
+        <ConstantField value="1e37" />
+        <ConstantField value="3" />
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI4High.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI4High.xml
new file mode 100644
index 0000000000..517e68d681
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI4High.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+    <!-- 
+        This is an incremental override file, indicating that the files
+        at different localization levels will be combined. 
+    -->
+<DerivedParameter name="Moist Term Index Assign" abbreviation="HI4High" xmlns:ns2="group">
+    <Method levels="Layer" name="Test">
+        <Field abbreviation="DpD" level="700MB" />
+        <ConstantField value="1" />
+        <ConstantField value="-1e37" />
+        <ConstantField value="5.5" />
+        <ConstantField value="1" />
+        <ConstantField value="1" />
+        <ConstantField value="5.0" />
+        <ConstantField value="9.5" />
+        <ConstantField value="2" />
+        <ConstantField value="1" />
+        <ConstantField value="9.0" />
+        <ConstantField value="1e37" />
+        <ConstantField value="3" />
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI4Low.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI4Low.xml
new file mode 100644
index 0000000000..5be1e4a352
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI4Low.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+    <!-- 
+        This is an incremental override file, indicating that the files
+        at different localization levels will be combined. 
+    -->
+<DerivedParameter name="Moist Term Index Assign" abbreviation="HI4Low" xmlns:ns2="group">
+    <Method levels="Layer" name="Test">
+        <Field abbreviation="DpD" level="850MB" />
+        <ConstantField value="1" />
+        <ConstantField value="-1e37" />
+        <ConstantField value="5.5" />
+        <ConstantField value="1" />
+        <ConstantField value="1" />
+        <ConstantField value="5.0" />
+        <ConstantField value="9.5" />
+        <ConstantField value="2" />
+        <ConstantField value="1" />
+        <ConstantField value="9.0" />
+        <ConstantField value="1e37" />
+        <ConstantField value="3" />
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI4Middle.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI4Middle.xml
new file mode 100644
index 0000000000..2d78463650
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HI4Middle.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+    <!-- 
+        This is an incremental override file, indicating that the files
+        at different localization levels will be combined. 
+    -->
+<DerivedParameter name="Moist Term Index Assign" abbreviation="HI4Middle" xmlns:ns2="group">
+    <Method levels="Layer" name="Test">
+        <Field abbreviation="DpD" level="850MB" />
+        <ConstantField value="1" />
+        <ConstantField value="-1e37" />
+        <ConstantField value="5.5" />
+        <ConstantField value="1" />
+        <ConstantField value="1" />
+        <ConstantField value="5.0" />
+        <ConstantField value="9.5" />
+        <ConstantField value="2" />
+        <ConstantField value="1" />
+        <ConstantField value="9.0" />
+        <ConstantField value="1e37" />
+        <ConstantField value="3" />
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HIHigh.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HIHigh.xml
new file mode 100644
index 0000000000..bc0e916e27
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HIHigh.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+    <!-- 
+        This is an incremental override file, indicating that the files
+        at different localization levels will be combined. 
+    -->
+<DerivedParameter name="Haines Index High" abbreviation="HIHigh" xmlns:ns2="group">
+    <Method levels="Layer" name="Add">
+        <Field abbreviation="HI3High" />
+        <Field abbreviation="HI4High" />
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HILow.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HILow.xml
new file mode 100644
index 0000000000..6db896d8eb
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HILow.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+    <!-- 
+        This is an incremental override file, indicating that the files
+        at different localization levels will be combined. 
+    -->
+<DerivedParameter name="Haines Index Low" abbreviation="HILow" xmlns:ns2="group">
+    <Method levels="Layer" name="Add">
+        <Field abbreviation="HI3Low" />
+        <Field abbreviation="HI4Low" />
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HIMiddle.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HIMiddle.xml
new file mode 100644
index 0000000000..883a69d471
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/HIMiddle.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+    <!-- 
+        This is an incremental override file, indicating that the files
+        at different localization levels will be combined. 
+    -->
+<DerivedParameter name="Haines Index Middle" abbreviation="HIMiddle" xmlns:ns2="group">
+    <Method levels="Layer" name="Add">
+        <Field abbreviation="HI3Middle" />
+        <Field abbreviation="HI4Middle" />
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/T2m.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/T2m.xml
new file mode 100644
index 0000000000..473635c8bf
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/derivedParameters/definitions/T2m.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+    <!-- 
+        This is an incremental override file, indicating that the files
+        at different localization levels will be combined. 
+    -->
+    
+    <!-- The 2m Temperature derived parameter was created specifically for griddednucaps to allow for delination 
+    between Temps aloft and 2 m Temps for plotting Temps in unts of F (2m) vs C or K aloft. -->
+<DerivedParameter unit="F" name="2m Temperature" abbreviation="T2m">
+    <Method models="griddednucaps" levels="2FHAG" name="Alias">
+        <Field level="2FHAG" abbreviation="T" />
+    </Method>
+</DerivedParameter>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/menus/npp/nucaps/index.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/menus/npp/nucaps/index.xml
index 3612ca63d7..059f2362fa 100755
--- a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/menus/npp/nucaps/index.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/menus/npp/nucaps/index.xml
@@ -24,6 +24,6 @@
         of the file. 
     -->
 <menuContributionFile>
-    <include installTo="menu:NPPProducts?after=Soundings"
+    <include installTo="menu:satellite?after=GROUP3"
         fileName="menus/npp/nucaps/nucapsMenuItems.xml" />
 </menuContributionFile>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/styleRules/nucapsImageryStyleRules.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/styleRules/nucapsImageryStyleRules.xml
new file mode 100644
index 0000000000..5c09534825
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.nucaps/utility/common_static/base/styleRules/nucapsImageryStyleRules.xml
@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization..
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+<!--
+    This is an incremental override file, indicating that the files
+    at different localization levels will be combined.
+-->
+  <!-- TOWRdocs Header
+        gridded nucaps imagery style rules
+   -->
+   <!-- TOWRdocs Description
+        Specifies styling for imagery rendered gridded nucaps. 
+   -->
+   <!-- TOWRdocs Status
+        Updates PWAT, Adds T, specifying temp at 2m FHAG as degF, leaves other layers default degC, aligned with
+        nucaps imagery style rules 
+        10/27/2021 Replaced T with T2m (derived param) for degF read-out. See last entry
+   -->
+   <!-- TOWRdocs POC
+        Kris White 10/27/2021
+   -->
+<styleRuleset>
+
+    <styleRule>
+		<paramLevelMatches>
+			<parameter>TOZNE</parameter>
+		</paramLevelMatches>
+		<imageStyle>
+			<range scale="LINEAR">
+				<minValue>100</minValue>
+				<maxValue>600</maxValue>
+			</range>
+			<defaultColormap>Grid/TotalOzone</defaultColormap>
+			<colorbarLabeling>
+				<increment>50</increment>
+			</colorbarLabeling>
+		</imageStyle>
+	</styleRule>
+	<!--
+		Ozone Anomaly rule for gridded NUCAPS (MRS 2020-03-02)
+	-->
+	<styleRule>
+		<paramLevelMatches>
+			<parameter>OZA</parameter>
+		</paramLevelMatches>
+		<imageStyle>
+			<displayUnits>%</displayUnits>
+			<range scale="LINEAR">
+				<minValue>0</minValue>
+				<maxValue>200</maxValue>
+			</range>
+			<defaultColormap>Grid/OzoneAnomaly</defaultColormap>
+			<colorbarLabeling>
+				<increment>10</increment>
+			</colorbarLabeling>
+		</imageStyle>
+	</styleRule>
+	<!--
+		Tropopause Height rule for gridded NUCAPS (MRS 2020-03-02)
+	-->
+	<styleRule>
+		<paramLevelMatches>
+			<parameter>TPH</parameter>
+		</paramLevelMatches>
+		<imageStyle>
+			<displayUnits>mb</displayUnits>
+			<range scale="LINEAR">
+				<minValue>100</minValue>
+				<maxValue>600</maxValue>
+			</range>
+			<defaultColormap>Grid/TropopauseLevel</defaultColormap>
+			<colorbarLabeling>
+				<increment>50</increment>
+			</colorbarLabeling>
+		</imageStyle>
+	</styleRule>
+	<!--
+		* PWAT - griddednucaps
+	-->
+	<styleRule>
+		<paramLevelMatches>
+			<parameter>PWAT</parameter>
+			<creatingEntity>griddednucaps</creatingEntity>
+		</paramLevelMatches>
+		  <imageStyle>
+			<displayUnits>in</displayUnits>
+			<range scale="LINEAR">
+				<minValue>0.0</minValue>
+				<maxValue>3.5</maxValue>
+			</range>
+			<defaultColormap>Grid/gridded data</defaultColormap>
+			<colorbarLabeling>
+				<increment>0.5</increment>
+			</colorbarLabeling>
+		</imageStyle> 
+	</styleRule>
+	<!--
+		* Quality Control - griddednucaps
+	-->
+	<styleRule>
+		<paramLevelMatches>
+			<parameter>QUAL</parameter>
+			<datasetid>griddednucaps</datasetid>
+		</paramLevelMatches>
+		<imageStyle>
+		    <interpolate>false</interpolate>
+			<displayUnits></displayUnits>
+			<range scale="LINEAR">
+				<minValue>0</minValue>
+				<maxValue>9</maxValue>
+			</range>
+			<defaultColormap>Grid/griddedNUCAPS_QC</defaultColormap>
+			<colorbarLabeling>
+				<increment>1</increment>
+			</colorbarLabeling>
+		</imageStyle>
+	</styleRule>
+	<!--
+        * ThetaE - for gridded NUCAPS
+        K | 1.0 | 0.0 | 0 | 1 | | | 29 | -1 | 10
+    -->
+    <styleRule>
+        <paramLevelMatches>
+            <parameter>ThetaE</parameter>
+        </paramLevelMatches>
+        <imageStyle>
+            <displayUnits>K</displayUnits>
+            <defaultColormap>Grid/gridded data</defaultColormap>
+        </imageStyle>
+    </styleRule>
+    <!--
+        * ThetaE, Surface, BLyr > 150agl, for gridded NUCAPS
+        K | 1.0 | 0.0 | 233| 318 | | | 29 | 0 | 10
+    -->
+    <styleRule>
+        <paramLevelMatches>
+            <parameter>ThetaE</parameter>
+            <singleLevel units="SURFACE" />
+            <rangeLevel units="BL">
+                <upper>180150</upper>
+                <lower>30</lower>
+            </rangeLevel>
+        </paramLevelMatches>
+        <imageStyle>
+            <displayUnits>K</displayUnits>
+            <range scale="LINEAR">
+                <minValue>233</minValue>
+                <maxValue>375</maxValue>
+            </range>
+            <defaultColormap>Grid/gridded data</defaultColormap>
+            <colorbarLabeling>
+                <increment>10</increment>
+            </colorbarLabeling>
+        </imageStyle>
+    </styleRule>
+    <!--
+        * ThetaE, 1050MB > 500MB, log, for gridded NUCAPS
+        C | 1.0 | 0.0 | 233 > 278 | 375 > 348 | | | 29 | 0 | 10
+    -->
+    <styleRule>
+        <paramLevelMatches>
+            <parameter>ThetaE</parameter>
+            <rangeLevel units="MB">
+                <upper>1050</upper>
+                <lower>500</lower>
+            </rangeLevel>
+        </paramLevelMatches>
+        <imageStyle>
+            <displayUnits>K</displayUnits>
+            <range levelScale="LOG">
+                <minValue>233</minValue>
+                <minValue2>278</minValue2>
+                <maxValue>375</maxValue>
+                <maxValue2>348</maxValue2>
+            </range>
+            <defaultColormap>Grid/gridded data</defaultColormap>
+            <colorbarLabeling>
+                <increment>10</increment>
+            </colorbarLabeling>
+        </imageStyle>
+    </styleRule>
+    <!--
+        * ThetaE, 500MB > 250MB, log for gridded NUCAPS
+        C | 1.0 | 0.0 | 278 > 303 | 318 > 358 | | | 29 | 0 | 10
+    -->
+    <styleRule>
+        <paramLevelMatches>
+            <parameter>ThetaE</parameter>
+            <rangeLevel units="MB">
+                <upper>500</upper>
+                <lower>250</lower>
+            </rangeLevel>
+        </paramLevelMatches>
+        <imageStyle>
+            <displayUnits>K</displayUnits>
+            <range levelScale="LOG">
+                <minValue>278</minValue>
+                <minValue2>303</minValue2>
+                <maxValue>318</maxValue>
+                <maxValue2>358</maxValue2>
+            </range>
+            <defaultColormap>Grid/gridded data</defaultColormap>
+            <colorbarLabeling>
+                <increment>10</increment>
+            </colorbarLabeling>
+        </imageStyle>
+    </styleRule>
+    <!--
+        * ThetaE, 250MB > 100MB, log, for gridded NUCAPS
+        C | 1.0 | 0.0 | 303 > 353 | 358 > 450 | | | 29 | 0 | 10
+    -->
+    <styleRule>
+        <paramLevelMatches>
+            <parameter>ThetaE</parameter>
+            <rangeLevel units="MB">
+                <upper>250</upper>
+                <lower>100</lower>
+            </rangeLevel>
+        </paramLevelMatches>
+        <imageStyle>
+            <displayUnits>K</displayUnits>
+            <range levelScale="LOG">
+                <minValue>303</minValue>
+                <minValue2>353</minValue2>
+                <maxValue>358</maxValue>
+                <maxValue2>450</maxValue2>
+            </range>
+            <defaultColormap>Grid/gridded data</defaultColormap>
+            <colorbarLabeling>
+                <increment>10</increment>
+            </colorbarLabeling>
+        </imageStyle>
+    </styleRule>
+
+<!-- Temperature rule -->
+    <styleRule>
+        <paramLevelMatches>
+            <parameter>T2m</parameter>
+            <datasetid>griddednucaps</datasetid>
+        </paramLevelMatches>
+        <imageStyle>
+            <displayUnits>F</displayUnits>
+            <range scale="LINEAR">
+                <minValue>-80</minValue>
+                <maxValue>140</maxValue>
+            </range>
+            <defaultColormap>Grid/gridded data</defaultColormap>
+            <colorbarLabeling>
+                <increment>10</increment>
+            </colorbarLabeling>
+        </imageStyle>
+    </styleRule>
+	
+</styleRuleset>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsMenuItems.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsMenuItems.xml
index b7a25f46e9..ea72a64c5d 100755
--- a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsMenuItems.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirs/viirsMenuItems.xml
@@ -45,26 +45,57 @@
          Lee Byerle 1/2/2018
    -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <contribute xsi:type="titleItem" titleText="------ S-NPP ------" id="ImageryLine"/>
+<!--  Comment out since I don't notice any difference in these products
+<contribute xsi:type="titleItem" titleText=" VIIRS " id="ImageryLine"/>
+<contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
+    menuText="VIIRS CONUS - 0.7 μm Day-Night Band NCC" id="ccNCC0.7">
+  <substitute key="region" value="CONUS%"/>
+  <substitute key="channelType" value="Moderate"/>
+  <substitute key="colormap" value="NPP/VIIRS/NCC_zero_to_one"/>
+  </contribute>
+
+ 
+ <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
+    menuText="VIIRS Pacific - 0.7 μm Day-Night Band NCC" id="cpNCC0.7">
+  <substitute key="region" value="Pacific%"/>
+  <substitute key="channelType" value="Moderate"/>
+  <substitute key="colormap" value="NPP/VIIRS/NCC_zero_to_one"/>
+  </contribute>
+
+ <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
+    menuText="VIIRS Puerto Rico - 0.7 μm Day-Night Band NCC" id="cprNCC0.7">
+  <substitute key="region" value="Puerto%"/>
+  <substitute key="channelType" value="Moderate"/>
+  <substitute key="colormap" value="NPP/VIIRS/NCC_zero_to_one"/>
+  </contribute>
+  
+  <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
+    menuText="VIIRS Alaska - 0.7 μm Day-Night Band NCC" id="caNCC0.7">
+  <substitute key="region" value="Alaska%"/>
+  <substitute key="channelType" value="Moderate"/>
+  <substitute key="colormap" value="NPP/VIIRS/NCC_zero_to_one"/>
+  </contribute>
+   -->
+  <contribute xsi:type="titleItem" titleText="------ S-NPP/NOAA-21 ------" id="ImageryLine"/>
 
   <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
-    menuText="S-NPP CONUS - 0.7 μm Near Constant Contrast" id="Moderate0.7">
+    menuText="S-NPP/NOAA-21 CONUS - 0.7 μm Near Constant Contrast" id="Moderate0.7">
     <substitute key="channelType" value="Moderate"/>
     <substitute key="region" value="CONUS"/>
   </contribute>
 
   <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
-    menuText="S-NPP Pacific - 0.7 μm Near Constant Contrast" id="Moderate0.7">
+    menuText="S-NPP/NOAA-21 Pacific - 0.7 μm Near Constant Contrast" id="Moderate0.7">
     <substitute key="channelType" value="Moderate"/>
     <substitute key="region" value="Pacific"/>
   </contribute>
 
   <contribute xsi:type="bundleItem" file="bundles/npp/viirs/viirsDayNightBandImagery.xml"
-    menuText="S-NPP Puerto Rico - 0.7 μm Near Constant Contrast" id="Moderate0.7">
+    menuText="S-NPP/NOAA-21 Puerto Rico - 0.7 μm Near Constant Contrast" id="Moderate0.7">
     <substitute key="channelType" value="Moderate"/>
     <substitute key="region" value="Puerto Rico"/>
   </contribute>
-  <contribute xsi:type="subMenu" menuText="S-NPP Alaska" id="Alaskaid">
+  <contribute xsi:type="subMenu" menuText="S-NPP/NOAA-21 Alaska" id="Alaskaid">
     <contribute xsi:type="subinclude" fileName="menus/npp/viirs/viirsBundleItems_AK.xml">
       <substitute key="region" value="Alaska"/>
     </contribute>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirsProducts/index.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirsProducts/index.xml
new file mode 100644
index 0000000000..6f18c38380
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirsProducts/index.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+    <!-- TOWRdocs Header
+         Index file 
+        -->
+    <!-- TOWRdocs Description
+         Sets the menu items to install under S-NPP, beneath VIIRS. S-NPP is under the
+         "Satellite" button.  NPPProducts is a subMenu defined one directory back
+         in nppMenuItems.xml.
+    -->
+    <!-- TOWRdocs Status
+         New menu file not in the baseline for VIIRS products. 
+    -->
+    <!-- TOWRdocs POC
+         Lee Byerle 10/2/2019
+   -->
+
+<menuContributionFile>
+   <include installTo="menu:NPPProducts?after=Soundings" fileName="menus/npp/viirsProducts/viirsProductsMenuItems.xml"/> 
+
+</menuContributionFile>
\ No newline at end of file
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirsProducts/viirsProductsMenu.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirsProducts/viirsProductsMenu.xml
new file mode 100644
index 0000000000..d8247016bf
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirsProducts/viirsProductsMenu.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!-- 
+        This is an absolute override file, indicating that a higher priority 
+        version of the file will completely replace a lower priority version
+        of the file. 
+    -->
+    <!-- TOWRdocs Header
+        Submenu for viirs products
+    -->
+    <!-- TOWRdocs Description
+        Added for derived polar products
+    -->
+    <!-- TOWRdocs Status
+        9/30/2019 Modify VIIRS Fires to point to dmw table
+        11/4/2019 strings for Offset
+        1/14/2020 Comment out menu items to be hidden
+        1/17/2020 Update parameter name for Ice
+        2/5/2020 Add'l ATMS items.
+        9/16/2023 Add VIIRS Flood Maps. Hide ATMS products
+    -->
+    <!-- TOWRdocs POC
+        Lee Byerle 9/16/2023
+    -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+
+    <!-- Active Fires DMW plugin -->
+    <contribute xsi:type="bundleItem" file="bundles/viirsFires/viirsFiresPower-dmwPlugin.xml" menuText="VIIRS Active Fires (LDM)" id="activefiresymbolpow.resource">
+                        <substitute key="svg" value="viirsFiresPowerPlotSymbolDesign.svg"/>
+                        <substitute key="scene" value="VIIRS_FIRES" />
+                        <substitute key="density" value="4"/>
+                        <substitute key="magnify" value="1.5"/>
+                        <substitute key="posOffset" value="0"/>
+                        <substitute key="negOffset" value="3600"/>
+                        <substitute key="virtualOffset" value="0"/>
+    </contribute>
+
+  <contribute xsi:type="subMenu" menuText="VIIRS Flood Map   (LDM)" id="mcViirsFloodMapMenu2">
+          <contribute xsi:type="subinclude" fileName="menus/npp/viirs/menu_vfm_mc.xml">
+    </contribute>
+  </contribute> 
+
+<!--        <contribute xsi:type="titleItem" titleText="-ATMS Products (Data Delivery)-" id="ATMSProdLine"/> -->
+
+<!--MIRS ATMS Ice Pointset plugin -->
+<!--    <contribute xsi:type="bundleItem" file="bundles/pointset_bundle.xml"
+        menuText="NOAA-20 ATMS Ice Concentration" id="ATMSSIce">
+        <substitute key="colormap" value="GOES-R/GOESR-L2/VTRSB"/>
+        <substitute key="parameter" value="SICP"/>
+        <substitute key="datasetId" value="ATMS"/>
+    </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/pointset_bundle.xml"
+        menuText="NOAA-20 ATMS Snow Cover" id="ATMSSnow">
+        <substitute key="colormap" value="Sat/VIS/ZA (Vis Default)"/>
+        <substitute key="parameter" value="SNOW"/>
+        <substitute key="datasetId" value="ATMS"/>
+    </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/pointset_bundle.xml"
+        menuText="NOAA-20 ATMS Snow Fall Rate" id="ATMSSFR">
+        <substitute key="colormap" value="GOES-R/GOESR-L2/VTRSB"/>
+        <substitute key="parameter" value="SFR"/>
+        <substitute key="datasetId" value="ATMS"/>
+    </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/pointset_bundle.xml"
+        menuText="NOAA-20 ATMS Snow Water Equivalent" id="ATMSSWE">
+        <substitute key="colormap" value="GOES-R/GOESR-L2/VTRSB"/>
+        <substitute key="parameter" value="SWE"/>
+        <substitute key="datasetId" value="ATMS"/>
+    </contribute>
+    <contribute xsi:type="bundleItem" file="bundles/pointset_bundle.xml"
+        menuText="NOAA-20 ATMS Total Precipitable Water" id="ATMSTPW">
+        <substitute key="colormap" value="GOES-R/GOESR-L2/color-pw10-10"/>
+        <substitute key="parameter" value="TPW"/>
+        <substitute key="datasetId" value="ATMS"/>
+    </contribute> 
+    <contribute xsi:type="bundleItem" file="bundles/pointset_bundle.xml"
+        menuText="NOAA-20 ATMS Cloud Liquid Water" id="ATMSCLW">
+        <substitute key="colormap" value="Grid/gridded data"/>
+        <substitute key="parameter" value="CLW"/>
+        <substitute key="datasetId" value="ATMS"/>
+    </contribute> 
+    <contribute xsi:type="bundleItem" file="bundles/pointset_bundle.xml"
+        menuText="NOAA-20 ATMS Rain Rate" id="ATMSRRate">
+        <substitute key="colormap" value="Sat/MW/nrlmicrorain_swaths"/>
+        <substitute key="parameter" value="Rain_Rate"/>
+        <substitute key="datasetId" value="ATMS"/>
+    </contribute> 
+    <contribute xsi:type="bundleItem" file="bundles/pointset_bundle.xml"
+        menuText="NOAA-20 ATMS Skin Temperature" id="ATMSSkinT">
+        <substitute key="colormap" value="GOES-R/GOESR-L2/VTRSB"/>
+        <substitute key="parameter" value="TSkin"/>
+        <substitute key="datasetId" value="ATMS"/>
+    </contribute>  -->
+
+</menuTemplate>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirsProducts/viirsProductsMenuItems.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirsProducts/viirsProductsMenuItems.xml
new file mode 100644
index 0000000000..31c27227f6
--- /dev/null
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/common_static/base/menus/npp/viirsProducts/viirsProductsMenuItems.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+    <!--
+        This_software_was_developed_and_/_or_modified_by_Raytheon_Company,
+        pursuant_to_Contract_DG133W-05-CQ-1067_with_the_US_Government.
+        
+        U.S._EXPORT_CONTROLLED_TECHNICAL_DATA
+        This_software_product_contains_export-restricted_data_whose
+        export/transfer/disclosure_is_restricted_by_U.S._law._Dissemination
+        to_non-U.S._persons_whether_in_the_United_States_or_abroad_requires
+        an_export_license_or_other_authorization.
+        
+        Contractor_Name:________Raytheon_Company
+        Contractor_Address:_____6825_Pine_Street,_Suite_340
+        ________________________Mail_Stop_B8
+        ________________________Omaha,_NE_68106
+        ________________________402.291.0100
+        
+        See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
+        further_licensing_information.
+    -->
+   <!-- 
+        This is an absolute override file, indicating that a higher priority 
+        version of the file will completely replace a lower priority version
+        of the file. 
+    -->
+    <!-- TOWRdocs Header
+         S-NPP and NOAA-20 VIIRS menu set-up for geographic region selection.
+    -->
+    <!-- TOWRdocs Description
+         This file specifies different regions to pick from in the S-NPP VIIRS menu. When the
+         Satellite, then "S-NPP and NOAA-20" is selected, this file links that selection to regions
+         (e.g. CONUS, Alaska, Pacific).  The regions, listed below, are in turn associated
+         in the menuTemplate with the BundleItems file in this same directory. The 
+         bundles (in /cave_static/bundles) are then contributed and result in the display
+         of available versions of the product if they are in the database.  The bundle for the AK
+         region is different (viirsBundleItems_AK.xml) because it includes hi-res imagery channels
+         1,2,4 for VIIRS imagery, not available in the other regions.
+    -->
+    <!-- TOWRdocs Status
+         New file not included in the baseline.  It follows a similar format to the baseline
+         nppMenuItems.xml. 
+
+         10/5/2019 Makes VIIRS derived products sub menu
+    -->
+    <!-- TOWRdocs POC
+         Lee Byerle 10/5/2019
+   -->
+<menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+   <!-- Tiffany Meyer commented out 11/09/2023 because we aren't getting the VIIRS derived products (active Fires and Floods) -->
+
+<!-- 
+  <contribute xsi:type="titleItem" titleText="Derived (Eval)" id="DerProdsLine"/>
+  <contribute xsi:type="subMenu" menuText="Derived Products" id="NPP_N20Products_id">
+    <contribute xsi:type="subinclude" fileName="menus/npp/viirsProducts/viirsProductsMenu.xml">
+    </contribute>
+  </contribute>
+ -->
+</menuTemplate>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp/utility/common_static/base/menus/npp/index.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp/utility/common_static/base/menus/npp/index.xml
old mode 100755
new mode 100644
index adade8d8b4..9370f4757d
--- a/edexOsgi/com.raytheon.uf.edex.plugin.npp/utility/common_static/base/menus/npp/index.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp/utility/common_static/base/menus/npp/index.xml
@@ -23,6 +23,19 @@
         version of the file will completely replace a lower priority version
         of the file. 
     -->
+    <!-- TOWRdocs Header
+         NPP and NOAA products index.xml
+        -->
+    <!-- TOWRdocs Description
+         Specifies where to install the NPP and NOAA-20 primary sub-menu button under satellite. This updat moves
+         it farther up the Satellite menu. in the Base file the installTo sets to before=GROUP5. This update uses GROUP3.
+      -->
+    <!-- TOWRdocs Status
+        Modification of the base index.xml
+    -->
+    <!-- TOWRdocs POC
+     Lee Byerle 10/30/2020
+    -->
 <menuContributionFile>
-    <include installTo="menu:satellite" fileName="menus/npp/nppMenuItems.xml" />
+    <include installTo="menu:satellite?before=GROUP3" fileName="menus/npp/nppMenuItems.xml" />
 </menuContributionFile>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.npp/utility/common_static/base/menus/npp/nppMenuItems.xml b/edexOsgi/com.raytheon.uf.edex.plugin.npp/utility/common_static/base/menus/npp/nppMenuItems.xml
index 9aef4ab0fe..9da8b2cbf3 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.npp/utility/common_static/base/menus/npp/nppMenuItems.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.npp/utility/common_static/base/menus/npp/nppMenuItems.xml
@@ -23,11 +23,12 @@
         version of the file will completely replace a lower priority version
         of the file. 
     -->
+<!-- L. Byerle 8/8/2023 Update for NOAA-21 and towr-s RPM v24 -->
 <menuTemplate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-    <contribute xsi:type="separator" id="MySeparatorId" />
-    <contribute xsi:type="titleItem" titleText="------ Polar Orbiting Satellites ------" id="polarSat"/>
-    <contribute xsi:type="subMenu" id="NPPProducts" menuText="S-NPP and NOAA-20 VIIRS Imagery">
-        <contribute xsi:type="separator" id="Imagery" visible="false" />
-    </contribute>
+    <contribute xsi:type="titleItem" titleText="----- Polar Satellites-----" id="Polar"/>
 
+    <contribute xsi:type="subMenu" id="NPPProducts" menuText="JPSS Polar (S-NPP, NOAA-20, NOAA-21)">
+        <contribute xsi:type="separator" id="Imagery"
+            visible="false" />
+    </contribute>
 </menuTemplate>
diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/distribution/satellite.gini.xml b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/distribution/satellite.gini.xml
index 316407886b..4180639cf1 100644
--- a/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/distribution/satellite.gini.xml
+++ b/edexOsgi/com.raytheon.uf.edex.plugin.satellite.gini/utility/common_static/base/distribution/satellite.gini.xml
@@ -37,9 +37,13 @@
     Cell: (301) 787-9925
      -->
 <!-- L. Byerle 11/26/2019 modify so that new global blended Hydro in netcdfgrid plugin are distinct those in this plugin. 
-     Specifically, to ensure that if the 4th digit is X then it will not be picked up by the satellite gini plugin -->
+     Specifically, to ensure that if the 4th digit is X then it will not be picked up by the satellite gini plugin
+     L. Byerle 5/8/2020 Separate TICF* into its own pattern to distinguish from new TICF* in grid format (see netcdfgrid.xml
+-->
 <!--  T. Meyer 9/202/2023 modify so Unidata's PNG compressed files will be decoded -->
-    <regex>TI[CGT][A-WYZ].. ....</regex>
+    <regex>TI[GT][A-WYZ].. ....</regex>
+<!-- Account for legacy multi-sat comp only (TICF*), but not new multi-sat comp used by netcdfgrid plugin -->
+    <regex>TICF0[134] ....</regex>
     <regex>.*NEXRCOMP.*</regex>
 
 </requestPatterns>
diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.goesr b/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.goesr
index 68cbe852fb..ecf07a2053 100644
--- a/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.goesr
+++ b/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.goesr
@@ -97,8 +97,7 @@ REQUEST NIMAGE "GLMISatSS" idd.unidata.ucar.edu # GOES Stitched GLM from NWS ISa
 REQUEST NIMAGE "(GeoColor|CloudSnow|DebraDust)" idd.unidata.ucar.edu # GOES CIRA RGBs (Unidata)
 REQUEST HDS|NOTHER "IXT.[8-9]9"  idd.unidata.ucar.edu # GOES Derived Products & Wind (SBN)
 REQUEST NOTHER "^IXT[WXY]01" idd.unidata.ucar.edu       # GOES Derived products-different WMO (COD, CPS, CTP) (SBN)
-
-#REQUEST NOTHER "^TI[A-W]... KNES" idd.unidata.ucar.edu  # VIIRS and GOES CMI (SBN)
+REQUEST NOTHER "^TI[A-W]... KNES" idd.unidata.ucar.edu  # VIIRS and GOES CMI (SBN)
 #REQUEST DIFAX "OR_GLM-L2" idd.unidata.ucar.edu # GOES GLM Level 2 (SBN) 
 #REQUEST UNIWISC|NIMAGE ".*" idd.unidata.ucar.edu        # AREA/GINI and GOES (NIMAGE feedtype includes DIFAX)
 #REQUEST DIFAX "OR_ABI" idd.unidata.ucar.edu            # GOES ABI netCDF4 (Unidata tiles - not using)
diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.main b/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.main
index 7683394ab3..af5d4d3161 100644
--- a/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.main
+++ b/rpms/awips2.upc/Installer.ldm/patch/etc/ldmd.main
@@ -95,7 +95,7 @@ EXEC	"rtstats -h rtstats.unidata.ucar.edu"
 REQUEST FNEXRAD ".*" idd.unidata.ucar.edu # MRMS - Unidata feed via NCEP
 REQUEST WMO ".*" idd.unidata.ucar.edu           # WMO Feedtype includes HDS|IDS|DDPLUS
 REQUEST UNIWISC|NIMAGE ".*" idd.unidata.ucar.edu        # AREA/GINI and GOES (NIMAGE feedtype includes DIFAX)
-REQUEST NOTHER "^TI[A-Q]... KNES" idd.unidata.ucar.edu  # VIIRS via SBN	
+REQUEST NOTHER "^TI[A-W]... KNES" idd.unidata.ucar.edu  # VIIRS via SBN	
 REQUEST NGRID ".*" idd.unidata.ucar.edu
 #REQUEST HDS ".*" idd.unidata.ucar.edu                  # Duplicate
 #REQUEST CMC ".*" idd.unidata.ucar.edu                   # CMC is an alias for GEM
@@ -108,7 +108,7 @@ REQUEST CONDUIT "pgrb2" idd.unidata.ucar.edu            # GFS
 REQUEST EXP "WwWind" idd.unidata.ucar.edu               # ESPL/PSD Profilers
 #REQUEST NGRID "^YAU[CDLMPQS]" idd.unidata.ucar.edu     # MRMS-NOAAPort
 REQUEST FSL2 "HRRR\.Smoke" idd.unidata.ucar.edu        # HRRR Smoke
-
+REQUEST EXP "RAWS.*" 10.0.0.233 #RAWS mesonet data
 #
 #REQUEST WMO ".*" initial-secondary-host.another.domain
 #REQUEST WMO ".*" another-secondary-host.yet_another.domain:3152
diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf.priority b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf.priority
index ab83701110..8eb90e4e20 100644
--- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf.priority
+++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.conf.priority
@@ -23,6 +23,8 @@
 #                       Update RTOFS entry
 #                       Update SPCGuide gridded products to include Fire Weather and Dry Thunderstorm grids
 #                       Update level3 radar product entry
+#                       Update viirs polar product entry
+
 # USPLN
 LIGHTNING	USPLN1EX
 	FILE	-close -edex	/awips2/data_store/lightning/%Y%m%d%H%M.uspln
@@ -184,9 +186,9 @@ NOTHER	^(IXT[WXY]01) (KNES) (..)(..)(..)
 #NIMAGE	^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/DerivedMotionWinds/([^/]*)/([^/]*)/([0-9]{8})/([^/]*)(c[0-9]{7})(..)(.....).nc
 #	FILE	-close -edex	/awips2/data_store/GOES/\4/\7/derived-IDD/\5\6\7\8.nc4
 
-# GOES 16 GLM gridded products via Texas Tech-->Unidata IDD 
-NIMAGE	^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/GeostationaryLightningMapper/([^/]*)/([0-9]{8})/([^/]*)(c[0-9]{7})(..)(.....).nc
-	FILE	-close -edex	/awips2/data_store/GOES/\3/\6/GLM-IDD/\4\5\6\7.nc4
+# GOES 16 GLM gridded products via Texas Tech-->Unidata IDD (depricated)
+#NIMAGE	^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/GeostationaryLightningMapper/([^/]*)/([0-9]{8})/([^/]*)(c[0-9]{7})(..)(.....).nc
+#	FILE	-close -edex	/awips2/data_store/GOES/\3/\6/GLM-IDD/\4\5\6\7.nc4
 
 # GOES GLM Raw data - don't use, AWIPS does not display the raw GLM data (not using)
 #DIFAX	^/data/cspp-geo/(EAST|WEST|GRB-R)/OR_GLM-L2-([^/]*).nc
@@ -214,7 +216,7 @@ NIMAGE	^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/CloudSnow/([^/]*)/(
 # NPP/VIIRS
 #
 # Polar products
-NOTHER	^(TI[A-Q]...) (KNES) (......)
+NOTHER	^(TI[A-T]...) (KNES) (......)
 	FILE	-close -edex	/awips2/data_store/viirs/\1_\2_\3
 #
 # NEXRAD3 GEMPAK-generated national composite (1-4km)
diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.goesr b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.goesr
index d8d67c8b67..a88888f81c 100644
--- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.goesr
+++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.goesr
@@ -45,8 +45,8 @@ NOTHER	^(IXT[WXY]01) (KNES) (..)(..)(..)
 #	FILE	-close -edex	/awips2/data_store/GOES/\4/\7/derived-IDD/\5\6\7\8.nc4
 
 # GOES 16 GLM gridded products via Texas Tech-->Unidata IDD (depricated)
-NIMAGE	^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/GeostationaryLightningMapper/([^/]*)/([0-9]{8})/([^/]*)(c[0-9]{7})(..)(.....).nc
-	FILE	-close -edex	/awips2/data_store/GOES/\3/\6/GLM-IDD/\4\5\6\7.nc4
+#NIMAGE	^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/GeostationaryLightningMapper/([^/]*)/([0-9]{8})/([^/]*)(c[0-9]{7})(..)(.....).nc
+#	FILE	-close -edex	/awips2/data_store/GOES/\3/\6/GLM-IDD/\4\5\6\7.nc4
 
 # GOES GLM Raw data - don't use, AWIPS does not display the raw GLM data (not using)
 #DIFAX	^/data/cspp-geo/(EAST|WEST|GRB-R)/OR_GLM-L2-([^/]*).nc
@@ -70,10 +70,18 @@ NIMAGE	^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/DebraDust/([^/]*)/(
 NIMAGE	^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/CloudSnow/([^/]*)/([^/]*)/([0-9]{8})/([^/]*)(c[0-9]{7})(..)(.....).nc
 	FILE	-close -edex	/awips2/data_store/GOES/\4/\7/CIRA/CloudSnow/\5\6\7\8.nc4
 
+#
+# NPP/VIIRS
+#
+# Polar products
+NOTHER	^(TI[A-W]...) (KNES) (......)
+	FILE	-close -edex	/awips2/data_store/viirs/\1_\2_\3
+
 #  GOES East Derived Products      WMO Header    Regions
 #  ---------------                 ----------    -------
 #  Aerosol Detection (Smoke+Dust)  IXTA99 KNES   F,C,M
 #  Aerosol Optical Depth           IXTB99 KNES   F,C
+#  Cloud Cover Layers              IXTC99 KNES   F,C,M
 #  Cloud Top Phase                 IXTD99 KNES   F,C,M
 #  Fog and Low Stratus             IXTE99 KNES   C
 #  Rainfall Rate/QPE               IXTF99 KNES   F
@@ -82,12 +90,14 @@ NIMAGE	^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/CloudSnow/([^/]*)/(
 #  Cloud Top Temperature           IXTI99 KNES   F,M
 #  Fire/Hot Spot Characterization  IXTJ99 KNES   F,C,M
 #  Land Surface (Skin) Temperature IXTK99 KNES   F,C,M
+#  Fractional Snow Cover	   IXTL99 KNES   F
 #  Sea Surface (Skin) Temperature  IXTM99 KNES   F
 #  Derived Stability Indices       IXTN99 KNES   F,C,M
 #  Total Precipitable Water        IXTO99 KNES   F,C,M
 #  Vertical Moisture Profile       IXTP99 KNES   C
 #  Vertical Temperature Profile    IXTQ99 KNES   C
-#  Geostationay Lightning Mapper   IXTR99 KNES   F,C
+#  Ice Concentration and Extent    IXTR99 KNES   F
+#  Ice Thickness and Age	   IXTT99 KNES   F
 #  Derived Motion Winds            IXTU99 KNES   C,M
 #  Cloud Particle Size Dist        IXTW01 KNES   F,C,M
 #  Cloud Top Pressure              IXTX01 KNES   F,C
@@ -97,6 +107,7 @@ NIMAGE	^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/CloudSnow/([^/]*)/(
 #  ---------------                 ----------    -------
 #  Aerosol Detection 		   IXTA89 KNES	 F,C,M
 #  Aerosol Optical Depth	   IXTB89 KNES	 F,C
+#  Cloud Cover Layers              IXTC89 KNES   F,C,M
 #  Cloud Top Phase		   IXTD89 KNES	 F,C,M
 #  Rainfall Rate/QPE		   IXTF89 KNES	 F
 #  Cloud Top Height		   IXTG89 KNES	 F,C,M
@@ -104,9 +115,13 @@ NIMAGE	^/data/ldm/pub/native/satellite/GOES/([^/]*)/Products/CloudSnow/([^/]*)/(
 #  Cloud Top Temperature	   IXTI89 KNES	 F,M
 #  Fire/Hot Spot Characterization  IXTJ89 KNES   F,C,M
 #  Land Sfc (Skin) Temp		   IXTK89 KNES	 F,C,M
+#  Fractional Snow Cover	   IXTL89 KNES   F
+#  Sea Surface (Skin) Temperature  IXTM99 KNES   F
 #  Sea Sfc Temp (skin)		   IXTM89 KNES	 F
 #  Derived Stability Indices	   IXTN89 KNES	 F,C,M
 #  Total Precip Water		   IXTO89 KNES	 F,C,M
 #  Vertical Moisture Profile	   IXTP89 KNES	 C
 #  Vertical Temperature Profile	   IXTQ89 KNES	 C
-#  Derived Motion Winds	   	   IXUT89 KNES	 C
+#  Ice Concentration and Extent    IXTR89 KNES   F
+#  Ice Thickness and Age	   IXTT89 KNES   F
+#  Derived Motion Winds	   	   IXTU89 KNES	 C
diff --git a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.main b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.main
index a10adb3e46..867040f8c4 100644
--- a/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.main
+++ b/rpms/awips2.upc/Installer.ldm/patch/etc/pqact.main
@@ -156,12 +156,6 @@ IDS|DDPLUS	^(W[CSV]PN[01][1-9]) (KKCI) (..)(..)(..)
 ANY	^([PQ][A-Z0-9]{3,5}) (....) (..)(..)(..) !redbook [^/]*/([^/]*)/([^/]*)/([^/]*)/([0-9]{8})
 	FILE	-overwrite -close -edex	/awips2/data_store/redbook/\4\5Z_\8_\7_\6-\1_\2.rb
 #
-# NPP/VIIRS
-#
-# Polar products
-NOTHER	^(TI[A-Q]...) (KNES) (......)
-	FILE	-close -edex	/awips2/data_store/viirs/\1_\2_\3
-#
 # NEXRAD3 GEMPAK-generated national composite (1-4km)
 #
 FNEXRAD	^rad/NEXRCOMP/(...)/(...)_(........)_(....)