diff --git a/modules/icing/pirep_goes.py b/modules/icing/pirep_goes.py
index 1f9244998da487beb28aff3d684469a817df71a4..8c72c41cf97e4b643e937410f8e37a2624eb6e1d 100644
--- a/modules/icing/pirep_goes.py
+++ b/modules/icing/pirep_goes.py
@@ -40,19 +40,22 @@ a_clvr_file = '/home/rink/data/clavrx/clavrx_OR_ABI-L1b-RadC-M3C01_G16_s20190020
 #a_clvr_file = '/Users/tomrink/data/clavrx/clavrx_OR_ABI-L1b-RadC-M3C01_G16_s20190020002186.level2.nc'
 
 data_dir = '/Users/tomrink/data/icing/'
-icing_files = ['icing_2018010600_2018033022_QC_DAY.h5', 'icing_2018040100_2018063021_QC_DAY.h5', 'icing_2018070101_2018093022_QC_DAY.h5',
-               'icing_2018100115_2018123022_QC_DAY.h5', 'icing_2019010100_2019033023_QC_DAY.h5']
+icing_files = ['icing_2018010600_2018033022_QC_DAY.h5', 'icing_2018040100_2018063021_QC_DAY.h5',
+               'icing_2018070101_2018093022_QC_DAY.h5', 'icing_2018100115_2018123022_QC_DAY.h5',
+               'icing_2019010100_2019033023_QC_DAY.h5']
 icing_l1b_files = []
 
-no_icing_files = ['no_icing_2018010600_2018033022_DAY.h5', 'no_icing_2018040100_2018063022_DAY.h5', 'no_icing_2018070100_2018093022_DAY.h5',
-               'no_icing_2018100115_2018123022_DAY.h5', 'no_icing_2019010100_2019033023_DAY.h5']
+no_icing_files = ['no_icing_2018010600_2018033022_DAY.h5', 'no_icing_2018040100_2018063022_DAY.h5',
+                  'no_icing_2018070100_2018093022_DAY.h5', 'no_icing_2018100115_2018123022_DAY.h5',
+                  'no_icing_2019010100_2019033023_DAY.h5']
 no_icing_l1b_files = []
 
 train_params_day = ['cld_height_acha', 'cld_geo_thick', 'supercooled_cloud_fraction', 'cld_temp_acha', 'cld_press_acha',
-                    'solar_zenith_angle', 'cld_reff_dcomp', 'cld_opd_dcomp', 'cld_cwp_dcomp', 'iwc_dcomp', 'lwc_dcomp', 'cloud_phase', 'cloud_mask']
+                    'solar_zenith_angle', 'cld_reff_dcomp', 'cld_opd_dcomp', 'cld_cwp_dcomp', 'iwc_dcomp', 'lwc_dcomp',
+                    'cloud_phase', 'cloud_mask']
 
-train_params_night = ['cld_height_acha', 'cld_geo_thick', 'supercooled_cloud_fraction', 'cld_temp_acha', 'cld_press_acha',
-                    'solar_zenith_angle', 'cld_reff_acha', 'cld_opd_acha', 'cloud_phase', 'cloud_mask']
+train_params_night = ['cld_height_acha', 'cld_geo_thick', 'supercooled_cloud_fraction', 'cld_temp_acha',
+                      'cld_press_acha', 'solar_zenith_angle', 'cld_reff_acha', 'cld_opd_acha', 'cloud_phase', 'cloud_mask']
 
 
 def setup():
@@ -928,15 +931,15 @@ def fov_extract(outfile='/Users/tomrink/fovs_out.h5', train_params=train_params_
         data_dct[ds_name] = np.concatenate([icing_data_dct[ds_name], no_icing_data_dct[ds_name]])
 
     # apply shuffle indexes
-    ds_indexes = np.arange(num_ice + num_no_ice)
-    np.random.shuffle(ds_indexes)
-
-    for ds_name in train_params:
-        data_dct[ds_name] = data_dct[ds_name][ds_indexes]
-    icing_intensity = icing_intensity[ds_indexes]
-    icing_times = icing_times[ds_indexes]
-    icing_lons = icing_lons[ds_indexes]
-    icing_lats = icing_lats[ds_indexes]
+    # ds_indexes = np.arange(num_ice + num_no_ice)
+    # np.random.shuffle(ds_indexes)
+    #
+    # for ds_name in train_params:
+    #     data_dct[ds_name] = data_dct[ds_name][ds_indexes]
+    # icing_intensity = icing_intensity[ds_indexes]
+    # icing_times = icing_times[ds_indexes]
+    # icing_lons = icing_lons[ds_indexes]
+    # icing_lats = icing_lats[ds_indexes]
 
     h5f_expl = h5py.File(a_clvr_file, 'r')
     h5f_out = h5py.File(outfile, 'w')
@@ -1072,15 +1075,15 @@ def box_extract(outfile='/Users/tomrink/box_out.h5', train_params=train_params_d
         data_dct[ds_name] = np.concatenate([icing_data_dct[ds_name], no_icing_data_dct[ds_name]])
 
     # Do shuffle
-    ds_indexes = np.arange(num_ice + num_no_ice)
-    np.random.shuffle(ds_indexes)
-
-    for ds_name in train_params:
-        data_dct[ds_name] = data_dct[ds_name][ds_indexes]
-    icing_intensity = icing_intensity[ds_indexes]
-    icing_times = icing_times[ds_indexes]
-    icing_lons = icing_lons[ds_indexes]
-    icing_lats = icing_lats[ds_indexes]
+    # ds_indexes = np.arange(num_ice + num_no_ice)
+    # np.random.shuffle(ds_indexes)
+    #
+    # for ds_name in train_params:
+    #     data_dct[ds_name] = data_dct[ds_name][ds_indexes]
+    # icing_intensity = icing_intensity[ds_indexes]
+    # icing_times = icing_times[ds_indexes]
+    # icing_lons = icing_lons[ds_indexes]
+    # icing_lats = icing_lats[ds_indexes]
 
     h5f_expl = h5py.File(a_clvr_file, 'r')
     h5f_out = h5py.File(outfile, 'w')