diff --git a/jobs/JGEFS_ATMOS_ENSPOST b/jobs/JGEFS_ATMOS_ENSPOST
index d3cb93c58..3a148aae1 100755
--- a/jobs/JGEFS_ATMOS_ENSPOST
+++ b/jobs/JGEFS_ATMOS_ENSPOST
@@ -72,7 +72,7 @@ export PARMgefs=${PARMgefs:-$HOMEgefs/parm}
 ##############################################
 # Define COM directories
 ##############################################
-export COMIN=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/$cyc}
+export COMIN=${COMIN:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/$cyc}
 export COMOUT=${COMOUT:-${COMROOT}/${NET}/${envir}/${RUN}.${PDY}/$cyc}
 
 #############################
diff --git a/scripts/exgefs_atmos_enspost.sh b/scripts/exgefs_atmos_enspost.sh
index f42a81261..ddd82642a 100755
--- a/scripts/exgefs_atmos_enspost.sh
+++ b/scripts/exgefs_atmos_enspost.sh
@@ -173,7 +173,7 @@ while [[ $fh -le $FHOUR ]]; do
 			previncr=no
 			for mem in $memberlist; do
 				(( nmem = nmem + 1 ))
-				testfile=$COMIN/$COMPONENT/pgrb2$lr/ge${mem}.${cycle}.pgrb2$FXT\f$fh$EXT.idx
+				testfile=$COMIN/$COMPONENT/pgrb2$lr/ge${mem}.${cycle}.pgrb2${FXT}f$fh$EXT.idx
 				if [ -f $testfile ]; then
 					echo testfile=$testfile found
 					(( nfiles = nfiles + 1 ))
@@ -428,6 +428,14 @@ if [ "$SENDCOM" = "YES" ]; then
 	done # for file in $postvarlist
 fi # [ "$SENDCOM" = "YES" ]
 
+#
+# create pqpf 24h and probabilistic precip forecast files
+## write out with ensemble extended messages
+#
+
+## part (1a): calculate PQPF (named ensppf ) for each 24 hours period,
+#
+
 if [[ "$cycle" == "t00z" ]] && [[ -z $ext_h ]]; then
 	$ENSPPF $COMOUT/$COMPONENT/ensstat/enspost_grb2${ext_h}.$cycle.prcp ensppf${ext_h}.$PDY$cyc.grib2 $npert
 	$WGRIB2 ensppf${ext_h}.$PDY$cyc.grib2 -s >ensppf${ext_h}.$PDY$cyc.grib2.idx 
@@ -460,7 +468,24 @@ if [[ "$cycle" == "t00z" ]] && [[ -z $ext_h ]]; then
 fi # test "$cycle" = "t00z"
 
 # part (1b): probabilistic forecasts ( PQPF, PQRF, PQFF, PQSF and PQIF )
-export CDATE=$PDY$cyc; 
+if [[ -z $ext_h ]]; then
+
+	export CDATE=$PDY$cyc; 
+	$ENSPQPF
+
+	for file in pqpf pqrf pqff pqsf pqif; do
+		$CNVGRIB -g21 $DATA/$file $DATA/${file}_grb1
+		$WGRIB2 $DATA/$file -s >$DATA/${file}.idx
+		$GRBINDEX $DATA/${file}_grb1 $DATA/${file}i_grb1
+		if [ $SENDCOM = "YES" ];        then
+			mv $DATA/${file} $COMOUT/$COMPONENT/ensstat/ensstat_grb2${ext_h}.$cycle.$file
+			mv $DATA/${file}.idx $COMOUT/$COMPONENT/ensstat/ensstat_grb2${ext_h}.$cycle.${file}.idx
+			mv $DATA/${file}_grb1 $COMOUT/$COMPONENT/ensstat/ensstat${ext_h}.$cycle.$file
+			mv $DATA/${file}i_grb1 $COMOUT/$COMPONENT/ensstat/ensstat${ext_h}.$cycle.${file}i
+		fi # [ $SENDCOM = "YES" ]
+	done # for file in pqpf pqrf pqff pqsf pqif
+
+fi
 
 ############################################################################
 ###########  ADD DBN ALERTS FOR PPF AND PQPF FILES IF NEEDED  ##############
diff --git a/sorc/build_global_enspqpf.sh b/sorc/build_global_enspqpf.sh
index cf2d4db9b..9b9f1b066 100755
--- a/sorc/build_global_enspqpf.sh
+++ b/sorc/build_global_enspqpf.sh
@@ -32,20 +32,6 @@ export INCSM="-I ${G2_INC4}"
 
 export LIBSM="${G2_LIB4} ${W3NCO_LIB4} ${BACIO_LIB4} ${JASPER_LIB} ${PNG_LIB} ${Z_LIB}"
 
-
-# If you want to get the original size of excutable file, 
-GetOriginal=${GetOriginal:-false}
-
-if $GetOriginal; then
-    if [ $target == wcoss_cray ]; then
-        echo "This is on wcoss_cray"
-        export INCSM="-I ${G2_INC4} -I/opt/cray/iobuf/2.0.5/include"
-        export LIBSM="${G2_LIB4} ${W3NCO_LIB4} ${BACIO_LIB4} ${JASPER_LIB} ${PNG_LIB} ${Z_LIB} -Wl,/opt/cray/iobuf/2.0.5/lib/iobuf.o"
-    elif [ $target == wcoss_dell_p3 ]; then
-        echo "This is on wcoss_dell_p3"
-    fi
-fi
-
 make -f Makefile clobber
 make -f Makefile
 make -f Makefile install
diff --git a/ush/global_enspqpf.sh b/ush/global_enspqpf.sh
index 62531f50e..bb727b56d 100755
--- a/ush/global_enspqpf.sh
+++ b/ush/global_enspqpf.sh
@@ -40,12 +40,13 @@ cat <<- EOF >inputpqpf
 		cfrzr='$CFRZR',cfrzro='$CFRZRO'
 		cicep='$CICEP',cicepo='$CICEPO'
 		csnow='$CSNOW',csnowo='$CSNOWO'
+		npert=$npert
 	/
 	EOF
 
 cat inputpqpf
 
-rm $CPGO $CRAINO $CFRZRO $CICEPO $CSNOWO
+#rm $CPGO $CRAINO $CFRZRO $CICEPO $CSNOWO
 
 export pgm=$enspqpf
 source prep_step
@@ -66,4 +67,4 @@ fi
 
 echo "$(date -u) end ${.sh.file}"
 
-exit $err
\ No newline at end of file
+exit $err