diff --git a/src/Applications/GEOSdas_App/jedi/jedi_useflags.csh b/src/Applications/GEOSdas_App/jedi/jedi_useflags.csh
index 89f579e4..f22e0e98 100755
--- a/src/Applications/GEOSdas_App/jedi/jedi_useflags.csh
+++ b/src/Applications/GEOSdas_App/jedi/jedi_useflags.csh
@@ -87,15 +87,17 @@ foreach fn  ( $lst )
   set this = `echo $fn | cut -d. -f1`
   set use  = (`grep $this satinfo | cut -c26-30`)
   /bin/cp $inpobs/$this.yaml $outobs/$this.yaml
-  mksi_flags.py --input  $outobs/$this.yaml \
-                --output $outobs/$this.yaml \
-                --keyword ">>>use_channels_${this}<<<" \
-                --values $use
-  set cld  = (`grep $this satinfo | cut -c72-77`)
-  if ( ! $status ) then
-     mksi_flags.py --input  $outobs/$this.yaml \
-                   --output $outobs/$this.yaml \
-                   --keyword ">>>clddet_channels_${this}<<<" \
-                   --values $cld
+  if ( "$use" != "" ) then
+    mksi_flags.py --input  $outobs/$this.yaml \
+                  --output $outobs/$this.yaml \
+                  --keyword ">>>use_channels_${this}<<<" \
+                  --values $use
+    set cld  = (`grep $this satinfo | cut -c72-77`)
+    if ( ! $status ) then
+       mksi_flags.py --input  $outobs/$this.yaml \
+                     --output $outobs/$this.yaml \
+                     --keyword ">>>clddet_channels_${this}<<<" \
+                     --values $cld
+    endif
   endif
 end
diff --git a/src/Applications/GEOSdas_App/jedi/setup_aanajedi.pl b/src/Applications/GEOSdas_App/jedi/setup_aanajedi.pl
index f4d4b4ed..f94c87c8 100755
--- a/src/Applications/GEOSdas_App/jedi/setup_aanajedi.pl
+++ b/src/Applications/GEOSdas_App/jedi/setup_aanajedi.pl
@@ -407,6 +407,7 @@ sub init {
                      amsua_n15.yaml
                      amsua_n19.yaml
                      atms_n20.yaml
+                     atms_n21.yaml
                      atms_npp.yaml
                      avhrr3_metop-b.yaml
                      avhrr3_metop-c.yaml
diff --git a/src/Applications/GEOSdas_App/jedi/util/obsstats.csh b/src/Applications/GEOSdas_App/jedi/util/obsstats.csh
index 39af80b0..04c215ba 100755
--- a/src/Applications/GEOSdas_App/jedi/util/obsstats.csh
+++ b/src/Applications/GEOSdas_App/jedi/util/obsstats.csh
@@ -3,8 +3,11 @@
 setenv FVROOT /home/dao_ops/GEOSadas-5_43_0/GEOSadas/install-SLES15
 set path = ( . $FVROOT/bin $path )
 
-setenv DRYRUN #echo
+setenv DRYRUN # echo
 setenv OUTFIGS $TMP/SwellExperiments/Figs
+#setenv XTRA "--xGSI --common"
+setenv XTRA 
+setenv TOTRAIN 0
 
 set humKX = (`echorc.x -rc ostats.rc -ncol 2 specific_humidity`)
 set humNM = (`echorc.x -rc ostats.rc -ncol 1 specific_humidity`)
@@ -24,25 +27,29 @@ set ozNM = (`echorc.x -rc ostats.rc -ncol 1 ozone`)
 set stwKX = (`echorc.x -rc ostats.rc -ncol 2 satwind`)
 set stwNM = (`echorc.x -rc ostats.rc -ncol 1 satwind`)
 
-set humKX = ()
-set acTKX = ()
-set radKX = ()
-set gpsKX = ()
+#set humKX = ()
+#set acTKX = ()
+#set radKX = ()
+#set gpsKX = ()
 #set ozKX  = ()
-set stwKX = ()
+#set stwKX = ()
 
 set expidGSI  = x0054
+set expidGSI  = null
 set expidGSI  = x0053RPY
 set expidJEDI = j4drpy
+set expidJEDI = null
+set expidJEDI = j4drp1
 
-#set nymd = 20260113
-set nymd = 20260120
-set nhms = 000000
+foreach nymd ( 20260115 )
+foreach nhms ( 000000 060000 120000 180000 )
 
 set ODSarch  = $DAD/archive/544
 set ODSarch  = $DAD/archive/543
 set IODAarch = $DAD/archive/JEDI/543
 
+if ( ! -d $OUTFIGS ) mkdir -p $OUTFIGS
+
 # GEOS-GSI experiment output
 if ( $expidGSI != "null" ) then
 
@@ -141,11 +148,17 @@ if ( $expidGSI != "null" ) then
     @ ic++
   end
   wait
+  if ( $TOTRAIN ) then
+     scp $OUTFIGS/$expidGSI.*.${nymd}_${hh}z.png train:/san_agcm/geos5/$expidGSI/obs/images
+  endif
 
 endif # GEOS-GSI
 
 # GEOS-JEDI experiment output
 
+set radKX = (`echorc.x -rc ostats.rc -ncol 2 jedi_radiance`)
+set radNM = (`echorc.x -rc ostats.rc -ncol 1 jedi_radiance`)
+
 if ( $expidJEDI != "null" ) then
 
   set jedi_date = (`tick $nymd $nhms -10800`)
@@ -214,8 +227,8 @@ if ( $expidJEDI != "null" ) then
     set jhh   = `echo $jnhms | cut -c1-2`
     set  hh   = `echo $nhms  | cut -c1-2`
     set instr = $radNM[$ic]
-  
-    $DRYRUN ~/src/python/JEDI/OBS/ioda_prs.binned.py --obtype radiance --satid $kx \
+
+    $DRYRUN ~/src/python/JEDI/OBS/ioda_prs.binned.py --obtype radiance --satid $kx $XTRA \
            --fig $OUTFIGS/$expidJEDI.${instr}.${nymd}_${hh}z.png \
            --tarname $IODAarch/$expidJEDI/jedi/obs/Y$jyyyy/M$jmm/$expidJEDI.jedi_hofx.${jnymd}_${jhh}z.tar \
            ${instr}.${jnymd}T${jhh}0000Z.nc4 &
@@ -261,4 +274,10 @@ if ( $expidJEDI != "null" ) then
   end
   wait
 
+  if ( $TOTRAIN ) then
+     scp $OUTFIGS/$expidJEDI.*.${nymd}_${hh}z.png train:/san_agcm/geos5/$expidJEDI/obs/images
+  endif
 endif # GEOS-JEDI
+
+end # nhms
+end # nymd
diff --git a/src/Applications/GEOSdas_App/jedi/util/ostats.rc b/src/Applications/GEOSdas_App/jedi/util/ostats.rc
index 8dbb301a..3fc8a116 100644
--- a/src/Applications/GEOSdas_App/jedi/util/ostats.rc
+++ b/src/Applications/GEOSdas_App/jedi/util/ostats.rc
@@ -9,6 +9,7 @@ radiance::
  iasi_metop-c    877
  atms_npp        900
  atms_n20        920
+ atms_n21        921
  ssmis_f17       717
  avhrr_metop-b   626
  avhrr_metop-c   627
@@ -18,6 +19,26 @@ radiance::
  amsr2_gcom-w1   550
 ::
 
+jedi_radiance::
+ amsua_metop-b   326
+ amsua_metop-c   327
+ mhs_metop-b     826
+ mhs_metop-c     827
+ airs_aqua        49     
+ iasi_metop-b    876
+ iasi_metop-c    877
+ atms_npp        900
+ atms_n20        920
+ atms_n21        921
+ ssmis_f17       717
+ avhrr3_metop-b   626
+ avhrr3_metop-c   627
+ gmi_gpm         706
+ cris-fsr_n20    960
+#cris-fsr_n21    961
+ amsr2_gcom-w1   550
+::
+
 specific_humidity::
  sondeQ          120
 ::