diff --git a/dev/scripts/exnwps_ofs_prep.sh b/dev/scripts/exnwps_ofs_prep.sh
index c7de72f7..e47d71b5 100755
--- a/dev/scripts/exnwps_ofs_prep.sh
+++ b/dev/scripts/exnwps_ofs_prep.sh
@@ -65,7 +65,6 @@ case ${OFSTYPE} in
         export CYCLE="00"
         ${USHnwps}/make_psurge.sh
         export err=$?; err_chk
-        rm -rf ${COMOUT}/${OFSTYPE}/{*hourly,*hourly.spool}
     ;;
     *)
         echo "\$OFS type not found"
@@ -73,21 +72,28 @@ case ${OFSTYPE} in
     ;;
 esac
 
-if [ $SENDDBN = YES ]; then
+if [ ${SENDDBN} = YES ] && [ "${OFSTYPE}" != "stofs_cur" ]; then
     rm -rf ${DATA}/tars
     mkdir ${DATA}/tars
     for i in ${COMOUT}/${OFSTYPE}/*_output; do
         if [ "${OFSTYPE}" == "psurge" ]; then
+            epoc_waterlevel_start_time=`cat ${COMOUT}/psurge/${i##*/}/psurge_waterlevel_start_time.txt`
+            wldateinname_t=$(date -d @${epoc_waterlevel_start_time} +"%Y%m%d%T" )
+            TARCYCLE=${wldateinname_t:8:2}
             find ${i}/ -name *txt -exec basename '{}' ';' >> ${DATA}/tars/${i##*/}.list
-            find ${i}/ -name *gz -exec basename '{}' ';' >> ${DATA}/tars/${i##*/}.list
+            find ${i}/ -name wave_psurge_waterlevel_*_${TARCYCLE}_*_e*.dat.tar.gz -exec basename '{}' ';' >> ${DATA}/tars/${i##*/}.list
         else
             find ${i}/ -name wave_${OFSTYPE}*_${CYCLE}_*dat -exec basename '{}' ';' > ${DATA}/tars/${i##*/}.list
             find ${i}/ -name *txt -exec basename '{}' ';' >> ${DATA}/tars/${i##*/}.list
+            TARCYCLE=${CYCLE}
         fi
 
-        echo "tar cvf ${DATA}/tars/${i##*/}.tar -C ${i} -T ${DATA}/tars/${i##*/}.list; if [ "$?" = "0" ]; then mv ${DATA}/tars/${i##*/}.tar ${COMOUT}/${OFSTYPE}/; $DBNROOT/bin/dbn_alert MODEL NWPS_ASCII_TAR $job ${COMOUT}/${OFSTYPE}/${i##*/}.tar; fi" >> ${DATA}/tars/tar_cmdfile
+        tarfilename=nwps.t${TARCYCLE}z.${i##*/}.tar
+        echo "tar cvf ${DATA}/tars/${tarfilename} -C ${i} -T ${DATA}/tars/${i##*/}.list; if [ "$?" = "0" ]; then mv ${DATA}/tars/${tarfilename} ${COMOUT}/${OFSTYPE}/; $DBNROOT/bin/dbn_alert MODEL NWPS_ASCII_TAR $job ${COMOUT}/${OFSTYPE}/${tarfilename}; fi" >> ${DATA}/tars/tar_cmdfile
     done
-    aprun -n24 -N24 -j1 -d1 cfp ${DATA}/tars/tar_cmdfile
+    #aprun -n24 -N24 -j1 -d1 cfp ${DATA}/tars/tar_cmdfile
+    mpiexec -np 24 --cpu-bind verbose,core cfp ${DATA}/tars/tar_cmdfile
+
 fi
 
 #####################################################################
diff --git a/dev/util/crons/nwps_webgraph_ar_dev.sh b/dev/util/crons/nwps_webgraph_ar_dev.sh
index 958318c3..64ac97bb 100755
--- a/dev/util/crons/nwps_webgraph_ar_dev.sh
+++ b/dev/util/crons/nwps_webgraph_ar_dev.sh
@@ -34,16 +34,16 @@ do
          for cgnum in $cgnums
          do
             echo 'Searching' ${wfo} ${cgnum}
-            if [ -f ${workdir}/${cgnum}/plots*.tar.gz ]
+            if [ -f ${workdir}/${cgnum}/nwps.t${cycle}z.plots*.tar.gz ]
             then
                echo 'Copying from' ${workdir}
                cd ${workdir}/${cgnum}/
 
-               scp ${workdir}/${cgnum}/plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
-               scp ${workdir}/${cgnum}/shiproute_plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
+               scp ${workdir}/${cgnum}/nwps.t${cycle}z.plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
+               scp ${workdir}/${cgnum}/nwps.t${cycle}z.shiproute_plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
                # Clean out old figures first
                #ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm *.png'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf --overwrite plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf --overwrite nwps.t${cycle}z.plots*.tar.gz'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy028.png Hansonplot_46028.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy219.png Hansonplot_46219.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy069.png Hansonplot_46069.png'
@@ -51,18 +51,18 @@ do
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy222.png Hansonplot_46222.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy253.png Hansonplot_46253.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy256.png Hansonplot_46256.png'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm plots*.tar.gz'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf shiproute_plots*.tar.gz'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm shiproute_plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm nwps.t${cycle}z.plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf nwps.t${cycle}z.shiproute_plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm nwps.t${cycle}z.shiproute_plots*.tar.gz'
                #rm ${workdir}/${cgnum}/*.png
 
                # Copy new clustering-based wave tracking results
                #if [ ${cgnum} == 'CG0' ]
                #then
                   echo 'Copying cluster data...'
-                  scp ${workdir}/${cgnum}/mapplots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/CG1/
-                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; tar -xf mapplots*.tar.gz'
-                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; rm mapplots*.tar.gz'
+                  scp ${workdir}/${cgnum}/nwps.t${cycle}z.mapplots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/CG1/
+                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; tar -xf nwps.t${cycle}z.mapplots*.tar.gz'
+                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; rm nwps.t${cycle}z.mapplots*.tar.gz'
                #fi
 
                #datafound='true'
@@ -89,16 +89,16 @@ do
          for cgnum in $cgnums
          do
             echo 'Searching' ${wfo} ${cgnum}
-            if [ -f ${workdir}/${cgnum}/plots*.tar.gz ]
+            if [ -f ${workdir}/${cgnum}/nwps.t${cycle}z.plots*.tar.gz ]
             then
                echo 'Copying from' ${workdir}
                cd ${workdir}/${cgnum}/
 
-               scp ${workdir}/${cgnum}/plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
-               scp ${workdir}/${cgnum}/shiproute_plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
+               scp ${workdir}/${cgnum}/nwps.t${cycle}z.plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
+               scp ${workdir}/${cgnum}/nwps.t${cycle}z.shiproute_plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
                # Clean out old figures first
                #ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm *.png'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf nwps.t${cycle}z.plots*.tar.gz'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy028.png Hansonplot_46028.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy219.png Hansonplot_46219.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy069.png Hansonplot_46069.png'
@@ -106,18 +106,18 @@ do
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy222.png Hansonplot_46222.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy253.png Hansonplot_46253.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy256.png Hansonplot_46256.png'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm plots*.tar.gz'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf shiproute_plots*.tar.gz'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm shiproute_plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm nwps.t${cycle}z.plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf nwps.t${cycle}z.shiproute_plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm nwps.t${cycle}z.shiproute_plots*.tar.gz'
                #rm ${workdir}/${cgnum}/*.png
 
                # Copy new clustering-based wave tracking results
                #if [ ${cgnum} == 'CG0' ]
                #then
                   echo 'Copying cluster data...'
-                  scp ${workdir}/${cgnum}/mapplots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/CG1/
-                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; tar -xf mapplots*.tar.gz'
-                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; rm mapplots*.tar.gz'
+                  scp ${workdir}/${cgnum}/nwps.t${cycle}z.mapplots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/CG1/
+                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; tar -xf nwps.t${cycle}z.mapplots*.tar.gz'
+                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; rm nwps.t${cycle}z.mapplots*.tar.gz'
                #fi
 
                #datafound='true'
diff --git a/dev/util/crons/nwps_webgraph_er_dev.sh b/dev/util/crons/nwps_webgraph_er_dev.sh
index 3565860a..d8e4a86e 100755
--- a/dev/util/crons/nwps_webgraph_er_dev.sh
+++ b/dev/util/crons/nwps_webgraph_er_dev.sh
@@ -30,7 +30,7 @@ do
          for cgnum in $cgnums
          do
             echo 'Searching' ${wfo} ${cgnum}
-            if [ -f ${workdir}/${cgnum}/plots*.tar.gz ]
+            if [ -f ${workdir}/${cgnum}/nwps.t${cycle}z.plots*.tar.gz ]
             then
                echo 'Copying from' ${workdir}
                cd ${workdir}/${cgnum}/
@@ -65,23 +65,23 @@ do
                #   #rm ${workdir}/${cgnum}/*.png
                #fi
 
-               scp ${workdir}/${cgnum}/plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
-               scp ${workdir}/${cgnum}/shiproute_plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
+               scp ${workdir}/${cgnum}/nwps.t${cycle}z.plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
+               scp ${workdir}/${cgnum}/nwps.t${cycle}z.shiproute_plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
                # Clean out old figures first
                #ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm *.png'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf plots*.tar.gz'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm plots*.tar.gz'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf shiproute_plots*.tar.gz'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm shiproute_plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf nwps.t${cycle}z.plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm nwps.t${cycle}z.plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf nwps.t${cycle}z.shiproute_plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm nwps.t${cycle}z.shiproute_plots*.tar.gz'
                #rm ${workdir}/${cgnum}/*.png
 
                # Copy new clustering-based wave tracking results
                #if [ ${cgnum} == 'CG0' ]
                #then
                   echo 'Copying cluster data...'
-                  scp ${workdir}/${cgnum}/mapplots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/CG1/
-                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; tar -xf mapplots*.tar.gz'
-                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; rm mapplots*.tar.gz'
+                  scp ${workdir}/${cgnum}/nwps.t${cycle}z.mapplots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/CG1/
+                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; tar -xf nwps.t${cycle}z.mapplots*.tar.gz'
+                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; rm nwps.t${cycle}z.mapplots*.tar.gz'
                #fi
 
                datafound='true'
diff --git a/dev/util/crons/nwps_webgraph_pr_dev.sh b/dev/util/crons/nwps_webgraph_pr_dev.sh
index 460d7bf5..f512516a 100755
--- a/dev/util/crons/nwps_webgraph_pr_dev.sh
+++ b/dev/util/crons/nwps_webgraph_pr_dev.sh
@@ -35,15 +35,15 @@ do
          for cgnum in $cgnums
          do
             echo 'Searching' ${wfo} ${cgnum}
-            if [ -f ${workdir}/${cgnum}/plots*.tar.gz ]
+            if [ -f ${workdir}/${cgnum}/nwps.t${cycle}z.plots*.tar.gz ]
             then
                echo 'Copying from' ${workdir}
                cd ${workdir}/${cgnum}/
 
-               scp ${workdir}/${cgnum}/plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
+               scp ${workdir}/${cgnum}/nwps.t${cycle}z.plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
                # Clean out old figures first
                #ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm *.png'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf nwps.t${cycle}z.plots*.tar.gz'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy028.png Hansonplot_46028.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy219.png Hansonplot_46219.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy069.png Hansonplot_46069.png'
@@ -51,7 +51,7 @@ do
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy222.png Hansonplot_46222.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy253.png Hansonplot_46253.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy256.png Hansonplot_46256.png'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm nwps.t${cycle}z.plots*.tar.gz'
                #rm ${workdir}/${cgnum}/*.png
 
                # Copy new clustering-based wave tracking results
@@ -59,8 +59,8 @@ do
                #then
                   echo 'Copying cluster data...'
                   scp ${workdir}/${cgnum}/mapplots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/CG1/
-                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; tar -xf mapplots*.tar.gz'
-                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; rm mapplots*.tar.gz'
+                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; tar -xf nwps.t${cycle}z.mapplots*.tar.gz'
+                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; rm nwps.t${cycle}z.mapplots*.tar.gz'
                #fi
 
                #datafound='true'
@@ -87,15 +87,15 @@ do
          for cgnum in $cgnums
          do
             echo 'Searching' ${wfo} ${cgnum}
-            if [ -f ${workdir}/${cgnum}/plots*.tar.gz ]
+            if [ -f ${workdir}/${cgnum}/nwps.t${cycle}z.plots*.tar.gz ]
             then
                echo 'Copying from' ${workdir}
                cd ${workdir}/${cgnum}/
 
-               scp ${workdir}/${cgnum}/plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
+               scp ${workdir}/${cgnum}/nwps.t${cycle}z.plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
                # Clean out old figures first
                #ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm *.png'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf nwps.t${cycle}z.plots*.tar.gz'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy028.png Hansonplot_46028.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy219.png Hansonplot_46219.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy069.png Hansonplot_46069.png'
@@ -103,16 +103,16 @@ do
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy222.png Hansonplot_46222.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy253.png Hansonplot_46253.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy256.png Hansonplot_46256.png'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm nwps.t${cycle}z.plots*.tar.gz'
                #rm ${workdir}/${cgnum}/*.png
 
                # Copy new clustering-based wave tracking results
                #if [ ${cgnum} == 'CG0' ]
                #then
                   echo 'Copying cluster data...'
-                  scp ${workdir}/${cgnum}/mapplots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/CG1/
-                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; tar -xf mapplots*.tar.gz'
-                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; rm mapplots*.tar.gz'
+                  scp ${workdir}/${cgnum}/nwps.t${cycle}z.mapplots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/CG1/
+                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; tar -xf nwps.t${cycle}z.mapplots*.tar.gz'
+                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; rm nwps.t${cycle}z.mapplots*.tar.gz'
                #fi
 
                #datafound='true'
diff --git a/dev/util/crons/nwps_webgraph_sr_dev.sh b/dev/util/crons/nwps_webgraph_sr_dev.sh
index a3db8f66..6bbc7a0e 100755
--- a/dev/util/crons/nwps_webgraph_sr_dev.sh
+++ b/dev/util/crons/nwps_webgraph_sr_dev.sh
@@ -32,32 +32,32 @@ do
          for cgnum in $cgnums
          do
             echo 'Searching' ${wfo} ${cgnum}
-            if [ -f ${workdir}/${cycle}/${cgnum}/plots*.tar.gz ]
+            if [ -f ${workdir}/${cycle}/${cgnum}/nwps.t${cycle}z.plots*.tar.gz ]
             then
                echo 'Copying from' ${workdir}/${cycle}
                cd ${workdir}/${cycle}/${cgnum}/
 
-               scp ${workdir}/${cycle}/${cgnum}/plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
-               scp ${workdir}/${cycle}/${cgnum}/shiproute_plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf plots*.tar.gz'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm plots*.tar.gz'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf shiproute_plots*.tar.gz'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm shiproute_plots*.tar.gz'
+               scp ${workdir}/${cycle}/${cgnum}/nwps.t${cycle}z.plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
+               scp ${workdir}/${cycle}/${cgnum}/nwps.t${cycle}z.shiproute_plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf nwps.t${cycle}z.plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm nwps.t${cycle}z.plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf nwps.t${cycle}z.shiproute_plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm nwps.t${cycle}z.shiproute_plots*.tar.gz'
                # In case of MFL copy also shiproute plots to prod
                if [ ${wfo} == 'mfl' ]
                then
-                  scp ${workdir}/${cycle}/${cgnum}/shiproute_plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/images/rtimages/${wfo}/nwps/${cgnum}/ 
-                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf shiproute_plots*.tar.gz'
-                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm shiproute_plots*.tar.gz'
+                  scp ${workdir}/${cycle}/${cgnum}/nwps.t${cycle}z.shiproute_plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/images/rtimages/${wfo}/nwps/${cgnum}/ 
+                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf nwps.t${cycle}z.shiproute_plots*.tar.gz'
+                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm nwps.t${cycle}z.shiproute_plots*.tar.gz'
                fi
 
                # Copy new clustering-based wave tracking results
                #if [ ${cgnum} == 'CG0' ]
                #then
                   echo 'Copying cluster data...'
-                  scp ${workdir}/${cycle}/${cgnum}/mapplots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/CG1/
-                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; tar -xf mapplots*.tar.gz'
-                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; rm mapplots*.tar.gz'
+                  scp ${workdir}/${cycle}/${cgnum}/nwps.t${cycle}z.mapplots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/CG1/
+                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; tar -xf nwps.t${cycle}z.mapplots*.tar.gz'
+                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; rm nwps.t${cycle}z.mapplots*.tar.gz'
                #fi
 
                #datafound='true'
diff --git a/dev/util/crons/nwps_webgraph_wr_dev.sh b/dev/util/crons/nwps_webgraph_wr_dev.sh
index 1cffcf66..a8d84bc5 100755
--- a/dev/util/crons/nwps_webgraph_wr_dev.sh
+++ b/dev/util/crons/nwps_webgraph_wr_dev.sh
@@ -34,16 +34,16 @@ do
          for cgnum in $cgnums
          do
             echo 'Searching' ${wfo} ${cgnum}
-            if [ -f ${workdir}/${cgnum}/plots*.tar.gz ]
+            if [ -f ${workdir}/${cgnum}/nwps.t${cycle}z.plots*.tar.gz ]
             then
                echo 'Copying from' ${workdir}
                cd ${workdir}/${cgnum}/
 
-               scp ${workdir}/${cgnum}/plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
-               scp ${workdir}/${cgnum}/shiproute_plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
+               scp ${workdir}/${cgnum}/nwps.t${cycle}z.plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
+               scp ${workdir}/${cgnum}/nwps.t${cycle}z.shiproute_plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
                # Clean out old figures first
                #ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm *.png'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf nwps.t${cycle}z.plots*.tar.gz'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy028.png Hansonplot_46028.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy219.png Hansonplot_46219.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy069.png Hansonplot_46069.png'
@@ -51,18 +51,18 @@ do
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy222.png Hansonplot_46222.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy253.png Hansonplot_46253.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy256.png Hansonplot_46256.png'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm plots*.tar.gz'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf shiproute_plots*.tar.gz'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm shiproute_plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm nwps.t${cycle}z.plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf nwps.t${cycle}z.shiproute_plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm nwps.t${cycle}z.shiproute_plots*.tar.gz'
                #rm ${workdir}/${cgnum}/*.png
 
                # Copy new clustering-based wave tracking results
                #if [ ${cgnum} == 'CG0' ]
                #then
                   echo 'Copying cluster data...'
-                  scp ${workdir}/${cgnum}/mapplots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/CG1/
-                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; tar -xf mapplots*.tar.gz'
-                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; rm mapplots*.tar.gz'
+                  scp ${workdir}/${cgnum}/nwps.t${cycle}z.mapplots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/CG1/
+                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; tar -xf nwps.t${cycle}z.mapplots*.tar.gz'
+                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; rm nwps.t${cycle}z.mapplots*.tar.gz'
                #fi
 
                #datafound='true'
@@ -89,7 +89,7 @@ do
          for cgnum in $cgnums
          do
             echo 'Searching' ${wfo} ${cgnum}
-            if [ -f ${workdir}/${cgnum}/plots*.tar.gz ]
+            if [ -f ${workdir}/${cgnum}/nwps.t${cycle}z.plots*.tar.gz ]
             then
                echo 'Copying from' ${workdir}
                cd ${workdir}/${cgnum}/
@@ -124,11 +124,11 @@ do
                #   #rm ${workdir}/${cgnum}/*.png
                #fi
 
-               scp ${workdir}/${cgnum}/plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
-               scp ${workdir}/${cgnum}/shiproute_plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
+               scp ${workdir}/${cgnum}/nwps.t${cycle}z.plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
+               scp ${workdir}/${cgnum}/nwps.t${cycle}z.shiproute_plots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/${cgnum}/
                # Clean out old figures first
                #ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm *.png'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf nwps.t${cycle}z.plots*.tar.gz'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy028.png Hansonplot_46028.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy219.png Hansonplot_46219.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy069.png Hansonplot_46069.png'
@@ -136,9 +136,9 @@ do
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy222.png Hansonplot_46222.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy253.png Hansonplot_46253.png'
                ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; cp  Hansonplot_buoy256.png Hansonplot_46256.png'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm plots*.tar.gz'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf shiproute_plots*.tar.gz'
-               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm shiproute_plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm nwps.t${cycle}z.plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; tar -xf nwps.t${cycle}z.shiproute_plots*.tar.gz'
+               ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/'${cgnum}'/; rm nwps.t${cycle}z.shiproute_plots*.tar.gz'
                #rm ${workdir}/${cgnum}/*.png
 
                # Copy new clustering-based wave tracking results
@@ -146,8 +146,8 @@ do
                #then
                   echo 'Copying cluster data...'
                   scp ${workdir}/${cgnum}/mapplots*.tar.gz waves@emcrzdm:/home/www/polar/nwps/para/images/rtimages/${wfo}/nwps/CG1/
-                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; tar -xf mapplots*.tar.gz'
-                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; rm mapplots*.tar.gz'
+                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; tar -xf nwps.t${cycle}z.mapplots*.tar.gz'
+                  ssh waves@emcrzdm 'cd /home/www/polar/nwps/para/images/rtimages/'${wfo}'/nwps/CG1/; rm nwps.t${cycle}z.mapplots*.tar.gz'
                #fi
 
                #datafound='true'