diff --git a/fix/upp/fv3lam_rrfs.xml b/fix/upp/fv3lam_rrfs.xml
index 108e69d27..a9cf5fb91 100755
--- a/fix/upp/fv3lam_rrfs.xml
+++ b/fix/upp/fv3lam_rrfs.xml
@@ -726,12 +726,6 @@
        <scale>-4.0</scale>
        </param>
 
-       <param>
-       <shortname>ACM_WEASD_ON_SURFACE</shortname>
-       <pname>WEASD</pname>
-       <scale>4.0</scale>
-       </param>
-
        <param>
        <shortname>ACM_SNOM_ON_SURFACE</shortname>
        <pname>SNOM</pname>
@@ -759,28 +753,28 @@
        </param>
 
        <param>
-       <shortname>INST_CRAIN_ON_SURFACE</shortname>
+       <shortname>GSD_INST_CRAIN_ON_SURFACE</shortname>
        <pname>CRAIN</pname>
        <table_info>NCEP</table_info>
        <scale>1.0</scale>
         </param>
 
        <param>
-       <shortname>CSNOW_ON_SURFACE</shortname>
+       <shortname>GSD_CSNOW_ON_SURFACE</shortname>
        <pname>CSNOW</pname>
        <table_info>NCEP</table_info>
        <scale>1.0</scale>
         </param>
 
        <param>
-       <shortname>CICEP_ON_SURFACE</shortname>
+       <shortname>GSD_CICEP_ON_SURFACE</shortname>
        <pname>CICEP</pname>
        <table_info>NCEP</table_info>
        <scale>1.0</scale>
         </param>
 
        <param>
-       <shortname>CFRZR_ON_SURFACE</shortname>
+       <shortname>GSD_CFRZR_ON_SURFACE</shortname>
        <pname>CFRZR</pname>
        <table_info>NCEP</table_info>
        <scale>1.0</scale>
@@ -1158,7 +1152,7 @@
        <param>
        <shortname>TMP_ON_SPEC_HGT_LVL_ABOVE_GRND_FDHGT</shortname>
        <pname>TMP</pname>
-       <level>30. 50. 80. 100.</level>
+       <level>30. 50. 80. 100. 160. 320.</level>
        <scale>3.0</scale>
         </param>
 
@@ -1172,7 +1166,7 @@
        <param>
        <shortname>UGRD_ON_SPEC_HGT_LVL_ABOVE_GRND_FDHGT</shortname>
        <pname>UGRD</pname>
-       <level>30. 50. 80. 100.</level>
+       <level>30. 50. 80. 100. 160. 320.</level>
        <scale>4.0</scale>
         </param>
 
@@ -1186,7 +1180,7 @@
        <param>
        <shortname>VGRD_ON_SPEC_HGT_LVL_ABOVE_GRND_FDHGT</shortname>
        <pname>VGRD</pname>
-       <level>30. 50. 80. 100.</level>
+       <level>30. 50. 80. 100. 160. 320.</level>
        <scale>4.0</scale>
         </param>
 
@@ -1200,14 +1194,14 @@
        <param>
        <shortname>SPFH_ON_SPEC_HGT_LVL_ABOVE_GRND_FDHGT</shortname>
        <pname>SPFH</pname>
-       <level>30. 50. 80. 100.</level>
+       <level>30. 50. 80. 100. 160. 320.</level>
        <scale>5.0</scale>
         </param>
 
        <param>
        <shortname>PRES_ON_SPEC_HGT_LVL_ABOVE_GRND_FDHGT</shortname>
        <pname>PRES</pname>
-       <level>30. 50. 80. 100.</level>
+       <level>30. 50. 80. 100. 160. 320.</level>
        <scale>3.0</scale>
         </param>
 
@@ -2396,8 +2390,8 @@
        </param>
 
        <param>
-       <shortname>ACM_WEASD_ON_SURFACE</shortname>
-       <pname>WEASD</pname>
+       <shortname>ACM_SNOWFALL_ON_SURFACE</shortname>
+       <pname>TSNOWP</pname>
        <scale>4.0</scale>
        </param>
 
@@ -3550,10 +3544,20 @@
        <scale>4.0</scale>
        </param>
 
+       <param>
+       <shortname>GSD_MAX_LTG_THREAT1_ON_SPEC_HGT_LVL_ABOVE_GRND</shortname>
+       <scale>4.0</scale>
+       </param>
+
+       <param>
+       <shortname>GSD_MAX_LTG_THREAT2_ON_SPEC_HGT_LVL_ABOVE_GRND</shortname>
+       <scale>4.0</scale>
+       </param>
+
        <param>
        <shortname>GSD_MAX_LTG_THREAT3_ON_ENTIRE_ATMOS</shortname>
        <pname>LTNG</pname>
-       <scale>3.0</scale>
+       <scale>4.0</scale>
        </param>
 
        <param>
diff --git a/fix/upp/post_avblflds.xml b/fix/upp/post_avblflds.xml
index a19c4ac3e..e4a53526a 100755
--- a/fix/upp/post_avblflds.xml
+++ b/fix/upp/post_avblflds.xml
@@ -6561,23 +6561,23 @@
     <!-- no grib2 definition for 702-710 -->
     <param>
        <post_avblfldidx>702</post_avblfldidx>
-       <shortname>GSD_MAX_LTG_THREAT1_ON_ENTIRE_ATMOS</shortname>
+       <shortname>GSD_MAX_LTG_THREAT1_ON_SPEC_HGT_LVL_ABOVE_GRND</shortname>
        <pdstmpl>tmpl4_8</pdstmpl>
-       <pname>LTGTHREAT1</pname>
-       <table_info>NCEP</table_info>
+       <pname>LTNGSD</pname>
        <stats_proc>MAX</stats_proc>
-       <fixed_sfc1_type>entire_atmos</fixed_sfc1_type>
+       <fixed_sfc1_type>spec_hgt_lvl_above_grnd</fixed_sfc1_type>
+       <level>1.</level>
        <scale>3.0</scale>
     </param>
 
     <param>
        <post_avblfldidx>703</post_avblfldidx>
-       <shortname>GSD_MAX_LTG_THREAT2_ON_ENTIRE_ATMOS</shortname>
+       <shortname>GSD_MAX_LTG_THREAT2_ON_SPEC_HGT_LVL_ABOVE_GRND</shortname>
        <pdstmpl>tmpl4_8</pdstmpl>
-       <pname>LTGTHREAT2</pname>
-       <table_info>NCEP</table_info>
+       <pname>LTNGSD</pname>
        <stats_proc>MAX</stats_proc>
-       <fixed_sfc1_type>entire_atmos</fixed_sfc1_type>
+       <fixed_sfc1_type>spec_hgt_lvl_above_grnd</fixed_sfc1_type>
+       <level>2.</level>
        <scale>3.0</scale>
     </param>
 
diff --git a/fix/upp/postxconfig-NT-fv3lam_rrfs.txt b/fix/upp/postxconfig-NT-fv3lam_rrfs.txt
index 38f05cbb9..31d8a0ed5 100644
--- a/fix/upp/postxconfig-NT-fv3lam_rrfs.txt
+++ b/fix/upp/postxconfig-NT-fv3lam_rrfs.txt
@@ -1,7 +1,7 @@
 3
 4
-235
-288
+237
+287
 PRSLEV
 32769
 ncep_nco
@@ -3718,43 +3718,6 @@ surface
 ?
 ?
 ?
-35
-ACM_WEASD_ON_SURFACE
-?
-1
-tmpl4_8
-WEASD
-?
-ACM
-surface
-0
-?
-0
-?
-?
-0
-?
-0
-?
-?
-?
-0
-0.0
-0
-0.0
-?
-0
-0.0
-0
-0.0
-1
-4.0
-0
-0
-0
-?
-?
-?
 121
 ACM_SNOM_ON_SURFACE
 ?
@@ -3903,9 +3866,9 @@ surface
 ?
 ?
 ?
-160
-INST_CRAIN_ON_SURFACE
-?
+407
+GSD_INST_CRAIN_ON_SURFACE
+GSD_instant precipitation type on surface
 1
 tmpl4_0
 CRAIN
@@ -3940,9 +3903,9 @@ surface
 ?
 ?
 ?
-551
-CSNOW_ON_SURFACE
-Categorical snow on surface
+559
+GSD_CSNOW_ON_SURFACE
+GSD_Categorical snow on surface
 1
 tmpl4_0
 CSNOW
@@ -3977,9 +3940,9 @@ surface
 ?
 ?
 ?
-552
-CICEP_ON_SURFACE
-Categorical ice pellets on surface
+560
+GSD_CICEP_ON_SURFACE
+GSD_Categorical ice pellets on surface
 1
 tmpl4_0
 CICEP
@@ -4014,9 +3977,9 @@ surface
 ?
 ?
 ?
-553
-CFRZR_ON_SURFACE
-Categorical freezing rain on surface
+561
+GSD_CFRZR_ON_SURFACE
+GSD_Categorical freezing rain on surface
 1
 tmpl4_0
 CFRZR
@@ -6171,8 +6134,8 @@ TMP
 spec_hgt_lvl_above_grnd
 0
 ?
-4
-30. 50. 80. 100.
+6
+30. 50. 80. 100. 160. 320.
 ?
 0
 ?
@@ -6245,8 +6208,8 @@ UGRD
 spec_hgt_lvl_above_grnd
 0
 ?
-4
-30. 50. 80. 100.
+6
+30. 50. 80. 100. 160. 320.
 ?
 0
 ?
@@ -6319,8 +6282,8 @@ VGRD
 spec_hgt_lvl_above_grnd
 0
 ?
-4
-30. 50. 80. 100.
+6
+30. 50. 80. 100. 160. 320.
 ?
 0
 ?
@@ -6393,8 +6356,8 @@ SPFH
 spec_hgt_lvl_above_grnd
 0
 ?
-4
-30. 50. 80. 100.
+6
+30. 50. 80. 100. 160. 320.
 ?
 0
 ?
@@ -6430,8 +6393,8 @@ PRES
 spec_hgt_lvl_above_grnd
 0
 ?
-4
-30. 50. 80. 100.
+6
+30. 50. 80. 100. 160. 320.
 ?
 0
 ?
@@ -13021,12 +12984,12 @@ surface
 ?
 ?
 ?
-35
-ACM_WEASD_ON_SURFACE
+1004
+ACM_SNOWFALL_ON_SURFACE
 ?
 1
 tmpl4_8
-WEASD
+TSNOWP
 ?
 ACM
 surface
@@ -19311,6 +19274,80 @@ top_of_atmos
 ?
 ?
 ?
+702
+GSD_MAX_LTG_THREAT1_ON_SPEC_HGT_LVL_ABOVE_GRND
+?
+1
+tmpl4_8
+LTNGSD
+?
+MAX
+spec_hgt_lvl_above_grnd
+0
+?
+1
+1.
+?
+0
+?
+0
+?
+?
+?
+0
+0.0
+0
+0.0
+?
+0
+0.0
+0
+0.0
+1
+4.0
+0
+0
+0
+?
+?
+?
+703
+GSD_MAX_LTG_THREAT2_ON_SPEC_HGT_LVL_ABOVE_GRND
+?
+1
+tmpl4_8
+LTNGSD
+?
+MAX
+spec_hgt_lvl_above_grnd
+0
+?
+1
+2.
+?
+0
+?
+0
+?
+?
+?
+0
+0.0
+0
+0.0
+?
+0
+0.0
+0
+0.0
+1
+4.0
+0
+0
+0
+?
+?
+?
 704
 GSD_MAX_LTG_THREAT3_ON_ENTIRE_ATMOS
 ?
@@ -19341,7 +19378,7 @@ entire_atmos
 0
 0.0
 1
-3.0
+4.0
 0
 0
 0
diff --git a/ush/templates/diag_table.FV3_HRRR b/ush/templates/diag_table.FV3_HRRR
index 4436d4883..e48aa451a 100644
--- a/ush/templates/diag_table.FV3_HRRR
+++ b/ush/templates/diag_table.FV3_HRRR
@@ -351,7 +351,20 @@
 #"gfs_phys",    "skebv_wts",     "skebv_wts",     "fv3_history",  "all", .false., "none", 2
 #"dynamics",    "diss_est",      "diss_est",      "fv3_history",  "all", .false., "none", 2
 #"gfs_phys",    "shum_wts",      "shum_wts",      "fv3_history",  "all", .false., "none", 2
-
+#
+"gfs_phys",    "frzr",      "frzr",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "frzrb",     "frzrb",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "frozr",     "frozr",       "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "frozrb",    "frozrb",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "tsnowp",    "tsnowp",      "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "tsnowpb",   "tsnowpb",     "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "rhonewsn",  "rhonewsn",    "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "snow",      "snow",        "fv3_history2d",  "all",  .false.,  "none",  2
+"gfs_phys",    "graupel",   "graupel",     "fv3_history2d",  "all",  .false.,  "none",  2
+# lightning threat indices
+"gfs_sfc",     "ltg1_max",  "ltg1_max",    "fv3_history2d",   "all", .false.,   "none", 2
+"gfs_sfc",     "ltg2_max",  "ltg2_max",    "fv3_history2d",   "all", .false.,   "none", 2
+"gfs_sfc",     "ltg3_max",  "ltg3_max",    "fv3_history2d",   "all", .false.,   "none", 2
 #=============================================================================================
 #
 #====> This file can be used with diag_manager/v2.0a (or higher) <====
@@ -394,7 +407,6 @@
 "gfs_dyn",     "coarsepm",    "coarsepm",  "fv3_history",  "all",  .false.,  "none",  2
 
 # Aerosols emission for smoke
-"gfs_sfc",     "aodtot",       "aodtot",        "fv3_history2d",  "all",  .false.,  "none",  2
 "gfs_sfc",     "emdust",       "emdust",        "fv3_history2d",  "all",  .false.,  "none",  2
 "gfs_sfc",     "emseas",       "emseas",        "fv3_history2d",  "all",  .false.,  "none",  2
 "gfs_sfc",     "emanoc",       "emanoc",        "fv3_history2d",  "all",  .false.,  "none",  2
@@ -408,3 +420,4 @@
 "gfs_phys",    "ebu_smoke",    "ebu_smoke",     "fv3_history",    "all",  .false.,  "none",  2
 "gfs_phys",    "smoke_ext",    "smoke_ext",     "fv3_history",    "all",  .false.,  "none",  2
 "gfs_phys",    "dust_ext",     "dust_ext",      "fv3_history",    "all",  .false.,  "none",  2
+"gfs_phys",    "ext550",       "ext550",        "fv3_history",    "all",  .false.,  "none",  2