diff --git a/CODEOWNERS b/CODEOWNERS
index 61ee44df8..30e2f3aea 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -30,7 +30,7 @@ physics/GWD/drag_suite.*                                                     @md
 physics/GWD/gwdc.*                                                           @Songyou184                               @grantfirl @rhaesung @Qingfu-Liu @dustinswales
 physics/GWD/gwdps.*                                                          @Songyou184                               @grantfirl @rhaesung @Qingfu-Liu @dustinswales
 physics/GWD/rayleigh_damp.*                                                  @yangfanglin                              @grantfirl @rhaesung @Qingfu-Liu @dustinswales
-physics/GWD/ugwp_driver_v0.F90                                               @mdtoyNOAA                                @grantfirl @rhaesung @Qingfu-Liu @dustinswales
+physics/GWD/ugwp_driver_v0.F90                                               @mdtoyNOAA @matusmartini @areinecke       @grantfirl @rhaesung @Qingfu-Liu @dustinswales
 physics/GWD/ugwpv1_gsldrag.*                                                 @mdtoyNOAA @BoYang-NOAA                   @grantfirl @rhaesung @Qingfu-Liu @dustinswales
 physics/GWD/ugwpv1_gsldrag_post.*                                            @mdtoyNOAA @BoYang-NOAA                   @grantfirl @rhaesung @Qingfu-Liu @dustinswales
 physics/GWD/unified_ugwp*                                                    @mdtoyNOAA                                @grantfirl @rhaesung @Qingfu-Liu @dustinswales
diff --git a/physics/GWD/ugwp_driver_v0.F90 b/physics/GWD/ugwp_driver_v0.F90
index 77800faf2..e6e824e79 100644
--- a/physics/GWD/ugwp_driver_v0.F90
+++ b/physics/GWD/ugwp_driver_v0.F90
@@ -481,8 +481,9 @@ SUBROUTINE GWDPS_V0(IM,  km,    imx, do_tofd, &
             R    = sqrt(rnom/rdem)
             ZR   =  MAX( 2. - R, 0. )
             sigres = max(sigmin, sigma(J))
-            if (hprime(J)/sigres > dxres) sigres = hprime(J)/dxres
             mtbridge = ZR * sigres*ZLEN / hprime(J)
+            ! Scale the blocking coefficient by the inverse square root of dxres
+            cdmb4 = cdmbgwd(1) * 100.0 / sqrt(sqrt(sparea(j)))
 !           dbtmp = cdmb4*mtbridge*max(cos(ang(i,k)), gamma(j)*sin(ang(i,k)))   ! (4.15)-ifs 	
             dbtmp = cdmb4*mtbridge*(bgam * cosang2 + cgam * sinang2)            ! (4.16)-ifs
             DB(I,K)= DBTMP * UDS(I,K)
@@ -621,7 +622,9 @@ SUBROUTINE GWDPS_V0(IM,  km,    imx, do_tofd, &
         EFACT    = MIN( MAX(EFACT,EFMIN), EFMAX )
 !
         COEFM    = (1. + CLX(I)) ** (OA(I)+1.)
-!
+
+        ! Scale the cleff coefficient by the inverse square root of dxres
+        cleff = cdmbgwd(2) * 0.001 / sqrt(sqrt(sparea(j)))
         XLINV(I) = COEFM * CLEFF           ! effective kxw for Lin-wave
         XLINGFS  = COEFM * CLEFF 
 !