diff --git a/dev/driver/run_JWAFS_GRIB2_0P25_BLENDING b/dev/driver/run_JWAFS_GRIB2_0P25_BLENDING
index 39d4ed9..fde138a 100755
--- a/dev/driver/run_JWAFS_GRIB2_0P25_BLENDING
+++ b/dev/driver/run_JWAFS_GRIB2_0P25_BLENDING
@@ -83,16 +83,24 @@ export KEEPDATA=YES
 ############################################
 # Define DATA PCOM, COMOUT and COMIN
 ############################################
-
+# For COMOUT
 export COMROOT=/lfs/h2/emc/ptmp/$USER/wafs_dwn/$envir/com
 
-export COMPATH=$COMROOT/wafs
+# For COMIN
+# export COMPATH=$COMROOT/wafs
+export COMPATH=/lfs/h2/emc/ptmp/yali.mao/wafsxPDY/com/wafs
 
 export DATA=/lfs/h2/emc/ptmp/$USER/working_wafs/blending.$jobid
 
 ############################################
 # run the job
 #############################################
+# Set up mailing list
+if [[ "${envir}" != "prod" ]]; then
+    MAILTO="yali.mao@noaa.gov"
+fi
+export MAILTO=${MAILTO:-"nco.spa@noaa.gov,ncep.sos@noaa.gov,nco.sos@noaa.gov,nco.hpc.dataflow@noaa.gov"}
+
 sh $HOMEwafs/jobs/JWAFS_GRIB2_0P25_BLENDING
 
 exit
diff --git a/ecf/scripts/grib2/0p25/blending/jwafs_grib2_0p25_blending_master.ecf b/ecf/scripts/grib2/0p25/blending/jwafs_grib2_0p25_blending_master.ecf
index 37a19a5..4088e27 100755
--- a/ecf/scripts/grib2/0p25/blending/jwafs_grib2_0p25_blending_master.ecf
+++ b/ecf/scripts/grib2/0p25/blending/jwafs_grib2_0p25_blending_master.ecf
@@ -40,6 +40,12 @@ set -x
 ############################################################
 # CALL executable job script here
 ############################################################
+# Set up mailing list
+if [[ "${envir}" != "prod" ]]; then
+    MAILTO="nco.spa@noaa.gov"
+fi
+export MAILTO=${MAILTO:-"nco.spa@noaa.gov,ncep.sos@noaa.gov,nco.sos@noaa.gov,nco.hpc.dataflow@noaa.gov"}
+
 ${HOMEwafs}/jobs/JWAFS_GRIB2_0P25_BLENDING
 if [ $? -ne 0 ]; then
    ecflow_client --msg="***JOB ${ECF_NAME} ERROR RUNNING J-SCRIPT ***"
diff --git a/scripts/exwafs_grib2_0p25_blending.sh b/scripts/exwafs_grib2_0p25_blending.sh
index 4df8173..6651285 100755
--- a/scripts/exwafs_grib2_0p25_blending.sh
+++ b/scripts/exwafs_grib2_0p25_blending.sh
@@ -98,13 +98,6 @@ fi
 ##########################
 # Data dissemination
 ##########################
-
-# Set up mailing list
-if [[ "${envir}" != "prod" ]]; then
-    maillist="nco.spa@noaa.gov"
-fi
-maillist=${maillist:-"nco.spa@noaa.gov,ncep.sos@noaa.gov,nco.hpc.dataflow@noaa.gov"}
-
 if [[ "${SEND_UNBLENDED_US_WAFS}" == "YES" ]]; then
 
     #  checking any US WAFS product was sent due to No UK WAFS GRIB2 file or WAFS blending program
@@ -131,7 +124,7 @@ if [[ "${SEND_UNBLENDED_US_WAFS}" == "YES" ]]; then
     cat missing_uk_files >>mailmsg
     echo "Skipping t${cyc}z f${fhr}..." >>mailmsg    
     cat mailmsg >"${COMOUT}/${RUN}.t${cyc}z.f${fhr}.wafs_blend_0p25_usonly.emailbody"
-    cat "${COMOUT}/${RUN}.t${cyc}z.f${fhr}.wafs_blend_0p25_usonly.emailbody" | mail.py -s "${subject}" "${maillist}" -v
+    cat "${COMOUT}/${RUN}.t${cyc}z.f${fhr}.wafs_blend_0p25_usonly.emailbody" | mail.py -s "${subject}" "${MAILTO}" -v
 
     # Distribute US WAFS unblend Data to NCEP FTP Server (WOC) and TOC
     echo "altering the unblended US WAFS products:"