diff --git a/parm/config/gfs/config.ufs b/parm/config/gfs/config.ufs
index 15b5046d6c..3e1fa382d7 100644
--- a/parm/config/gfs/config.ufs
+++ b/parm/config/gfs/config.ufs
@@ -171,7 +171,7 @@ case "${fv3_res}" in
         export WRITE_GROUP=2
         export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE=10
         export WRITE_GROUP_GFS=4
-        export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GFS=10
+        export WRTTASK_PER_GROUP_PER_THREAD_PER_TILE_GFS=20
         ;;
     "C1152")
         export DELTIM=120
diff --git a/parm/config/gfs/config.wave b/parm/config/gfs/config.wave
index a0c0156166..c9b73937ee 100644
--- a/parm/config/gfs/config.wave
+++ b/parm/config/gfs/config.wave
@@ -135,7 +135,9 @@ if [[ "${CDUMP}" != gfs ]]; then    # Setting is valid for GDAS and GEFS
 else                              # This is a GFS run
   rst_dt_gfs=$(( restart_interval_gfs * 3600 ))  # TODO: This calculation needs to move to parsing_namelists_WW3.sh
   if [[ ${rst_dt_gfs} -gt 0 ]]; then
-    export DT_1_RST_WAV=${rst_dt_gfs:-0}   # time between restart files, set to DTRST=1 for a single restart file
+    export DT_1_RST_WAV=0 #${rst_dt_gfs:-0}   # time between restart files, set to DTRST=1 for a single restart file
+                                          #temporarily set to zero to avoid a clash in requested restart times 
+                                          #which makes the wave model crash a fix for the model issue will be coming
     export DT_2_RST_WAV=${rst_dt_gfs:-0}   # restart stride for checkpointing restart
   else
     rst_dt_fhmax=$(( FHMAX_WAV * 3600 ))
diff --git a/parm/ufs/nems.configure.cpld.IN b/parm/ufs/nems.configure.cpld.IN
index abc9091c4e..0f6e68cc4e 100644
--- a/parm/ufs/nems.configure.cpld.IN
+++ b/parm/ufs/nems.configure.cpld.IN
@@ -94,6 +94,7 @@ MED_attributes::
       history_ymd = -999
       coupling_mode = @[CPLMODE]
       history_tile_atm = @[ATMTILESIZE]
+      pio_rearranger = box
 ::
 ALLCOMP_attributes::
       ScalarFieldCount = 2
diff --git a/parm/ufs/nems.configure.cpld_aero.IN b/parm/ufs/nems.configure.cpld_aero.IN
index f8d71a2398..9d4afff121 100644
--- a/parm/ufs/nems.configure.cpld_aero.IN
+++ b/parm/ufs/nems.configure.cpld_aero.IN
@@ -106,6 +106,7 @@ MED_attributes::
       history_ymd = -999
       coupling_mode = @[CPLMODE]
       history_tile_atm = @[ATMTILESIZE]
+      pio_rearranger = box
 ::
 ALLCOMP_attributes::
       ScalarFieldCount = 2
diff --git a/parm/ufs/nems.configure.cpld_aero_outerwave.IN b/parm/ufs/nems.configure.cpld_aero_outerwave.IN
index 3b25faa268..78a009b879 100644
--- a/parm/ufs/nems.configure.cpld_aero_outerwave.IN
+++ b/parm/ufs/nems.configure.cpld_aero_outerwave.IN
@@ -126,6 +126,7 @@ MED_attributes::
       history_ymd = -999
       coupling_mode = @[CPLMODE]
       history_tile_atm = @[ATMTILESIZE]
+      pio_rearranger = box
 ::
 ALLCOMP_attributes::
       ScalarFieldCount = 2
diff --git a/parm/ufs/nems.configure.cpld_outerwave.IN b/parm/ufs/nems.configure.cpld_outerwave.IN
index ec30d132a7..736e0cf3fd 100644
--- a/parm/ufs/nems.configure.cpld_outerwave.IN
+++ b/parm/ufs/nems.configure.cpld_outerwave.IN
@@ -114,6 +114,7 @@ MED_attributes::
       history_ymd = -999
       coupling_mode = @[CPLMODE]
       history_tile_atm = @[ATMTILESIZE]
+      pio_rearranger = box
 ::
 ALLCOMP_attributes::
       ScalarFieldCount = 2
diff --git a/parm/ufs/nems.configure.cpld_wave.IN b/parm/ufs/nems.configure.cpld_wave.IN
index f2843a5b2c..3a1c918900 100644
--- a/parm/ufs/nems.configure.cpld_wave.IN
+++ b/parm/ufs/nems.configure.cpld_wave.IN
@@ -114,6 +114,7 @@ MED_attributes::
       history_ymd = -999
       coupling_mode = @[CPLMODE]
       history_tile_atm = @[ATMTILESIZE]
+      pio_rearranger = box
 ::
 ALLCOMP_attributes::
       ScalarFieldCount = 2