diff --git a/parm/gfs/gfs_plots.yaml b/parm/gfs/gfs_plots.yaml
index ed3d565..9282523 100644
--- a/parm/gfs/gfs_plots.yaml
+++ b/parm/gfs/gfs_plots.yaml
@@ -2,9 +2,100 @@
 
 model: gfs
 cycle_interval: 6
-data: '/lfs/h2/emc/da/noscrub/edward.safford/test_data/gfs'
+data: '/scratch1/NCEPDEV/da/Edward.Safford/noscrub/test_data/gfs'
 
 satellites:
+  - name: aura
+    instruments:
+      - name: omi
+        plot_list:
+          - plot: ozn horiz
+            times: 4
+            levels: '1'
+            component: ges
+
+          - plot: ozn time
+            times: 121 
+            levels: '1'
+            component: ges
+
+  - name: npp
+    instruments:
+      - name: ompsnp
+        plot_list:
+          - plot: ozn horiz
+            times: 4
+            levels: '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22'
+            component: ges
+
+          - plot: ozn summary
+            times: 121
+            levels: '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22'
+            component: ges
+
+          - plot: ozn time
+            times: 121 
+            levels: '1'
+            component: ges
+
+
+      - name: ompslp
+        plot_list:
+          - plot: ozn horiz
+            times: 4
+            levels: '1'
+            component: ges
+
+          - plot: ozn time
+            times: 121 
+            levels: '1'
+            component: ges
+
+      - name: ompstc8
+        plot_list:
+          - plot: ozn horiz
+            times: 4
+            levels: '1'
+            component: ges
+
+          - plot: ozn time
+            times: 121 
+            levels: '1'
+            component: ges
+
+  - name: n20
+    instruments:
+      - name: ompsnp
+        plot_list:
+          - plot: ozn horiz
+            times: 4
+            levels: '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22'
+            component: ges
+
+          - plot: ozn time
+            times: 121 
+            levels: '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22'
+            component: ges
+
+          - plot: ozn summary
+            times: 121
+            levels: '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22'
+            component: ges
+
+      - name: ompstc8
+        plot_list:
+          - plot: ozn horiz
+            times: 4
+            levels: '1'
+            component: ges
+
+          - plot: ozn time
+            times: 121 
+            levels: '1'
+            component: ges
+
+# Radiance
+
   - name: g16
     instruments:
       - name: abi
@@ -83,10 +174,11 @@ satellites:
             times: 121
             channels: 'all'
             component: ges
-          - plot: rad angle
-            times: 121
-            channels: 'all'
-            component: ges
+#     test data file corruption here?
+#          - plot: rad angle
+#            times: 121
+#            channels: 'all'
+#            component: ges
 
       - name: mhs
         plot_list:
@@ -103,24 +195,7 @@ satellites:
             channels: 'all'
             component: ges
 
-#     - name: avhrr
-#       plot_list:
-#         - plot: rad time
-#           times: 121
-#           channels: 'all'
-#           component: ges
-#         - plot: rad bcoef
-#           times: 121
-#           channels: 'all'
-#           component: ges
-#         - plot: rad angle
-#           times: 121
-#           channels: 'all'
-#           component: ges
-
-  - name: metop-c
-    instruments:
-      - name: amsua
+      - name: avhrr
         plot_list:
           - plot: rad time
             times: 121
@@ -135,7 +210,9 @@ satellites:
             channels: 'all'
             component: ges
 
-      - name: iasi
+  - name: metop-c
+    instruments:
+      - name: amsua
         plot_list:
           - plot: rad time
             times: 121
@@ -150,7 +227,7 @@ satellites:
             channels: 'all'
             component: ges
 
-      - name: avhrr
+      - name: iasi
         plot_list:
           - plot: rad time
             times: 121
@@ -165,7 +242,7 @@ satellites:
             channels: 'all'
             component: ges
 
-      - name: mhs
+      - name: avhrr
         plot_list:
           - plot: rad time
             times: 121
@@ -180,9 +257,7 @@ satellites:
             channels: 'all'
             component: ges
 
-  - name: n15
-    instruments:
-      - name: amsua
+      - name: mhs
         plot_list:
           - plot: rad time
             times: 121
@@ -197,7 +272,7 @@ satellites:
             channels: 'all'
             component: ges
 
-  - name: n18
+  - name: n15
     instruments:
       - name: amsua
         plot_list:
@@ -214,22 +289,7 @@ satellites:
             channels: 'all'
             component: ges
 
-      - name: avhrr
-        plot_list:
-          - plot: rad time
-            times: 121
-            channels: 'all'
-            component: ges
-          - plot: rad bcoef
-            times: 121
-            channels: 'all'
-            component: ges
-          - plot: rad angle
-            times: 121
-            channels: 'all'
-            component: ges
-
-  - name: n19
+  - name: n18
     instruments:
       - name: amsua
         plot_list:
@@ -245,7 +305,7 @@ satellites:
             times: 121
             channels: 'all'
             component: ges
- 
+
       - name: avhrr
         plot_list:
           - plot: rad time
@@ -261,20 +321,51 @@ satellites:
             channels: 'all'
             component: ges
 
-      - name: mhs
-        plot_list:
-          - plot: rad time
-            times: 121
-            channels: 'all'
-            component: ges
-          - plot: rad bcoef
-            times: 121
-            channels: 'all'
-            component: ges
-          - plot: rad angle
-            times: 121
-            channels: 'all'
-            component: ges
+#  test data file corruption here 
+#  - name: n19
+#    instruments:
+#      - name: amsua
+#        plot_list:
+#          - plot: rad time
+#            times: 121
+#            channels: 'all'
+#            component: ges
+#          - plot: rad bcoef
+#            times: 121
+#            channels: 'all'
+#            component: ges
+#          - plot: rad angle
+#            times: 121
+#            channels: 'all'
+#            component: ges
+#
+#      - name: avhrr
+#        plot_list:
+#          - plot: rad time
+#            times: 121
+#            channels: 'all'
+#            component: ges
+#          - plot: rad bcoef
+#            times: 121
+#            channels: 'all'
+#            component: ges
+#          - plot: rad angle
+#            times: 121
+#            channels: 'all'
+#            component: ges
+
+#      - name: mhs
+#        plot_list:
+#          - plot: rad time
+#            times: 121
+#            channels: 'all'
+#            component: ges
+#          - plot: rad bcoef
+#            times: 121
+#            channels: 'all'
+#            component: ges
+#          - plot: rad angle
+#            times: 121
 
   - name: n20
     instruments:
@@ -324,7 +415,7 @@ satellites:
             times: 121
             channels: 'all'
             component: ges
- 
+
       - name: cris-fsr
         plot_list:
           - plot: rad time
@@ -356,7 +447,7 @@ satellites:
             times: 121
             channels: 'all'
             component: ges
- 
+
       - name: viirs-m
         plot_list:
           - plot: rad time
@@ -424,6 +515,7 @@ satellites:
             component: ges
 
 
+
 minimization:
   - model: gfs
     plot_list: