diff --git a/parm/Mon_config b/parm/Mon_config
index 3bac0607..78c10777 100644
--- a/parm/Mon_config
+++ b/parm/Mon_config
@@ -30,11 +30,15 @@ case $MY_MACHINE in
       module load wgrib2/2.0.8
       module load grads/2.2.1
       module load prod_util/1.2.2
+      module load netcdf/4.7.4
 
       export SUB=/usr/bin/sbatch
       export SERVICE_PARTITION="serial"
-      ;;
 
+      #rstprod data is not allowed on S4
+      CHGRP_CMD=echo
+      ;;
+           
    jet)
       module use /lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack
       module load hpc/1.1.0 hpc-intel/18.0.5.274 hpc-impi/2018.4.274
diff --git a/src/Ozone_Monitor/data_xtrct/ush/OznMon_DE.sh b/src/Ozone_Monitor/data_xtrct/ush/OznMon_DE.sh
index abe0d368..144ced7f 100755
--- a/src/Ozone_Monitor/data_xtrct/ush/OznMon_DE.sh
+++ b/src/Ozone_Monitor/data_xtrct/ush/OznMon_DE.sh
@@ -28,6 +28,7 @@ fi
 #-----------------------------------------------
 #  Process command line arguments
 #
+RUN=gdas
 while [[ $# -ge 1 ]]
 do
    key="$1"
diff --git a/src/Ozone_Monitor/image_gen/ush/OznMon_Plt.sh b/src/Ozone_Monitor/image_gen/ush/OznMon_Plt.sh
index b1683abf..9877cc7e 100755
--- a/src/Ozone_Monitor/image_gen/ush/OznMon_Plt.sh
+++ b/src/Ozone_Monitor/image_gen/ush/OznMon_Plt.sh
@@ -133,17 +133,6 @@ else
 fi
 
 
-#--------------------------------------------------------------------
-#  Check for my monitoring use.  Abort if running on prod machine.
-#--------------------------------------------------------------------
-if [[ RUN_ONLY_ON_DEV =  1 ]]; then
-   is_prod=`${OZN_IG_SCRIPTS}/onprod.sh`
-   if [[ $is_prod = 1 ]]; then
-      exit 10
-   fi
-fi
-
-
 #--------------------------------------------------------------------
 #  Specify TANKDIR for this suffix
 #--------------------------------------------------------------------
@@ -237,7 +226,6 @@ if [[ ${pdate} -le ${latest_data} ]]; then
       export SATYPE=${SATYPE:-`cat ${HOMEgdas_ozn}/fix/${RUN}_oznmon_satype.txt`}
    fi
 
-
    ${OZN_IG_SCRIPTS}/mk_horiz.sh
    ${OZN_IG_SCRIPTS}/mk_time.sh
    ${OZN_IG_SCRIPTS}/mk_summary.sh
diff --git a/src/Ozone_Monitor/image_gen/ush/mk_summary.sh b/src/Ozone_Monitor/image_gen/ush/mk_summary.sh
index 80560d65..965845a8 100755
--- a/src/Ozone_Monitor/image_gen/ush/mk_summary.sh
+++ b/src/Ozone_Monitor/image_gen/ush/mk_summary.sh
@@ -104,17 +104,8 @@ for ptype in ${process_type}; do
       $SUB --account ${ACCOUNT} -n $ctr -p ${PARTITION_OZNMON} -o ${logf} -D . -J ${job} --time=10 \
            --wrap "srun -l --multi-prog ${cmdfile}"
 
-   elif [[ ${MY_MACHINE} = "wcoss_c" ]]; then
-
-      $SUB -q ${JOB_QUEUE} -P ${PROJECT} -o ${logf} -e ${errf} \
-           -R "select[mem>100] rusage[mem=100]" \
-           -M 100 -W 0:05 -J ${job} -cwd ${WORKDIR} ${WORKDIR}/${cmdfile}
-
-   elif [[ ${MY_MACHINE} = "wcoss_d" ]]; then
-
-      $SUB -q ${JOB_QUEUE} -P ${PROJECT} -M 50 -R affinity[core] \
-           -o ${logf} -e ${errf} -W 0:05 -J ${job} \
-	   -cwd ${WORKDIR} ${WORKDIR}/${cmdfile}
+   elif [[ $MY_MACHINE = "wcoss2" ]]; then
+      echo "add job submission here"
 
    fi
 
diff --git a/src/Ozone_Monitor/image_gen/ush/mk_time.sh b/src/Ozone_Monitor/image_gen/ush/mk_time.sh
index cb200a17..f36a406b 100755
--- a/src/Ozone_Monitor/image_gen/ush/mk_time.sh
+++ b/src/Ozone_Monitor/image_gen/ush/mk_time.sh
@@ -82,16 +82,11 @@ for dsrc in ${data_source}; do
       $SUB --account ${ACCOUNT} -n $ctr  -o ${logf} -D . -J ${job} --time=10 \
            -p ${PARTITION_OZNMON} --wrap "srun -l --multi-prog ${cmdfile}"
 
-   elif [[ ${MY_MACHINE} = "wcoss_c" ]]; then
+   elif [[ ${MY_MACHINE} = "wcoss2" ]]; then
 
-      $SUB -q ${JOB_QUEUE} -P ${PROJECT} -o ${logf} -e ${errf} \
-           -R "select[mem>100] rusage[mem=100]" \
-           -M 100 -W 0:05 -J ${job} -cwd ${WORKDIR} ${WORKDIR}/${cmdfile}
-
-   elif [[ ${MY_MACHINE} = "wcoss_d" ]]; then
-
-      $SUB -q ${JOB_QUEUE} -P ${PROJECT} -M 50 -R affinity[core] \
-           -o ${logf} -e ${errf} -W 0:05 -J ${job} -cwd ${WORKDIR} ${WORKDIR}/${cmdfile}
+      echo "placeholder for wcoss2 submission"
+#      $SUB -q ${JOB_QUEUE} -P ${PROJECT} -M 50 -R affinity[core] \
+#           -o ${logf} -e ${errf} -W 0:05 -J ${job} -cwd ${WORKDIR} ${WORKDIR}/${cmdfile}
 
    fi
 
diff --git a/src/Ozone_Monitor/image_gen/ush/plot_summary.sh b/src/Ozone_Monitor/image_gen/ush/plot_summary.sh
index 2ad2e6a3..e3daed05 100755
--- a/src/Ozone_Monitor/image_gen/ush/plot_summary.sh
+++ b/src/Ozone_Monitor/image_gen/ush/plot_summary.sh
@@ -63,37 +63,43 @@ while [[ $ctr -le 120 ]]; do
    ctr=`expr $ctr + 1`
 done
 
+ndataf=`ls -1 *.ieee_d | wc -l`
+if [[ $ndataf -le 0 ]]; then
+   echo "Unable to locate data files for $SATYPE"
+
+else
+
+   #----------------------------------------------------------------
+   #  Modify tdef line in .ctl file to start at bdate.  tdef line 
+   #  should be 1 more than the total number of cycles so the last
+   #  cycle will be the cycle specified by $PDATE.
+   #
+   if [[ -e ${SATYPE}.${ptype}.ctl ]]; then
+      bdate=`$NDATE -720 $PDATE`
+      ${OZN_IG_SCRIPTS}/update_ctl_tdef.sh ${SATYPE}.${ptype}.ctl ${bdate} 121 
+   fi
 
-#----------------------------------------------------------------
-#  Modify tdef line in .ctl file to start at bdate.  tdef line 
-#  should be 1 more than the total number of cycles so the last
-#  cycle will be the cycle specified by $PDATE.
-#
-if [[ -e ${SATYPE}.${ptype}.ctl ]]; then
-   bdate=`$NDATE -720 $PDATE`
-   ${OZN_IG_SCRIPTS}/update_ctl_tdef.sh ${SATYPE}.${ptype}.ctl ${bdate} 121 
-fi
-
-cat << EOF > ${SATYPE}.gs
+   cat << EOF > ${SATYPE}.gs
 'open ${SATYPE}.${ptype}.ctl'
 'run ${OZN_IG_GSCRPTS}/plot_summary.gs ${OZNMON_SUFFIX} ${RUN} ${SATYPE} ${ptype} x750 y700'
 'quit'
 EOF
 
-$GRADS -bpc "run ${tmpdir}/${SATYPE}.gs"
+   $GRADS -bpc "run ${tmpdir}/${SATYPE}.gs"
 
 
-#--------------------------------------------------------------------
-#  copy image files to TANKDIR
-#
-${NCP} *.png ${OZN_IMGN_TANKDIR}/.
+   #--------------------------------------------------------------------
+   #  copy image files to TANKDIR
+   #
+   ${NCP} *.png ${OZN_IMGN_TANKDIR}/.
 
+fi
 
 #--------------------------------------------------------------------
 # Clean $tmpdir. 
-#cd $tmpdir
-#cd ../
-#rm -rf $tmpdir
+cd $tmpdir
+cd ../
+rm -rf $tmpdir
 
 exit
 
diff --git a/src/Ozone_Monitor/image_gen/ush/plot_time.sh b/src/Ozone_Monitor/image_gen/ush/plot_time.sh
index 518837f2..3e8b0581 100755
--- a/src/Ozone_Monitor/image_gen/ush/plot_time.sh
+++ b/src/Ozone_Monitor/image_gen/ush/plot_time.sh
@@ -105,6 +105,9 @@ if [[ -e ${SATYPE}.${dsrc}.ctl ]]; then
    if [[ $ADD_COMP -eq 1 ]]; then
       ${OZN_IG_SCRIPTS}/update_ctl_tdef.sh ${COMP2}.${dsrc}.ctl ${edate} 121
    fi
+else
+   echo "unable to locate ${SATYPE}.${dsrc}.ctl, exiting"
+   exit
 fi
 
 
diff --git a/src/Ozone_Monitor/nwprod/gdas_oznmon/driver/test_jgdas_verfozn_hera.sh b/src/Ozone_Monitor/nwprod/gdas_oznmon/driver/test_jgdas_verfozn_hera.sh
index 705d270a..0e346c79 100755
--- a/src/Ozone_Monitor/nwprod/gdas_oznmon/driver/test_jgdas_verfozn_hera.sh
+++ b/src/Ozone_Monitor/nwprod/gdas_oznmon/driver/test_jgdas_verfozn_hera.sh
@@ -7,11 +7,11 @@
 #SBATCH --account=fv3-cpu
 #SBATCH -D .
 
-set -x
+set -ax
 
 export OZNMON_NEW_HDR=${OZN_NEW_HDR:-0}
 
-export PDATE=${PDATE:-2020032106}	# netcdf
+export PDATE=${PDATE:-2022071900}	# netcdf
 #export PDATE=${PDATE:-2020013000}	# bin
 export NET=${NET:-gfs}
 export RUN=${RUN:-gdas}
@@ -31,10 +31,11 @@ export OZN_WORK_DIR=${OZN_WORK_DIR:-/scratch2/NCEPDEV/stmp3/${LOGNAME}/oznmon.${
 # Set package definitions. 
 #
 export OZNMON_SUFFIX=${OZNMON_SUFFIX:-testozn}
-export NWTEST=${NWTEST:-/scratch1/NCEPDEV/da/Edward.Safford/noscrub/update/util/Ozone_Monitor/nwprod}
+export NWTEST=${NWTEST:-/scratch1/NCEPDEV/da/Edward.Safford/noscrub/GSI-monitor/src/Ozone_Monitor/nwprod}
 export HOMEgdas_ozn=${HOMEgdas_ozn:-${NWTEST}/gdas_oznmon}
 export PARMgdas_ozn=${PARMgdas_ozn:-${HOMEgdas_ozn}/parm}
 export FIXgdas_ozn=${FIXgdas_ozn:-${HOMEgdas_ozn}/fix}
+export EXECoznmon=${EXECoznmon:-/scratch1/NCEPDEV/da/${LOGNAME}/noscrub/GSI-monitor/install/bin}
 
 export HOMEgfs=${HOMEgfs:-${HOMEgdas_ozn}}
 export HOMEgfs_ozn=${HOMEgfs_ozn:-${HOMEgfs}}
diff --git a/src/Ozone_Monitor/nwprod/gdas_oznmon/driver/test_jgdas_verfozn_wcoss_c.sh b/src/Ozone_Monitor/nwprod/gdas_oznmon/driver/test_jgdas_verfozn_wcoss_c.sh
deleted file mode 100755
index 806d0a74..00000000
--- a/src/Ozone_Monitor/nwprod/gdas_oznmon/driver/test_jgdas_verfozn_wcoss_c.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/ksh
-
-#BSUB -o gdas_verfozn.o%J
-#BSUB -e gdas_verfozn.o%J
-#BSUB -J gdas_verfozn
-#BSUB -q dev
-#BSUB -M 100
-#BSUB -W 00:05
-#BSUB -P GFS-DEV
-#BSUB -R "select[mem>100] rusage[mem=100]"
-
-##BSUB -cwd /gpfs/hps/ptmp/Edward.Safford
-##BSUB -cwd ${PWD}
-
-##------------------------------------------------------------
-##  This is the test driver script for the wcoss/cray systems
-##  to run the JGDAS_VERFOZN job.
-##------------------------------------------------------------
-
-set -x
-export OZNMON_NEW_HDR=${OZN_NEW_HDR:-0}
-export PDATE=${PDATE:-2021031100}
-export NET=${NET:-gfs}
-export RUN=${RUN:-gdas}
-
-export PDY=`echo $PDATE | cut -c1-8`
-export cyc=`echo $PDATE | cut -c9-10`
-export job=gdas_verfozn.${cyc}
-export pid=${pid:-$$}
-export jobid=${job}.${pid}
-export envir=${envir:-test}
-
-export DATAROOT=${DATAROOT:-/gpfs/hps3/emc/da/noscrub/${LOGNAME}/test_data}
-export COMROOT=/gpfs/hps2/ptmp/${LOGNAME}/com
-export OZN_WORK_DIR=${OZN_WORK_DIR:-/gpfs/hps2/stmp/${LOGNAME}/oznmon.${pid}}
-
-
-#############################################################
-# Load modules
-#############################################################
-. $MODULESHOME/init/ksh
-
-module load prod_util
-module load util_shared
-
-module list
-
-
-#------------------------------------------------------------
-# Set user specific variables
-#
-
-export OZNMON_SUFFIX=${OZNMON_SUFFIX:-testozn}
-export NWTEST=${NWTEST:-/gpfs/hps3/emc/da/noscrub/Edward.Safford/update/util/Ozone_Monitor/nwprod}
-export HOMEgdas_ozn=${NWTEST}/gdas_oznmon
-export PARMgdas_ozn=${HOMEgdas_ozn}/parm
-export FIXgdas_ozn=${HOMEgdas_ozn}/fix
-
-export HOMEgfs=${HOMEgfs:-${HOMEgdas_ozn}}
-export HOMEgfs_ozn=${HOMEgfs_ozn:-${HOMEgfs}}
-export PARMgfs_ozn=${PARMgfs_ozn:-${PARMgdas_ozn}}
-export FIXgfs_ozn=${FIXgfs_ozn:-${FIXgdas_ozn}}
-
-export HOMEoznmon=${NWTEST}/oznmon_shared
-export COM_IN=${COM_IN:-$DATAROOT}
-export OZN_TANKDIR=${OZN_TANKDIR:-${COMROOT}/${OZNMON_SUFFIX}}
-export OZN_TANKDIR=${OZN_TANKDIR:-${COMROOT}/${OZNMON_SUFFIX}}
-
-#------------------------------------------------------------
-# Execute job
-#
-${HOMEgdas_ozn}/jobs/JGDAS_ATMOS_VERFOZN
-
-exit
-
diff --git a/src/Ozone_Monitor/nwprod/gdas_oznmon/driver/test_jgdas_verfozn_wcoss_d.sh b/src/Ozone_Monitor/nwprod/gdas_oznmon/driver/test_jgdas_verfozn_wcoss_d.sh
deleted file mode 100755
index 2517bb49..00000000
--- a/src/Ozone_Monitor/nwprod/gdas_oznmon/driver/test_jgdas_verfozn_wcoss_d.sh
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/ksh
-
-#BSUB -o gdas_verfozn.o%J
-#BSUB -e gdas_verfozn.o%J
-#BSUB -J gdas_verfozn
-#BSUB -q dev_shared
-#BSUB -n 1
-#BSUB -R affinity[core]
-#BSUB -M 100
-#BSUB -W 00:05
-#BSUB -P GFS-DEV
-
-##------------------------------------------------------------
-##  This is the test driver script for the wcoss/ibm systems
-##  to run the JGDAS_VERFOZN job.
-##------------------------------------------------------------
-
-set -x
-
-export OZNMON_NEW_HDR=${OZN_NEW_HDR:-0}
-
-#-------------------------------------------------------------
-# PDATE settings for this test driver script correspond to 
-# available data in the $DATAROOT space (defined below).  
-# References to netcdf and binary indicate available files in 
-# the test_data space.
-#
-export PDATE=${PDATE:-2021031106}		# netcdf
-#export PDATE=${PDATE:-2018091706}      	# binary
-export NET=${NET:-gfs}
-export RUN=${RUN:-gdas}
-
-
-export PDY=`echo $PDATE | cut -c1-8`
-export cyc=`echo $PDATE | cut -c9-10`
-export job=gdas_verfozn.${cyc}
-export pid=${pid:-$$}
-export jobid=${job}.${pid}
-export envir=${envir:-test}
-export DATAROOT=${DATAROOT:-/gpfs/dell2/emc/modeling/noscrub/${LOGNAME}/test_data}
-export COMROOT=/gpfs/dell2/ptmp/${LOGNAME}/com
-export OZN_WORK_DIR=${OZN_WORK_DIR:-/gpfs/dell2/stmp/${LOGNAME}/oznmon.${pid}}
-
-
-#------------------------------------------------------------
-# Load modules
-#
-#. /usrx/local/Modules/3.2.9/init/ksh
-#module use /nwprod2/modulefiles
-
-shell=ksh
-source /usrx/local/prod/lmod/lmod/init/${shell}
-
-MODULEPATH=/usrx/local/prod/lmod/lmod/modulefiles/Core
-MODULEPATH=${MODULEPATH}:/usrx/local/prod/modulefiles/core_third
-MODULEPATH=${MODULEPATH}:/usrx/local/prod/modulefiles/defs
-MODULEPATH=${MODULEPATH}:/gpfs/dell1/nco/ops/nwprod/modulefiles/core_prod
-export MODULEPATH=${MODULEPATH}:/usrx/local/dev/modulefiles
-
-module purge
-
-module load lsf/10.1
-module load ips/18.0.1.163
-module load impi/18.0.1
-module load prod_util/1.1.0
-module load grib_util/1.1.0
-module load util_shared/1.1.0
-
-
-module list
-
-
-#------------------------------------------------------------
-# WCOSS environment settings
-#
-export POE=YES
-
-
-#------------------------------------------------------------
-# Set user specific variables
-#
-export OZNMON_SUFFIX=${OZNMON_SUFFIX:-testozn}
-export NWTEST=${NWTEST:-/gpfs/dell2/emc/modeling/noscrub/Edward.Safford/update/util/Ozone_Monitor/nwprod}
-export HOMEgdas_ozn=${NWTEST}/gdas_oznmon
-export PARMgdas_ozn=${HOMEgdas_ozn}/parm
-export FIXgdas_ozn=${FIXgdas_ozn:-${HOMEgdas_ozn}/fix}
-
-export HOMEgfs=${HOMEgfs:-${HOMEgdas_ozn}}
-export HOMEgfs_ozn=${HOMEgfs_ozn:-${HOMEgfs}}
-export PARMgfs_ozn=${PARMgfs_ozn:-${PARMgdas_ozn}}
-export FIXgfs_ozn=${FIXgfs_ozn:-${FIXgdas_ozn}}
-
-export JOBGLOBAL=${JOBGLOBAL:-${HOMEgdas_ozn}/jobs}
-export HOMEoznmon=${HOMEoznmon:-${NWTEST}/oznmon_shared}
-
-export HOMEoznmon=${NWTEST}/oznmon_shared
-export COM_IN=${COM_IN:-$DATAROOT}
-export OZN_TANKDIR=${OZN_TANKDIR:-${COMROOT}/${OZNMON_SUFFIX}}
-
-
-#------------------------------------------------------------
-# Execute job
-#
-${JOBGLOBAL}/JGDAS_ATMOS_VERFOZN
-
-exit
-
diff --git a/src/Ozone_Monitor/nwprod/oznmon_shared/ush/ozn_xtrct.sh b/src/Ozone_Monitor/nwprod/oznmon_shared/ush/ozn_xtrct.sh
index f301a95f..b42caaa9 100755
--- a/src/Ozone_Monitor/nwprod/oznmon_shared/ush/ozn_xtrct.sh
+++ b/src/Ozone_Monitor/nwprod/oznmon_shared/ush/ozn_xtrct.sh
@@ -136,12 +136,12 @@ else
    #--------------------------------------------------------------------
    #   Copy extraction programs to working directory
    #
-   ${NCP} ${HOMEoznmon}/exec/oznmon_time.x   ./oznmon_time.x
+   ${NCP} ${EXECoznmon}/oznmon_time.x   ./oznmon_time.x
    if [[ ! -e oznmon_time.x ]]; then
       iret=2
       exit ${iret}
    fi
-   ${NCP} ${HOMEoznmon}/exec/oznmon_horiz.x  ./oznmon_horiz.x
+   ${NCP} ${EXECoznmon}/oznmon_horiz.x  ./oznmon_horiz.x
    if [[ ! -e oznmon_horiz.x ]]; then
       iret=3
       exit ${iret}
@@ -170,6 +170,7 @@ else
       idd=`echo ${PDATE} | cut -c7-8`
       ihh=`echo ${PDATE} | cut -c9-10`
 
+
       for type in ${satype}; do
          echo "processing ptype, type:  ${ptype}, ${type}"
          rm -f input
diff --git a/src/Ozone_Monitor/parm/OznMon_config b/src/Ozone_Monitor/parm/OznMon_config
index d69c44d9..936500fa 100644
--- a/src/Ozone_Monitor/parm/OznMon_config
+++ b/src/Ozone_Monitor/parm/OznMon_config
@@ -7,219 +7,84 @@
 #
 ##################################################################
 
-echo "begin OznMon_config"
-
-#-----------------------------------------------------------------  
-#  This check ensures this file only gets loaded once.  Some of
-#  the definitions are built in steps and loading more than once 
-#  would make them incorrect.
-#-----------------------------------------------------------------  
-if [[ $OZNMON_CONFIG -ne 1 ]]; then
-
-   export OZNMON_CONFIG=1   
-
-   export MY_MACHINE=wcoss2
-
-   #-------------------------------------------------------------------
-   #  Note:  The file header in the oznstat file has slightly changed.
-   #         The default setting is to use that new header format, but
-   #         at the moment there is no operational source doing so.  So
-   #         setting this to 0 will make all file header reads assum the 
-   #         older format (which does work with the new file header). 
-   #         Once sources begin to use the new format this can either be
-   #         set to 1 or may go away.
-   #
-   export OZNMON_NEW_HDR=${OZNMON_NEW_HDR:-0}
-
-   #
-   # MY_OZNMON should point to your working directory which contains the
-   # top level directory to the OznMon package.  If you checked out the package
-   # as part of the GSI point to the GSI's util/Ozone_Monitor directory. If
-   # you checked out only the Ozone_Monitor portion of the branch then
-   # MY_RADMON should point to that.
-   #
-   export MY_OZNMON=${MY_OZNMON:-/lfs/h2/emc/da/noscrub/Edward.Safford/git/gsi/gfsda.v16.1.5_wcoss2_port/util/Ozone_Monitor}
-
-   export OZN_SCRIPTS=${OZN_SCRIPTS:-${MY_OZNMON}/scripts}
-   export OZN_DE_SCRIPTS=${OZN_DE_SCRIPTS:-${MY_OZNMON}/data_xtrct/ush}
-   export OZN_DE_SORC=${OZN_DE_SORC:-${MY_OZNMON}/data_xtrct/sorc}
-   export OZN_DE_EXEC=${OZN_DE_EXEC:-${MY_OZNMON}/data_xtrct/exec}
-   export OZN_IG_SCRIPTS=${OZN_IG_SCRIPTS:-${MY_OZNMON}/image_gen/ush}
-   export OZN_IG_GSCRPTS=${OZN_IG_GSCRPTS:-${MY_OZNMON}/image_gen/gscripts}
-   export OZN_EXEDIR=${OZN_EXEDIR:-${MY_OZNMON}/exec}
-
-   export HOMEgdas_ozn=${HOMEgdas_ozn:-${MY_OZNMON}/nwprod/gdas_oznmon}
-   export FIXgdas_ozn=${FIXgdas_ozn:-${HOMEgdas_ozn}/fix}
-   export HOMEoznmon=${HOMEoznmon:-${MY_OZNMON}/nwprod/oznmon_shared}
-
-   #
-   #  Add these gfs definitions to accomodate the changes
-   #  to the J-Job from the fv3_impl merge
-   #
-   export PARMgfs_ozn=${PARMgfs_ozn:-${HOMEgdas_ozn}/parm}
-   export SCRgfs_ozn=${SCRgfs_ozn:-${HOMEgdas_ozn}/scripts}
-   export FIXgfs_ozn=${FIXgfs_ozn:-${HOMEgdas_ozn}/fix}
-
-   #
-   #  The OZN_TANKDIR will be the location for the extracted data files and
-   #  the control files used for image plotting.  This is the base definition
-   #  and the succedding scripts will construct and use subdirectories under
-   #  this location.
-   #
-   export OZN_TANKDIR=${OZN_TANKDIR:-/lfs/h2/emc/da/noscrub/Edward.Safford/nbns}
-
-   if [[ $GLB_AREA -eq 1 ]]; then
-      OZN_IMGN_TANKDIR=${OZN_TANKDIR}/imgn/${OZNMON_SUFFIX}
-   else
-      OZN_IMGN_TANKDIR=${OZN_TANKDIR}/imgn/regional/${OZNMON_SUFFIX}
-   fi
-   export OZN_IMGN_TANKbase=${OZN_IMGN_TANKDIR}
-
-   if [[ $OZN_USE_RUN -eq 1 ]]; then
-      OZN_IMGN_TANKDIR=${OZN_IMGN_TANKDIR}/${RUN}
-   fi
-
-   export OZN_IMGN_TANKDIR=$OZN_IMGN_TANKDIR/oznmon/pngs
-
-   if [[ $GLB_AREA -eq 0 ]]; then
-      NEWtank=${OZN_TANKDIR}/stats/regional/${OZNMON_SUFFIX}
-   else
-      NEWtank=${OZN_TANKDIR}/stats/${OZNMON_SUFFIX}
-   fi
-
-   export OZN_STATS_TANKDIR=$NEWtank
-
-
-   #
-   #  Log and work space definitions
-   #
-   export MY_PTMP=${MY_PTMP:-/lfs/h2/emc/ptmp}
-   export PTMP_USER=${PTMP_USER:-${OZN_PTMP}/${LOGNAME}}
-   export MY_STMP=${MY_STMP:-/lfs/h2/emc/stmp}
-   export STMP_USER=${STMP_USER:-${OZN_STMP}/${LOGNAME}}
-
-
-   OZN_LOGdir=${LOGdir:-${PTMP_USER}/logs/${OZNMON_SUFFIX}}
-   OZN_WORK_DIR=${OZN_WORK_DIR:-${STMP_USER}/${OZNMON_SUFFIX}}
-
-   if [[ $OZN_USE_RUN -eq 1 ]]; then
-      OZN_LOGdir=${OZN_LOGdir}/${RUN}
-      OZN_WORK_DIR=${OZN_WORK_DIR}/${RUN}
-   fi
-   export OZN_LOGdir=$OZN_LOGdir/oznmon
-   export OZN_WORK_DIR=${OZN_WORK_DIR}/oznmon
-
-
-   #
-   #  Webserver settings
-   #
-   export WEB_SVR=${WEB_SVR:-emcrzdm}
-   export WEB_USER=${WEB_USER:-esafford}
-   export WEB_DIR=${WEB_DIR:-/home/people/emc/www/htdocs/gmb/gdas/es_ozn/pngs}
-
-
-   #
-   #  Utilities used by the OznMon package
-   #
-   export NCP=${NCP:-"/bin/cp -f"}
-   export Z=${Z:-"gz"}
-
-   if [[ $MY_MACHINE = "wcoss_d" ]]; then
-
-      shell=sh
-      source /usrx/local/prod/lmod/lmod/init/${shell}
-
-      MODULEPATH=/usrx/local/prod/lmod/lmod/modulefiles/Core
-      MODULEPATH=${MODULEPATH}:/usrx/local/prod/modulefiles/core_third
-      MODULEPATH=${MODULEPATH}:/usrx/local/prod/modulefiles/defs
-      MODULEPATH=${MODULEPATH}:/gpfs/dell1/nco/ops/nwprod/modulefiles/core_prod
-      export MODULEPATH=${MODULEPATH}:/usrx/local/dev/modulefiles
-
-      module purge
-      module load ips/18.0.1.163
-      module load metplus/2.1
-      module load lsf/10.1
-      module load prod_util/1.1.2
-      module load GrADS/2.2.0
-
-      export SUB="bsub"
-      export COMPRESS=/usr/bin/gzip
-      export UNCOMPRESS="/usr/bin/gunzip -f"
-      export RSYNC=`which rsync`
-      export GRADS=`which grads`
-      export STNMAP=`which stnmap` 
- 
-   elif [[ $MY_MACHINE = "wcoss_c" ]]; then
-      . /opt/modules/3.2.6.7/init/sh
-      module use -a /gpfs/hps/nco/ops/nwprod/modulefiles
-      module use -a /usrx/local/dev/modulefiles
-      module use -a /opt/modulefiles
-
-      module load prod_util        # defines $NDATE among other things
-      module load prod_envir	# defines data sources
-      module load GrADS		
-      module load xt-lsfhpc
-
-      export GRADS=`which grads`
-      export STNMAP=`which stnmap`
-      export SUB=`which bsub`
-
-      export COMPRESS=${COMPRESS:-gzip}
-      export UNCOMPRESS=${UNCOMPRESS:-"gunzip -f"}
-      export ACCOUNT=GFS-T2O
-      export RSYNC=`which rsync`
-
-   elif [[ $MY_MACHINE = "hera" ]]; then
-   
-      export GRADS=/apps/grads/2.0.2/bin/grads
-      export STNMAP=/apps/grads/2.0.2/bin/stnmap
-
-      export SUB=/apps/slurm/default/bin/sbatch
-      export NDATE=/home/Edward.Safford/bin/ndate
-      export COMPRESS=${COMPRESS:-gzip}
-      export UNCOMPRESS=${UNCOMPRESS:-"gunzip -f"}
-
-   elif [[ $MY_MACHINE = "s4" ]]; then
-
-      module load grads/2.2.1
-      module load license_intel/S4
-      module use /data/prod/hpc-stack/modulefiles/stack
-      module load hpc/1.1.0
-      module load hpc-intel/18.0.4
-      module load hpc-impi/18.0.4
-      module load prod_util/1.2.2
-      module load netcdf/4.7.4
-
-      export GRADS=`which grads`
-      export STNMAP=`which stnmap`
-
-      export SUB=/usr/bin/sbatch
-      export COMPRESS=${COMPRESS:-gzip}
-      export UNCOMPRESS=${UNCOMPRESS:-"gunzip -f"}
-
-      #rstprod data is not allowed on S4
-      CHGRP_CMD=echo
-   elif [[ $MY_MACHINE = "jet" ]]; then
-
-      module load grads/2.2.1
-      export GRADS=`which grads`
-      export STNMAP=`which stnmap`
-      module use /lfs4/HFIP/hfv3gfs/nwprod/hpc-stack/libs/modulefiles/stack
-      module load hpc/1.1.0 hpc-intel/18.0.5.274 prod_util/1.2.2
-
-      export SUB=/apps/slurm/default/bin/sbatch
-      export COMPRESS=${COMPRESS:-gzip}
-      export UNCOMPRESS=${UNCOMPRESS:-"gunzip -f"}
-
-      export PARTITION_OZNMON=${PARTITION_OZNMON:-vjet}
-
-   elif [[ $MY_MACHINE = "wcoss2" ]]; then
-      export COMPRESS=${COMPRESS:-gzip}
-      export UNCOMPRESS=${UNCOMPRESS:-"gunzip -f"}
-   fi
-  
+#-------------------------------------------------------
+#  Source Mon_config for GSI-monitor definitions common
+#  to all monitors.
+#
+readonly dir_root=$(cd "$(dirname "$(readlink -f -n "${BASH_SOURCE[0]}" )" )/.." && pwd -P)
+
+MON_CONFIG=$dir_root/../../parm/Mon_config
+source $MON_CONFIG
+
+
+export MY_OZNMON=$MY_GSI_MONITOR/src/Ozone_Monitor
+
+export OZN_DE_SCRIPTS=${OZN_DE_SCRIPTS:-${MY_OZNMON}/data_xtrct/ush}
+export OZN_DE_SORC=${OZN_DE_SORC:-${MY_OZNMON}/data_xtrct/sorc}
+export OZN_DE_EXEC=${OZN_DE_EXEC:-${$GSI_MON_BIN}}
+export OZN_IG_SCRIPTS=${OZN_IG_SCRIPTS:-${MY_OZNMON}/image_gen/ush}
+export OZN_IG_GSCRPTS=${OZN_IG_GSCRPTS:-${MY_OZNMON}/image_gen/gscripts}
+export OZN_EXEDIR=${OZN_EXEDIR:-${$GSI_MON_BIN}}
+
+export HOMEgdas_ozn=${HOMEgdas_ozn:-${MY_OZNMON}/nwprod/gdas_oznmon}
+export FIXgdas_ozn=${FIXgdas_ozn:-${HOMEgdas_ozn}/fix}
+export HOMEoznmon=${HOMEoznmon:-${MY_OZNMON}/nwprod/oznmon_shared}
+export EXECoznmon=${EXECoznmon:-$GSI_MON_BIN}
+
+#
+#  Add these gfs definitions to accomodate the changes
+#  to the J-Job from the fv3_impl merge
+#
+export PARMgfs_ozn=${PARMgfs_ozn:-${HOMEgdas_ozn}/parm}
+export SCRgfs_ozn=${SCRgfs_ozn:-${HOMEgdas_ozn}/scripts}
+export FIXgfs_ozn=${FIXgfs_ozn:-${HOMEgdas_ozn}/fix}
+
+#
+#  The OZN_TANKDIR will be the location for the extracted data files and
+#  the control files used for image plotting.  This is the base definition
+#  and the succedding scripts will construct and use subdirectories under
+#  this location.
+#
+export OZN_TANKDIR=${OZN_TANKDIR:-$TANKDIR}
+
+if [[ $GLB_AREA -eq 1 ]]; then
+   OZN_IMGN_TANKDIR=${OZN_TANKDIR}/imgn/${OZNMON_SUFFIX}
 else
-   echo "OznMon_config already loaded"
+   OZN_IMGN_TANKDIR=${OZN_TANKDIR}/imgn/regional/${OZNMON_SUFFIX}
+fi
+export OZN_IMGN_TANKbase=${OZN_IMGN_TANKDIR}
+
+if [[ $OZN_USE_RUN -eq 1 ]]; then
+   OZN_IMGN_TANKDIR=${OZN_IMGN_TANKDIR}/${RUN}
 fi
 
-echo "end OznMon_config"
+export OZN_IMGN_TANKDIR=$OZN_IMGN_TANKDIR/oznmon/pngs
+
+if [[ $GLB_AREA -eq 0 ]]; then
+   NEWtank=${OZN_TANKDIR}/stats/regional/${OZNMON_SUFFIX}
+else
+   NEWtank=${OZN_TANKDIR}/stats/${OZNMON_SUFFIX}
+fi
+
+export OZN_STATS_TANKDIR=$NEWtank
+
+
+#
+#  Log and work space definitions
+#
+export PTMP_USER=${PTMP_USER:-${MON_PTMP}}
+export STMP_USER=${STMP_USER:-${MON_STMP}}
+
+
+OZN_LOGdir=${LOGdir:-${PTMP_USER}/logs/${OZNMON_SUFFIX}}
+OZN_WORK_DIR=${OZN_WORK_DIR:-${STMP_USER}/${OZNMON_SUFFIX}}
+
+if [[ $OZN_USE_RUN -eq 1 ]]; then
+   OZN_LOGdir=${OZN_LOGdir}/${RUN}
+   OZN_WORK_DIR=${OZN_WORK_DIR}/${RUN}
+fi
+export OZN_LOGdir=$OZN_LOGdir/oznmon
+export OZN_WORK_DIR=${OZN_WORK_DIR}/oznmon
+
+export WEB_DIR=${WEB_DIR:-}
+
diff --git a/src/Ozone_Monitor/parm/OznMon_user_settings b/src/Ozone_Monitor/parm/OznMon_user_settings
index 9c75a863..6cc0ca08 100644
--- a/src/Ozone_Monitor/parm/OznMon_user_settings
+++ b/src/Ozone_Monitor/parm/OznMon_user_settings
@@ -6,39 +6,11 @@
 #  Modify this file in order to change behavior of the OznMon package 
 #------------------------------------------------------------------------------
 
-#
-#  ACCOUNT is used on zeus only for use with the qsub -a flag.  It is
-#  empty on other platforms.
-#
-export ACCOUNT=${ACCOUNT:-GFS-DEV}
-
-#
-#  PROJECT is used on wcoss only with the bjob -P flag.  It is 
-#  empty on other platforms.
-#
-export PROJECT=${PROJECT:-GDAS-DEV}
-
-#
-#  JOB_QUEUE is used on wcoss only with the bjob -q flag.  It is 
-#  empty on other platforms.
-#
-export JOB_QUEUE=${JOB_QUEUE:-dev}
-
 #
 #  GLB_AREA is either 1 (global) or 0 (regional)
 #
 export GLB_AREA=${GLB_AREA:-1}
 
-#
-#  OZNSTAT_LOCATION is location of the radstat files.  If OznMon runs as a 
-#    job in a parallel then $COMOUT is used instead of the value defined below. 
-#    When plotting, if horizontal plots are desired then OZNSTAT_LOCATION will
-#    need to be set to the directory of the radstat files (we only extract 
-#    horizontal data when it's needed rather than storing huge files all the 
-#    time).
-#
-export OZNSTAT_LOCATION=${OZNSTAT_LOCATION:-/gpfs/dell1/nco/ops/com/gfs/prod}
-
 #
 #  USE_ANL switches on/off data extraction for analysis files (ges is always on)
 #
@@ -46,20 +18,6 @@ export OZNSTAT_LOCATION=${OZNSTAT_LOCATION:-/gpfs/dell1/nco/ops/com/gfs/prod}
 #
 export USE_ANL=${USE_ANL:-1}
 
-#
-#  OZN_USE_RUN affects the data, image, and log file naming scheme, and is 
-#  designed to support both gdas and gfs runs for a common data source.
-#  (Note, lcm means lower case monitor name ("oznmon".) 
-#
-#  If set to 1 (default) then storage is :
-#      nbns/stats/$suffix/$RUN.$pdy/$lcm
-#      nbns/imgn/$suffix/$RUN/$lcm/pngs  
-#      $LOGdir/$suffix/$RUN/$lcm
-#
-#  set to #  0 then the resulting storage locations are:
-#      nbns/data/$suffix/$lcm.$PDY
-#      nbns/imgn/$suffix/$lcm/pngs
-#      $LOGdir/$suffix/$lcm
 #
 #  $RUN is "gdas"|"gfs" or whatever else makes sense for a RUN value.
 #
@@ -91,14 +49,6 @@ else
 fi
 export MAIL_CC=${MAIL_CC:=${cc_list}}
 
-#
-#  RUN_ONLY_ON_DEV switches on/off the constraint to run only on the 
-#  development machine.
-#
-#  0 = prod or dev, 1 = dev only.
-#  
-export RUN_ONLY_ON_DEV=${RUN_ONLY_ON_DEV:-1}
-
 #
 #  KEEPDATA switches on/off allowing the work directory to remain after data 
 #  extraction.