diff --git a/build.sh b/build.sh
index 1deefe49..b678f3cc 100755
--- a/build.sh
+++ b/build.sh
@@ -276,9 +276,10 @@ if [[ $BUILD_WORKAROUND == 'YES' ]]; then
   cp ../sorc/_workaround_/saber/gsi_covariance_mod.f90 ../sorc/saber/src/saber/gsi/covariance/gsi_covariance_mod.f90
   cp ../sorc/_workaround_/saber/gsi_grid_mod.f90       ../sorc/saber/src/saber/gsi/grid/gsi_grid_mod.f90
   cp ../sorc/_workaround_/saber/Geometry.cc            ../sorc/saber/src/saber/interpolation/Geometry.cc
-  # No PR for gsibec yet
+  # No PR for full gsibec changes
+  # gsibec PR #88 for qoption2: https://github.com/GEOS-ESM/GSIbec/pull/88
   cp ../sorc/_workaround_/gsibec/*                     ../sorc/gsibec/src/gsibec/gsi
-  # No PR for fv3jedi yet
+  # fv3-jedi PR #1447: https://github.com/JCSDA-internal/fv3-jedi/pull/1447
   cp ../sorc/_workaround_/fv3-jedi/fv3jedi_linvarcha_c2a_mod.f90 ../sorc/fv3-jedi/src/fv3jedi/LinearVariableChange/Control2Analysis/
 
   # Workaround for adding MGBF
@@ -292,6 +293,7 @@ if [[ $BUILD_WORKAROUND == 'YES' ]]; then
 
   # Workaround for reading reflectivity from phy_data.nc file
   # PR: https://github.com/JCSDA-internal/fv3-jedi/pull/1442
+  # Merged so this can be removed during the next submodule update
   cp ../sorc/_workaround_/fv3-jedi/fv3jedi_io_fms2_mod.f90 ../sorc/fv3-jedi/src/fv3jedi/IO/FV3Restart
 
 fi
diff --git a/fix/mgbf/mgbf_p196_14x14.nml b/fix/mgbf/mgbf_p196_14x14.nml
index 40f21a97..927d039c 100644
--- a/fix/mgbf/mgbf_p196_14x14.nml
+++ b/fix/mgbf/mgbf_p196_14x14.nml
@@ -1,14 +1,15 @@
 &PARAMETERS_MGBETA
-  mg_ampl01=5.0,mg_ampl02=1.0,mg_ampl03=2.0,
-  mg_weig1=20.,mg_weig2=135.,mg_weig3=15000.,mg_weig4=1.,
-  hx=6,hy=6,hz=12,p=2,
+  mg_ampl01=1.1,mg_ampl02=0.9,mg_ampl03=2.0,
+  mg_weig1=20.,mg_weig2=120.,mg_weig3=15000.,mg_weig4=1.,
+  hx=6,hy=6,hz=6,p=2,
   mgbf_line=.true., mgbf_proc=5,
-  lm_a=65,lm=65,km2=0,km3=6,
+  lm_a=65,lm=32,km2=0,km3=6,
   coef_normalization_const=1.2236
   nxPE=14,nyPE=14,im_filt=16,jm_filt=16,
   nm0 = 224,
   mm0 = 224,
   l_vertical_filter=.true.,
+  l_anal_sub_of_filt=.true.,
   gm_max=2,
   l_for_localization=.true.,
   ldelta=.false.,
diff --git a/fix/mgbf/mgbf_p196_14x14_dbz.nml b/fix/mgbf/mgbf_p196_14x14_dbz.nml
index 0b552a36..a5e74431 100644
--- a/fix/mgbf/mgbf_p196_14x14_dbz.nml
+++ b/fix/mgbf/mgbf_p196_14x14_dbz.nml
@@ -1,14 +1,15 @@
 &PARAMETERS_MGBETA
-  mg_ampl01=5.0,mg_ampl02=1.0,mg_ampl03=2.0,
-  mg_weig1=20.,mg_weig2=135.,mg_weig3=15000.,mg_weig4=1.,
-  hx=6,hy=6,hz=12,p=2,
+  mg_ampl01=1.1,mg_ampl02=0.9,mg_ampl03=2.0,
+  mg_weig1=20.,mg_weig2=120.,mg_weig3=15000.,mg_weig4=1.,
+  hx=6,hy=6,hz=6,p=2,
   mgbf_line=.true., mgbf_proc=5,
-  lm_a=65,lm=65,km2=0,km3=13,
+  lm_a=65,lm=32,km2=0,km3=13,
   coef_normalization_const=1.2236
   nxPE=14,nyPE=14,im_filt=16,jm_filt=16,
   nm0 = 224,
   mm0 = 224,
   l_vertical_filter=.true.,
+  l_anal_sub_of_filt=.true.,
   gm_max=2,
   l_for_localization=.true.,
   ldelta=.false.,
diff --git a/rrfs-test/CMakeLists.txt b/rrfs-test/CMakeLists.txt
index 6e7f6cc5..081ce354 100644
--- a/rrfs-test/CMakeLists.txt
+++ b/rrfs-test/CMakeLists.txt
@@ -41,7 +41,7 @@ set (src_yaml "${CMAKE_SOURCE_DIR}/rrfs-test/testinput")
 #  set (fv3-jedi_data_testinput_tier_1_local "$ENV{FV3_JEDI_TESTFILES}/fv3-jedi-data/testinput_tier_1")
 
 # Add some general job settings here
-set(MPI_ARGS "${MPI_ARGS} --time=00:45:00 --exclusive")
+set(MPI_ARGS "${MPI_ARGS} --time=00:30:00 --exclusive")
 set(RESTORE_MPI_ARGS ${MPI_ARGS})
 
 if(FV3_DYCORE)
diff --git a/rrfs-test/testoutput/rrfs-fv3jedi-3denvar_mgbf.ref b/rrfs-test/testoutput/rrfs-fv3jedi-3denvar_mgbf.ref
index f6a8a9f7..e2ac4ac3 100644
--- a/rrfs-test/testoutput/rrfs-fv3jedi-3denvar_mgbf.ref
+++ b/rrfs-test/testoutput/rrfs-fv3jedi-3denvar_mgbf.ref
@@ -1,78 +1,78 @@
-CostJo   : Nonlinear Jo(aircar_airTemperature_133) = 1.7109300271492390e+04, nobs = 26912, Jo/n = 6.3574986145557333e-01, err = 9.0703353310406665e-01
-CostJo   : Nonlinear Jo(aircar_specificHumidity_133) = 1.1576103821861009e+03, nobs = 3846, Jo/n = 3.0099073899794615e-01, err = 1.8463121387412148e-03
-CostJo   : Nonlinear Jo(aircar_winds_233) = 4.5918477878982012e+04, nobs = 57216, Jo/n = 8.0254610386923264e-01, err = 2.6503185933157223e+00
-CostFunction: Nonlinear J = 6.4185388532660501e+04
-DRPCGMinimizer: reduction in residual norm = 2.3915261402596465e-03
+CostJo   : Nonlinear Jo(aircar_airTemperature_133) = 1.7109300271492430e+04, nobs = 26912, Jo/n = 6.3574986145557477e-01, err = 9.0703353310406665e-01
+CostJo   : Nonlinear Jo(aircar_specificHumidity_133) = 1.1576104621804134e+03, nobs = 3846, Jo/n = 3.0099075979729939e-01, err = 1.8463121163155127e-03
+CostJo   : Nonlinear Jo(aircar_winds_233) = 4.5918477878981983e+04, nobs = 57216, Jo/n = 8.0254610386923209e-01, err = 2.6503185933157223e+00
+CostFunction: Nonlinear J = 6.4185388612654824e+04
+DRPCGMinimizer: reduction in residual norm = 5.8376804357152716e-03
 CostFunction::addIncrement: Analysis: 
 ----------------------------------------------------------------------------------------------------
 State print | number of fields = 28 | cube sphere face size: C420
-eastward_wind                                | Min:-2.7017492294311523e+01 Max:+5.5174955334850473e+01 RMS:+1.3316813676814377e+01
-northward_wind                               | Min:-4.4834327488490288e+01 Max:+4.0178013622531978e+01 RMS:+6.4888598390319281e+00
-air_temperature                              | Min:+1.9402627011131145e+02 Max:+3.1449734497070312e+02 RMS:+2.5825612242931044e+02
+eastward_wind                                | Min:-2.7017492294311523e+01 Max:+5.5337978184153805e+01 RMS:+1.3323563083296090e+01
+northward_wind                               | Min:-4.5226179348417212e+01 Max:+4.0336882262153154e+01 RMS:+6.4935156857873961e+00
+air_temperature                              | Min:+1.9402618026858133e+02 Max:+3.1449734497070312e+02 RMS:+2.5825978148033317e+02
 air_pressure_thickness                       | Min:+1.4039907836914062e+02 Max:+3.3267851562500000e+03 RMS:+1.7747128794076129e+03
-water_vapor_mixing_ratio_wrt_moist_air       | Min:+0.0000000000000000e+00 Max:+2.6436080429250705e-02 RMS:+5.5190318304343513e-03
+water_vapor_mixing_ratio_wrt_moist_air       | Min:+0.0000000000000000e+00 Max:+2.6475114050935635e-02 RMS:+5.5190455365890078e-03
 cloud_liquid_ice                             | Min:+0.0000000000000000e+00 Max:+3.5491219023242593e-04 RMS:+2.6466693180263384e-06
 cloud_liquid_water                           | Min:+0.0000000000000000e+00 Max:+1.4309773687273264e-03 RMS:+1.9256935244694528e-05
-ozone_mass_mixing_ratio                      | Min:+0.0000000000000000e+00 Max:+1.6040661648730747e-05 RMS:+4.4486298062797521e-06
-geopotential_height_times_gravity_at_surface | Min:+0.0000000000000000e+00 Max:+3.5301851562500000e+04 RMS:+7.8466628379223748e+03
+ozone_mass_mixing_ratio                      | Min:+0.0000000000000000e+00 Max:+1.6040661648730747e-05 RMS:+4.4486332492474275e-06
+geopotential_height_times_gravity_at_surface | Min:+0.0000000000000000e+00 Max:+3.5301851562500000e+04 RMS:+7.8466628379223739e+03
 f10m                                         | Min:+1.0004938840866089e+00 Max:+1.0948654413223267e+00 RMS:+1.0188698647586811e+00
 slmsk                                        | Min:+0.0000000000000000e+00 Max:+2.0000000000000000e+00 RMS:+7.8767192390790086e-01
 sheleg                                       | Min:+0.0000000000000000e+00 Max:+1.6966506958007812e+01 RMS:+2.0734254733790997e-01
-skin_temperature_at_surface                  | Min:+2.7119995117187500e+02 Max:+3.2296466064453125e+02 RMS:+2.9475363971841762e+02
+skin_temperature_at_surface                  | Min:+2.7119995117187500e+02 Max:+3.2296466064453125e+02 RMS:+2.9475363971841756e+02
 vtype                                        | Min:+0.0000000000000000e+00 Max:+2.0000000000000000e+01 RMS:+7.1648734770793263e+00
 stype                                        | Min:+0.0000000000000000e+00 Max:+1.6000000000000000e+01 RMS:+5.0688774416549585e+00
 vfrac                                        | Min:+0.0000000000000000e+00 Max:+9.9000000953674316e-01 RMS:+4.4064937959870992e-01
 soilt                                        | Min:+2.7023922729492188e+02 Max:+3.2296466064453125e+02 RMS:+2.9475315924680575e+02
 soilm                                        | Min:+1.4970073476433754e-02 Max:+1.0000000000000000e+00 RMS:+6.3592927195821791e-01
 eastward_wind_at_surface                     | Min:-1.2974018096923828e+01 Max:+1.2164360046386719e+01 RMS:+3.6171520010516645e+00
-northward_wind_at_surface                    | Min:-1.3966897010803223e+01 Max:+1.2346966743469238e+01 RMS:+3.7014659136589296e+00
-air_pressure_at_surface                      | Min:+6.6027478633412946e+04 Max:+1.0240633677673340e+05 RMS:+9.6259622526740102e+04
+northward_wind_at_surface                    | Min:-1.3966897010803223e+01 Max:+1.2346966743469238e+01 RMS:+3.7014659136589292e+00
+air_pressure_at_surface                      | Min:+6.6027444898754300e+04 Max:+1.0240633677673340e+05 RMS:+9.6259060231809315e+04
 rain_water                                   | Min:+0.0000000000000000e+00 Max:+1.7932932823896408e-03 RMS:+1.6047798774338740e-05
-snow_water                                   | Min:+0.0000000000000000e+00 Max:+5.0736027769744396e-03 RMS:+4.4287745731177579e-05
+snow_water                                   | Min:+0.0000000000000000e+00 Max:+5.0736027769744396e-03 RMS:+4.4287745731177572e-05
 graupel                                      | Min:+0.0000000000000000e+00 Max:+6.5326219191774726e-04 RMS:+3.0288534886145332e-06
 cloud_droplet_number_concentration           | Min:+0.0000000000000000e+00 Max:+1.5055759360000000e+09 RMS:+2.0745188331041779e+07
 cloud_ice_number_concentration               | Min:+0.0000000000000000e+00 Max:+5.0166070000000000e+06 RMS:+2.8482317076120682e+04
 rain_number_concentration                    | Min:+0.0000000000000000e+00 Max:+8.6749025000000000e+05 RMS:+2.1760084842806405e+03
-upward_air_velocity                          | Min:-9.9441605806350708e-01 Max:+2.9850695133209229e+00 RMS:+5.5847735613424862e-02
+upward_air_velocity                          | Min:-9.9441605806350708e-01 Max:+2.9850695133209229e+00 RMS:+5.5847735613424869e-02
 ----------------------------------------------------------------------------------------------------
-CostJo   : Nonlinear Jo(aircar_airTemperature_133) = 6843.860151279297, nobs = 26912, Jo/n = 0.2543051483085351, err = 0.9070335331040666
-CostJo   : Nonlinear Jo(aircar_specificHumidity_133) = 603.6653298314316, nobs = 3846, Jo/n = 0.1569592641267373, err = 0.001846312138741215
-CostJo   : Nonlinear Jo(aircar_winds_233) = 14679.73366955117, nobs = 57216, Jo/n = 0.2565669335422114, err = 2.650318593315722
-CostFunction: Nonlinear J = 22127.2591506619
-DRPCGMinimizer: reduction in residual norm = 0.009922760950611767
+CostJo   : Nonlinear Jo(aircar_airTemperature_133) = 6436.905565048216, nobs = 26912, Jo/n = 0.2391834707583315, err = 0.9070335331040666
+CostJo   : Nonlinear Jo(aircar_specificHumidity_133) = 567.2227929091773, nobs = 3846, Jo/n = 0.1474838255094065, err = 0.001846312116315513
+CostJo   : Nonlinear Jo(aircar_winds_233) = 13872.52113167875, nobs = 57216, Jo/n = 0.2424587725754815, err = 2.650318593315722
+CostFunction: Nonlinear J = 20876.64948963614
+DRPCGMinimizer: reduction in residual norm = 0.03839370510165859
 CostFunction::addIncrement: Analysis: 
 ----------------------------------------------------------------------------------------------------
 State print | number of fields = 28 | cube sphere face size: C420
-eastward_wind                                | Min:-2.7017492294311523e+01 Max:+5.5192769591250538e+01 RMS:+1.3316933439333850e+01
-northward_wind                               | Min:-4.4851364256940208e+01 Max:+4.0159271968280521e+01 RMS:+6.4888280115000994e+00
-air_temperature                              | Min:+1.9402629001407439e+02 Max:+3.1449734497070312e+02 RMS:+2.5825612606676503e+02
+eastward_wind                                | Min:-2.7017492294311523e+01 Max:+5.5350232350503440e+01 RMS:+1.3324101054747812e+01
+northward_wind                               | Min:-4.5260137852209439e+01 Max:+4.0313107373583833e+01 RMS:+6.4933813155777864e+00
+air_temperature                              | Min:+1.9402625682539374e+02 Max:+3.1449734497070312e+02 RMS:+2.5825977763169965e+02
 air_pressure_thickness                       | Min:+1.4039907836914062e+02 Max:+3.3267851562500000e+03 RMS:+1.7747128794076129e+03
-water_vapor_mixing_ratio_wrt_moist_air       | Min:+0.0000000000000000e+00 Max:+2.6407767042489927e-02 RMS:+5.5190758337462517e-03
+water_vapor_mixing_ratio_wrt_moist_air       | Min:+0.0000000000000000e+00 Max:+2.6391229895913141e-02 RMS:+5.5192094526611418e-03
 cloud_liquid_ice                             | Min:+0.0000000000000000e+00 Max:+3.5491219023242593e-04 RMS:+2.6466693180263384e-06
 cloud_liquid_water                           | Min:+0.0000000000000000e+00 Max:+1.4309773687273264e-03 RMS:+1.9256935244694528e-05
-ozone_mass_mixing_ratio                      | Min:+0.0000000000000000e+00 Max:+1.6040661648730747e-05 RMS:+4.4486297648910050e-06
-geopotential_height_times_gravity_at_surface | Min:+0.0000000000000000e+00 Max:+3.5301851562500000e+04 RMS:+7.8466628379223748e+03
+ozone_mass_mixing_ratio                      | Min:+0.0000000000000000e+00 Max:+1.6040661648730747e-05 RMS:+4.4486329555585363e-06
+geopotential_height_times_gravity_at_surface | Min:+0.0000000000000000e+00 Max:+3.5301851562500000e+04 RMS:+7.8466628379223739e+03
 f10m                                         | Min:+1.0004938840866089e+00 Max:+1.0948654413223267e+00 RMS:+1.0188698647586811e+00
 slmsk                                        | Min:+0.0000000000000000e+00 Max:+2.0000000000000000e+00 RMS:+7.8767192390790086e-01
 sheleg                                       | Min:+0.0000000000000000e+00 Max:+1.6966506958007812e+01 RMS:+2.0734254733790997e-01
-skin_temperature_at_surface                  | Min:+2.7119995117187500e+02 Max:+3.2296466064453125e+02 RMS:+2.9475363971841762e+02
+skin_temperature_at_surface                  | Min:+2.7119995117187500e+02 Max:+3.2296466064453125e+02 RMS:+2.9475363971841756e+02
 vtype                                        | Min:+0.0000000000000000e+00 Max:+2.0000000000000000e+01 RMS:+7.1648734770793263e+00
 stype                                        | Min:+0.0000000000000000e+00 Max:+1.6000000000000000e+01 RMS:+5.0688774416549585e+00
 vfrac                                        | Min:+0.0000000000000000e+00 Max:+9.9000000953674316e-01 RMS:+4.4064937959870992e-01
 soilt                                        | Min:+2.7023922729492188e+02 Max:+3.2296466064453125e+02 RMS:+2.9475315924680575e+02
 soilm                                        | Min:+1.4970073476433754e-02 Max:+1.0000000000000000e+00 RMS:+6.3592927195821791e-01
 eastward_wind_at_surface                     | Min:-1.2974018096923828e+01 Max:+1.2164360046386719e+01 RMS:+3.6171520010516645e+00
-northward_wind_at_surface                    | Min:-1.3966897010803223e+01 Max:+1.2346966743469238e+01 RMS:+3.7014659136589296e+00
-air_pressure_at_surface                      | Min:+6.6027478491835107e+04 Max:+1.0240633677673340e+05 RMS:+9.6259615036528034e+04
+northward_wind_at_surface                    | Min:-1.3966897010803223e+01 Max:+1.2346966743469238e+01 RMS:+3.7014659136589292e+00
+air_pressure_at_surface                      | Min:+6.6027443499503541e+04 Max:+1.0240633677673340e+05 RMS:+9.6259045050583285e+04
 rain_water                                   | Min:+0.0000000000000000e+00 Max:+1.7932932823896408e-03 RMS:+1.6047798774338740e-05
-snow_water                                   | Min:+0.0000000000000000e+00 Max:+5.0736027769744396e-03 RMS:+4.4287745731177579e-05
+snow_water                                   | Min:+0.0000000000000000e+00 Max:+5.0736027769744396e-03 RMS:+4.4287745731177572e-05
 graupel                                      | Min:+0.0000000000000000e+00 Max:+6.5326219191774726e-04 RMS:+3.0288534886145332e-06
 cloud_droplet_number_concentration           | Min:+0.0000000000000000e+00 Max:+1.5055759360000000e+09 RMS:+2.0745188331041779e+07
 cloud_ice_number_concentration               | Min:+0.0000000000000000e+00 Max:+5.0166070000000000e+06 RMS:+2.8482317076120682e+04
 rain_number_concentration                    | Min:+0.0000000000000000e+00 Max:+8.6749025000000000e+05 RMS:+2.1760084842806405e+03
-upward_air_velocity                          | Min:-9.9441605806350708e-01 Max:+2.9850695133209229e+00 RMS:+5.5847735613424862e-02
+upward_air_velocity                          | Min:-9.9441605806350708e-01 Max:+2.9850695133209229e+00 RMS:+5.5847735613424869e-02
 ----------------------------------------------------------------------------------------------------
-CostJo   : Nonlinear Jo(aircar_airTemperature_133) = 6841.786530258552, nobs = 26912, Jo/n = 0.2542280963978356, err = 0.9070335331040666
-CostJo   : Nonlinear Jo(aircar_specificHumidity_133) = 603.490984050765, nobs = 3846, Jo/n = 0.1569139324104953, err = 0.001846312138741215
-CostJo   : Nonlinear Jo(aircar_winds_233) = 14676.85832086471, nobs = 57216, Jo/n = 0.2565166792656724, err = 2.650318593315722
-CostFunction: Nonlinear J = 22122.13583517403
+CostJo   : Nonlinear Jo(aircar_airTemperature_133) = 6423.303636715884, nobs = 26912, Jo/n = 0.2386780483321895, err = 0.9070335331040666
+CostJo   : Nonlinear Jo(aircar_specificHumidity_133) = 566.3106398381906, nobs = 3846, Jo/n = 0.1472466562241785, err = 0.001846312116315513
+CostJo   : Nonlinear Jo(aircar_winds_233) = 13847.58089511543, nobs = 57216, Jo/n = 0.2420228763827501, err = 2.650318593315722
+CostFunction: Nonlinear J = 20837.1951716695
diff --git a/rrfs-test/testoutput/rrfs-fv3jedi-3denvar_refl.ref b/rrfs-test/testoutput/rrfs-fv3jedi-3denvar_refl.ref
index a6066242..2e985ef1 100644
--- a/rrfs-test/testoutput/rrfs-fv3jedi-3denvar_refl.ref
+++ b/rrfs-test/testoutput/rrfs-fv3jedi-3denvar_refl.ref
@@ -1,17 +1,17 @@
 CostJo   : Nonlinear Jo(refl10cm) = 1.5717569957151997e+05, nobs = 637916, Jo/n = 2.4638933585537903e-01, err = 5.3721387247444952e+00
 CostFunction: Nonlinear J = 1.5717569957151997e+05
-DRPCGMinimizer: reduction in residual norm = 3.9716065974210657e-03
+DRPCGMinimizer: reduction in residual norm = 8.3583912999070590e-03
 CostFunction::addIncrement: Analysis: 
 ----------------------------------------------------------------------------------------------------
 State print | number of fields = 29 | cube sphere face size: C420
-eastward_wind                                | Min:-2.9110587622043379e+01 Max:+5.2821489681222467e+01 RMS:+1.3296416832611769e+01
-northward_wind                               | Min:-3.9898376882288126e+01 Max:+3.8638981467820635e+01 RMS:+6.4777939430078781e+00
-air_temperature                              | Min:+1.9402678104644190e+02 Max:+3.1449734497070312e+02 RMS:+2.5824095019401915e+02
+eastward_wind                                | Min:-3.0110721738901901e+01 Max:+5.2821486243297642e+01 RMS:+1.3297393005879298e+01
+northward_wind                               | Min:-3.9898377751627422e+01 Max:+4.0478634657811220e+01 RMS:+6.4905194350867550e+00
+air_temperature                              | Min:+1.9402565485627721e+02 Max:+3.1449734497070312e+02 RMS:+2.5824199310659816e+02
 air_pressure_thickness                       | Min:+1.4039907836914062e+02 Max:+3.3267851562500000e+03 RMS:+1.7747128794076129e+03
-water_vapor_mixing_ratio_wrt_moist_air       | Min:+0.0000000000000000e+00 Max:+2.4484865780424268e-02 RMS:+5.5033830259319351e-03
-cloud_liquid_ice                             | Min:+0.0000000000000000e+00 Max:+3.5684457302802004e-04 RMS:+3.2766098674811528e-06
-cloud_liquid_water                           | Min:+0.0000000000000000e+00 Max:+1.5652595830563708e-03 RMS:+1.8242558879799437e-05
-ozone_mass_mixing_ratio                      | Min:+0.0000000000000000e+00 Max:+1.6040661648730747e-05 RMS:+4.4486256747499933e-06
+water_vapor_mixing_ratio_wrt_moist_air       | Min:+0.0000000000000000e+00 Max:+2.4484869411650918e-02 RMS:+5.5016424614381821e-03
+cloud_liquid_ice                             | Min:+0.0000000000000000e+00 Max:+3.5848739319369565e-04 RMS:+3.4618080238829739e-06
+cloud_liquid_water                           | Min:+0.0000000000000000e+00 Max:+1.5860744434366583e-03 RMS:+1.8833331180080719e-05
+ozone_mass_mixing_ratio                      | Min:+0.0000000000000000e+00 Max:+1.6040661648730747e-05 RMS:+4.4486244040139194e-06
 geopotential_height_times_gravity_at_surface | Min:+0.0000000000000000e+00 Max:+3.5301851562500000e+04 RMS:+7.8466628379223739e+03
 f10m                                         | Min:+1.0004938840866089e+00 Max:+1.0948654413223267e+00 RMS:+1.0188698647586811e+00
 slmsk                                        | Min:+0.0000000000000000e+00 Max:+2.0000000000000000e+00 RMS:+7.8767192390790086e-01
@@ -24,30 +24,30 @@ soilt                                        | Min:+2.7023922729492188e+02 Max:+
 soilm                                        | Min:+1.4970073476433754e-02 Max:+1.0000000000000000e+00 RMS:+6.3592927195821791e-01
 eastward_wind_at_surface                     | Min:-1.2974018096923828e+01 Max:+1.2164360046386719e+01 RMS:+3.6171520010516645e+00
 northward_wind_at_surface                    | Min:-1.3966897010803223e+01 Max:+1.2346966743469238e+01 RMS:+3.7014659136589292e+00
-air_pressure_at_surface                      | Min:+6.6027499740600586e+04 Max:+1.0240638052820925e+05 RMS:+9.6261324127937667e+04
-rain_water                                   | Min:+0.0000000000000000e+00 Max:+1.7955460166075763e-03 RMS:+1.5657599584847733e-05
-snow_water                                   | Min:+0.0000000000000000e+00 Max:+3.6321065836000424e-03 RMS:+4.5167899821397335e-05
-graupel                                      | Min:+0.0000000000000000e+00 Max:+6.3211027326170229e-04 RMS:+3.2846438800460970e-06
+air_pressure_at_surface                      | Min:+6.6027499740600586e+04 Max:+1.0240639467172125e+05 RMS:+9.6261344612570072e+04
+rain_water                                   | Min:+0.0000000000000000e+00 Max:+1.7957368611768783e-03 RMS:+1.5686028190594016e-05
+snow_water                                   | Min:+0.0000000000000000e+00 Max:+3.5621384519019606e-03 RMS:+4.5495375423069210e-05
+graupel                                      | Min:+0.0000000000000000e+00 Max:+6.3210890840427003e-04 RMS:+3.3139450842159348e-06
 cloud_droplet_number_concentration           | Min:+0.0000000000000000e+00 Max:+1.5055759360000000e+09 RMS:+2.0745188331041779e+07
 cloud_ice_number_concentration               | Min:+0.0000000000000000e+00 Max:+5.0166070000000000e+06 RMS:+2.8482317076120682e+04
 rain_number_concentration                    | Min:+0.0000000000000000e+00 Max:+8.6749025000000000e+05 RMS:+2.1760084842806405e+03
-upward_air_velocity                          | Min:-1.9158170026131696e+00 Max:+3.0514554006384120e+00 RMS:+5.8370851896598054e-02
-equivalent_reflectivity_factor               | Min:-3.3405663019368923e+01 Max:+6.5427631659966877e+01 RMS:+3.2426146569047556e+00
+upward_air_velocity                          | Min:-2.0627077270451721e+00 Max:+3.2060644388921848e+00 RMS:+5.9146220083561782e-02
+equivalent_reflectivity_factor               | Min:-3.9366788439257654e+01 Max:+7.2817734314154833e+01 RMS:+3.2652265829946936e+00
 ----------------------------------------------------------------------------------------------------
-CostJo   : Nonlinear Jo(refl10cm) = 43468.34948658482, nobs = 637916, Jo/n = 0.06814118079274516, err = 6.654007668620585
-CostFunction: Nonlinear J = 43468.34948658482
-DRPCGMinimizer: reduction in residual norm = 0.01633878088943338
+CostJo   : Nonlinear Jo(refl10cm) = 42144.71844889395, nobs = 637916, Jo/n = 0.06606625080558248, err = 6.654007668620585
+CostFunction: Nonlinear J = 42144.71844889395
+DRPCGMinimizer: reduction in residual norm = 0.03747693614707482
 CostFunction::addIncrement: Analysis: 
 ----------------------------------------------------------------------------------------------------
 State print | number of fields = 29 | cube sphere face size: C420
-eastward_wind                                | Min:-2.8211561608417494e+01 Max:+5.2821489436449653e+01 RMS:+1.3305047892120744e+01
-northward_wind                               | Min:-3.9898376541384323e+01 Max:+3.8606808497898051e+01 RMS:+6.4546357955858680e+00
-air_temperature                              | Min:+1.9402681606924833e+02 Max:+3.1449734497070312e+02 RMS:+2.5824087870881203e+02
+eastward_wind                                | Min:-2.9666513075706497e+01 Max:+5.2821485008487279e+01 RMS:+1.3306981041122064e+01
+northward_wind                               | Min:-3.9898377057910373e+01 Max:+3.8606959189756623e+01 RMS:+6.4643890217135942e+00
+air_temperature                              | Min:+1.9402567385971153e+02 Max:+3.1449734497070312e+02 RMS:+2.5824190252701425e+02
 air_pressure_thickness                       | Min:+1.4039907836914062e+02 Max:+3.3267851562500000e+03 RMS:+1.7747128794076129e+03
-water_vapor_mixing_ratio_wrt_moist_air       | Min:+0.0000000000000000e+00 Max:+2.4484865792909531e-02 RMS:+5.4884439277352922e-03
-cloud_liquid_ice                             | Min:+0.0000000000000000e+00 Max:+3.5538980246518703e-04 RMS:+2.6393564073903285e-06
-cloud_liquid_water                           | Min:+0.0000000000000000e+00 Max:+1.4715781642883181e-03 RMS:+1.7773528815269722e-05
-ozone_mass_mixing_ratio                      | Min:+4.6755048878328607e-09 Max:+1.6040661648730747e-05 RMS:+4.4486302871500302e-06
+water_vapor_mixing_ratio_wrt_moist_air       | Min:+0.0000000000000000e+00 Max:+2.4484868770584561e-02 RMS:+5.4849484105691871e-03
+cloud_liquid_ice                             | Min:+0.0000000000000000e+00 Max:+3.5653402236467921e-04 RMS:+2.7100072373723881e-06
+cloud_liquid_water                           | Min:+0.0000000000000000e+00 Max:+1.4772532923182109e-03 RMS:+1.8173094173490780e-05
+ozone_mass_mixing_ratio                      | Min:+0.0000000000000000e+00 Max:+1.6040661648730747e-05 RMS:+4.4486297551018097e-06
 geopotential_height_times_gravity_at_surface | Min:+0.0000000000000000e+00 Max:+3.5301851562500000e+04 RMS:+7.8466628379223739e+03
 f10m                                         | Min:+1.0004938840866089e+00 Max:+1.0948654413223267e+00 RMS:+1.0188698647586811e+00
 slmsk                                        | Min:+0.0000000000000000e+00 Max:+2.0000000000000000e+00 RMS:+7.8767192390790086e-01
@@ -60,15 +60,15 @@ soilt                                        | Min:+2.7023922729492188e+02 Max:+
 soilm                                        | Min:+1.4970073476433754e-02 Max:+1.0000000000000000e+00 RMS:+6.3592927195821791e-01
 eastward_wind_at_surface                     | Min:-1.2974018096923828e+01 Max:+1.2164360046386719e+01 RMS:+3.6171520010516645e+00
 northward_wind_at_surface                    | Min:-1.3966897010803223e+01 Max:+1.2346966743469238e+01 RMS:+3.7014659136589292e+00
-air_pressure_at_surface                      | Min:+6.6027499740600586e+04 Max:+1.0240638393522671e+05 RMS:+9.6261458572998337e+04
-rain_water                                   | Min:+0.0000000000000000e+00 Max:+1.7951889540823874e-03 RMS:+1.5454287468617475e-05
-snow_water                                   | Min:+0.0000000000000000e+00 Max:+3.5704335337893062e-03 RMS:+4.2056141065637780e-05
-graupel                                      | Min:+0.0000000000000000e+00 Max:+6.3210312860550999e-04 RMS:+3.0982976357908518e-06
+air_pressure_at_surface                      | Min:+6.6027499740600586e+04 Max:+1.0240640481561578e+05 RMS:+9.6261475975943540e+04
+rain_water                                   | Min:+0.0000000000000000e+00 Max:+1.7953894225111752e-03 RMS:+1.5480968659294205e-05
+snow_water                                   | Min:+0.0000000000000000e+00 Max:+3.4925435466011475e-03 RMS:+4.2210869334811254e-05
+graupel                                      | Min:+0.0000000000000000e+00 Max:+6.3210098577683020e-04 RMS:+3.1318943392646422e-06
 cloud_droplet_number_concentration           | Min:+0.0000000000000000e+00 Max:+1.5055759360000000e+09 RMS:+2.0745188331041779e+07
 cloud_ice_number_concentration               | Min:+0.0000000000000000e+00 Max:+5.0166070000000000e+06 RMS:+2.8482317076120682e+04
 rain_number_concentration                    | Min:+0.0000000000000000e+00 Max:+8.6749025000000000e+05 RMS:+2.1760084842806405e+03
-upward_air_velocity                          | Min:-2.0991565619989516e+00 Max:+2.1992036736105116e+00 RMS:+5.7146473602936988e-02
-equivalent_reflectivity_factor               | Min:-3.3477985224035983e+01 Max:+5.3437831664278846e+01 RMS:+3.0663976794785244e+00
+upward_air_velocity                          | Min:-2.2700529866486567e+00 Max:+2.1677347533149369e+00 RMS:+5.7786342350010247e-02
+equivalent_reflectivity_factor               | Min:-3.8621883551700520e+01 Max:+5.4432301931589620e+01 RMS:+3.0851583182437468e+00
 ----------------------------------------------------------------------------------------------------
-CostJo   : Nonlinear Jo(refl10cm) = 43213.5821258342, nobs = 637916, Jo/n = 0.06774180632847303, err = 6.654007668620585
-CostFunction: Nonlinear J = 43213.5821258342
+CostJo   : Nonlinear Jo(refl10cm) = 41703.04904461651, nobs = 637916, Jo/n = 0.06537388785453964, err = 6.654007668620585
+CostFunction: Nonlinear J = 41703.04904461651
diff --git a/rrfs-test/testoutput/rrfs-fv3jedi-hybrid3denvar_mgbf.ref b/rrfs-test/testoutput/rrfs-fv3jedi-hybrid3denvar_mgbf.ref
index e8b04b22..7a875698 100644
--- a/rrfs-test/testoutput/rrfs-fv3jedi-hybrid3denvar_mgbf.ref
+++ b/rrfs-test/testoutput/rrfs-fv3jedi-hybrid3denvar_mgbf.ref
@@ -1,78 +1,78 @@
-CostJo   : Nonlinear Jo(aircar_airTemperature_133) = 1.7109300271492390e+04, nobs = 26912, Jo/n = 6.3574986145557333e-01, err = 9.0703353310406665e-01
-CostJo   : Nonlinear Jo(aircar_specificHumidity_133) = 1.1576103821861009e+03, nobs = 3846, Jo/n = 3.0099073899794615e-01, err = 1.8463121387412148e-03
-CostJo   : Nonlinear Jo(aircar_winds_233) = 4.5918477878982012e+04, nobs = 57216, Jo/n = 8.0254610386923264e-01, err = 2.6503185933157223e+00
-CostFunction: Nonlinear J = 6.4185388532660501e+04
-DRPCGMinimizer: reduction in residual norm = 1.6837856213713477e-03
+CostJo   : Nonlinear Jo(aircar_airTemperature_133) = 1.7109300271492430e+04, nobs = 26912, Jo/n = 6.3574986145557477e-01, err = 9.0703353310406665e-01
+CostJo   : Nonlinear Jo(aircar_specificHumidity_133) = 1.1576104621804134e+03, nobs = 3846, Jo/n = 3.0099075979729939e-01, err = 1.8463121163155127e-03
+CostJo   : Nonlinear Jo(aircar_winds_233) = 4.5918477878981983e+04, nobs = 57216, Jo/n = 8.0254610386923209e-01, err = 2.6503185933157223e+00
+CostFunction: Nonlinear J = 6.4185388612654824e+04
+DRPCGMinimizer: reduction in residual norm = 4.6850339120460280e-03
 CostFunction::addIncrement: Analysis: 
 ----------------------------------------------------------------------------------------------------
 State print | number of fields = 28 | cube sphere face size: C420
-eastward_wind                                | Min:-2.7017045661071005e+01 Max:+5.5105967205010757e+01 RMS:+1.3314610267656393e+01
-northward_wind                               | Min:-4.4643714058538905e+01 Max:+4.0166708230535839e+01 RMS:+6.4900066398955172e+00
-air_temperature                              | Min:+1.9402580582064840e+02 Max:+3.1450707237356619e+02 RMS:+2.5827039054674003e+02
+eastward_wind                                | Min:-2.7017136041335583e+01 Max:+5.5299450686122043e+01 RMS:+1.3321103966802429e+01
+northward_wind                               | Min:-4.5032314237163526e+01 Max:+4.0352326558727469e+01 RMS:+6.4943883497861030e+00
+air_temperature                              | Min:+1.9402598718530470e+02 Max:+3.1450646745948995e+02 RMS:+2.5827085930243652e+02
 air_pressure_thickness                       | Min:+1.4039907836914062e+02 Max:+3.3267851562500000e+03 RMS:+1.7747128794076129e+03
-water_vapor_mixing_ratio_wrt_moist_air       | Min:+0.0000000000000000e+00 Max:+2.6245641977034544e-02 RMS:+5.5381882733766055e-03
+water_vapor_mixing_ratio_wrt_moist_air       | Min:+0.0000000000000000e+00 Max:+2.6296984278660257e-02 RMS:+5.5361656233455479e-03
 cloud_liquid_ice                             | Min:+0.0000000000000000e+00 Max:+3.5491219023242593e-04 RMS:+2.6466693180263384e-06
 cloud_liquid_water                           | Min:+0.0000000000000000e+00 Max:+1.4309773687273264e-03 RMS:+1.9256935244694528e-05
-ozone_mass_mixing_ratio                      | Min:+4.6068082117371821e-09 Max:+1.6040661648730747e-05 RMS:+4.4486330477695347e-06
-geopotential_height_times_gravity_at_surface | Min:+0.0000000000000000e+00 Max:+3.5301851562500000e+04 RMS:+7.8466628379223748e+03
+ozone_mass_mixing_ratio                      | Min:+0.0000000000000000e+00 Max:+1.6040661648730747e-05 RMS:+4.4486356052801785e-06
+geopotential_height_times_gravity_at_surface | Min:+0.0000000000000000e+00 Max:+3.5301851562500000e+04 RMS:+7.8466628379223739e+03
 f10m                                         | Min:+1.0004938840866089e+00 Max:+1.0948654413223267e+00 RMS:+1.0188698647586811e+00
 slmsk                                        | Min:+0.0000000000000000e+00 Max:+2.0000000000000000e+00 RMS:+7.8767192390790086e-01
 sheleg                                       | Min:+0.0000000000000000e+00 Max:+1.6966506958007812e+01 RMS:+2.0734254733790997e-01
-skin_temperature_at_surface                  | Min:+2.7119995117187500e+02 Max:+3.2296466064453125e+02 RMS:+2.9475363971841762e+02
+skin_temperature_at_surface                  | Min:+2.7119995117187500e+02 Max:+3.2296466064453125e+02 RMS:+2.9475363971841756e+02
 vtype                                        | Min:+0.0000000000000000e+00 Max:+2.0000000000000000e+01 RMS:+7.1648734770793263e+00
 stype                                        | Min:+0.0000000000000000e+00 Max:+1.6000000000000000e+01 RMS:+5.0688774416549585e+00
 vfrac                                        | Min:+0.0000000000000000e+00 Max:+9.9000000953674316e-01 RMS:+4.4064937959870992e-01
 soilt                                        | Min:+2.7023922729492188e+02 Max:+3.2296466064453125e+02 RMS:+2.9475315924680575e+02
 soilm                                        | Min:+1.4970073476433754e-02 Max:+1.0000000000000000e+00 RMS:+6.3592927195821791e-01
 eastward_wind_at_surface                     | Min:-1.2974018096923828e+01 Max:+1.2164360046386719e+01 RMS:+3.6171520010516645e+00
-northward_wind_at_surface                    | Min:-1.3966897010803223e+01 Max:+1.2346966743469238e+01 RMS:+3.7014659136589296e+00
-air_pressure_at_surface                      | Min:+6.6027214438117444e+04 Max:+1.0240587746409010e+05 RMS:+9.6259332407522073e+04
+northward_wind_at_surface                    | Min:-1.3966897010803223e+01 Max:+1.2346966743469238e+01 RMS:+3.7014659136589292e+00
+air_pressure_at_surface                      | Min:+6.6027583828955045e+04 Max:+1.0240597202048650e+05 RMS:+9.6258887638143235e+04
 rain_water                                   | Min:+0.0000000000000000e+00 Max:+1.7932932823896408e-03 RMS:+1.6047798774338740e-05
-snow_water                                   | Min:+0.0000000000000000e+00 Max:+5.0736027769744396e-03 RMS:+4.4287745731177579e-05
+snow_water                                   | Min:+0.0000000000000000e+00 Max:+5.0736027769744396e-03 RMS:+4.4287745731177572e-05
 graupel                                      | Min:+0.0000000000000000e+00 Max:+6.5326219191774726e-04 RMS:+3.0288534886145332e-06
 cloud_droplet_number_concentration           | Min:+0.0000000000000000e+00 Max:+1.5055759360000000e+09 RMS:+2.0745188331041779e+07
 cloud_ice_number_concentration               | Min:+0.0000000000000000e+00 Max:+5.0166070000000000e+06 RMS:+2.8482317076120682e+04
 rain_number_concentration                    | Min:+0.0000000000000000e+00 Max:+8.6749025000000000e+05 RMS:+2.1760084842806405e+03
-upward_air_velocity                          | Min:-9.9441605806350708e-01 Max:+2.9850695133209229e+00 RMS:+5.5847735613424862e-02
+upward_air_velocity                          | Min:-9.9441605806350708e-01 Max:+2.9850695133209229e+00 RMS:+5.5847735613424869e-02
 ----------------------------------------------------------------------------------------------------
-CostJo   : Nonlinear Jo(aircar_airTemperature_133) = 6831.828266061766, nobs = 26912, Jo/n = 0.2538580657722119, err = 0.9070335331040666
-CostJo   : Nonlinear Jo(aircar_specificHumidity_133) = 599.2219730320264, nobs = 3846, Jo/n = 0.1558039451461327, err = 0.001846312138741215
-CostJo   : Nonlinear Jo(aircar_winds_233) = 14869.13550140764, nobs = 57216, Jo/n = 0.2598772284222533, err = 2.650318593315722
-CostFunction: Nonlinear J = 22300.18574050144
-DRPCGMinimizer: reduction in residual norm = 0.007677503124591466
+CostJo   : Nonlinear Jo(aircar_airTemperature_133) = 6475.267034008466, nobs = 26912, Jo/n = 0.2406089117868782, err = 0.9070335331040666
+CostJo   : Nonlinear Jo(aircar_specificHumidity_133) = 566.2680265640296, nobs = 3846, Jo/n = 0.1472355763297009, err = 0.001846312116315513
+CostJo   : Nonlinear Jo(aircar_winds_233) = 14086.50747987402, nobs = 57216, Jo/n = 0.2461987465022725, err = 2.650318593315722
+CostFunction: Nonlinear J = 21128.04254044652
+DRPCGMinimizer: reduction in residual norm = 0.02800126726449022
 CostFunction::addIncrement: Analysis: 
 ----------------------------------------------------------------------------------------------------
 State print | number of fields = 28 | cube sphere face size: C420
-eastward_wind                                | Min:-2.7017046634125421e+01 Max:+5.5119998576646260e+01 RMS:+1.3314698248881541e+01
-northward_wind                               | Min:-4.4655591364428354e+01 Max:+4.0158226600830915e+01 RMS:+6.4899935608787329e+00
-air_temperature                              | Min:+1.9402578308421673e+02 Max:+3.1450706319965394e+02 RMS:+2.5827040422300939e+02
+eastward_wind                                | Min:-2.7017131974368301e+01 Max:+5.5304161185576994e+01 RMS:+1.3321536348474725e+01
+northward_wind                               | Min:-4.5052702575638214e+01 Max:+4.0328530023251943e+01 RMS:+6.4941565373671404e+00
+air_temperature                              | Min:+1.9402596286154395e+02 Max:+3.1450650795316704e+02 RMS:+2.5827089759990685e+02
 air_pressure_thickness                       | Min:+1.4039907836914062e+02 Max:+3.3267851562500000e+03 RMS:+1.7747128794076129e+03
-water_vapor_mixing_ratio_wrt_moist_air       | Min:+0.0000000000000000e+00 Max:+2.6226228814221750e-02 RMS:+5.5382834834578473e-03
+water_vapor_mixing_ratio_wrt_moist_air       | Min:+0.0000000000000000e+00 Max:+2.6244455066467862e-02 RMS:+5.5365376046912678e-03
 cloud_liquid_ice                             | Min:+0.0000000000000000e+00 Max:+3.5491219023242593e-04 RMS:+2.6466693180263384e-06
 cloud_liquid_water                           | Min:+0.0000000000000000e+00 Max:+1.4309773687273264e-03 RMS:+1.9256935244694528e-05
-ozone_mass_mixing_ratio                      | Min:+4.6068225000807849e-09 Max:+1.6040661648730747e-05 RMS:+4.4486330265251437e-06
-geopotential_height_times_gravity_at_surface | Min:+0.0000000000000000e+00 Max:+3.5301851562500000e+04 RMS:+7.8466628379223748e+03
+ozone_mass_mixing_ratio                      | Min:+0.0000000000000000e+00 Max:+1.6040661648730747e-05 RMS:+4.4486354236382913e-06
+geopotential_height_times_gravity_at_surface | Min:+0.0000000000000000e+00 Max:+3.5301851562500000e+04 RMS:+7.8466628379223739e+03
 f10m                                         | Min:+1.0004938840866089e+00 Max:+1.0948654413223267e+00 RMS:+1.0188698647586811e+00
 slmsk                                        | Min:+0.0000000000000000e+00 Max:+2.0000000000000000e+00 RMS:+7.8767192390790086e-01
 sheleg                                       | Min:+0.0000000000000000e+00 Max:+1.6966506958007812e+01 RMS:+2.0734254733790997e-01
-skin_temperature_at_surface                  | Min:+2.7119995117187500e+02 Max:+3.2296466064453125e+02 RMS:+2.9475363971841762e+02
+skin_temperature_at_surface                  | Min:+2.7119995117187500e+02 Max:+3.2296466064453125e+02 RMS:+2.9475363971841756e+02
 vtype                                        | Min:+0.0000000000000000e+00 Max:+2.0000000000000000e+01 RMS:+7.1648734770793263e+00
 stype                                        | Min:+0.0000000000000000e+00 Max:+1.6000000000000000e+01 RMS:+5.0688774416549585e+00
 vfrac                                        | Min:+0.0000000000000000e+00 Max:+9.9000000953674316e-01 RMS:+4.4064937959870992e-01
 soilt                                        | Min:+2.7023922729492188e+02 Max:+3.2296466064453125e+02 RMS:+2.9475315924680575e+02
 soilm                                        | Min:+1.4970073476433754e-02 Max:+1.0000000000000000e+00 RMS:+6.3592927195821791e-01
 eastward_wind_at_surface                     | Min:-1.2974018096923828e+01 Max:+1.2164360046386719e+01 RMS:+3.6171520010516645e+00
-northward_wind_at_surface                    | Min:-1.3966897010803223e+01 Max:+1.2346966743469238e+01 RMS:+3.7014659136589296e+00
-air_pressure_at_surface                      | Min:+6.6027218285026349e+04 Max:+1.0240587689277393e+05 RMS:+9.6259323829386994e+04
+northward_wind_at_surface                    | Min:-1.3966897010803223e+01 Max:+1.2346966743469238e+01 RMS:+3.7014659136589292e+00
+air_pressure_at_surface                      | Min:+6.6027571869363834e+04 Max:+1.0240597027419700e+05 RMS:+9.6258864870186386e+04
 rain_water                                   | Min:+0.0000000000000000e+00 Max:+1.7932932823896408e-03 RMS:+1.6047798774338740e-05
-snow_water                                   | Min:+0.0000000000000000e+00 Max:+5.0736027769744396e-03 RMS:+4.4287745731177579e-05
+snow_water                                   | Min:+0.0000000000000000e+00 Max:+5.0736027769744396e-03 RMS:+4.4287745731177572e-05
 graupel                                      | Min:+0.0000000000000000e+00 Max:+6.5326219191774726e-04 RMS:+3.0288534886145332e-06
 cloud_droplet_number_concentration           | Min:+0.0000000000000000e+00 Max:+1.5055759360000000e+09 RMS:+2.0745188331041779e+07
 cloud_ice_number_concentration               | Min:+0.0000000000000000e+00 Max:+5.0166070000000000e+06 RMS:+2.8482317076120682e+04
 rain_number_concentration                    | Min:+0.0000000000000000e+00 Max:+8.6749025000000000e+05 RMS:+2.1760084842806405e+03
-upward_air_velocity                          | Min:-9.9441605806350708e-01 Max:+2.9850695133209229e+00 RMS:+5.5847735613424862e-02
+upward_air_velocity                          | Min:-9.9441605806350708e-01 Max:+2.9850695133209229e+00 RMS:+5.5847735613424869e-02
 ----------------------------------------------------------------------------------------------------
-CostJo   : Nonlinear Jo(aircar_airTemperature_133) = 6830.421892660762, nobs = 26912, Jo/n = 0.2538058075453613, err = 0.9070335331040666
-CostJo   : Nonlinear Jo(aircar_specificHumidity_133) = 599.0791305179994, nobs = 3846, Jo/n = 0.1557668046068641, err = 0.001846312138741215
-CostJo   : Nonlinear Jo(aircar_winds_233) = 14867.89663293553, nobs = 57216, Jo/n = 0.2598555759391696, err = 2.650318593315722
-CostFunction: Nonlinear J = 22297.39765611429
+CostJo   : Nonlinear Jo(aircar_airTemperature_133) = 6466.349792707064, nobs = 26912, Jo/n = 0.2402775636410175, err = 0.9070335331040666
+CostJo   : Nonlinear Jo(aircar_specificHumidity_133) = 565.6970169527655, nobs = 3846, Jo/n = 0.1470871078920347, err = 0.001846312116315513
+CostJo   : Nonlinear Jo(aircar_winds_233) = 14072.20882755643, nobs = 57216, Jo/n = 0.2459488399670798, err = 2.650318593315722
+CostFunction: Nonlinear J = 21104.25563721627
diff --git a/sorc/_workaround_/saber/mgbf/mgbf_src/covariance/MGBF_Covariance.interface.F90 b/sorc/_workaround_/saber/mgbf/mgbf_src/covariance/MGBF_Covariance.interface.F90
index 7c9ba5fb..7f928893 100755
--- a/sorc/_workaround_/saber/mgbf/mgbf_src/covariance/MGBF_Covariance.interface.F90
+++ b/sorc/_workaround_/saber/mgbf/mgbf_src/covariance/MGBF_Covariance.interface.F90
@@ -181,6 +181,7 @@ subroutine mgbf_covariance_multiply_cpp(c_self, c_afieldset,c_index_member_in) &
 !call flush(6)
 call f_self%multiply(f_fieldset,index_member_in)
 call etim(mg_interface_multiply_time)
+call f_fieldset%final()
 
 end subroutine mgbf_covariance_multiply_cpp