diff --git a/modules/icing/pirep_goes.py b/modules/icing/pirep_goes.py
index 5ad19156cc2c026b3c469f5cee4d7f85ccc5d164..725c47a53625a58a47a52e25b81270f62c35cf51 100644
--- a/modules/icing/pirep_goes.py
+++ b/modules/icing/pirep_goes.py
@@ -74,13 +74,29 @@ def setup(pirep_file='/home/rink/data/pireps/pireps_20180101_20200331.csv'):
     return ice_dict, no_ice_dict, neg_ice_dict
 
 
-def get_clavrx_datasource(timestamp):
+def get_clavrx_datasource(timestamp, platform):
+    if platform == 'GOES':
+        return get_clavrx_datasource_goes(timestamp)
+    elif platform == 'VIIRS':
+        return get_clavrx_datasource_viirs(timestamp)
+
+
+def get_clavrx_datasource_goes(timestamp):
     dt_obj, time_tup = get_time_tuple_utc(timestamp)
     date_dir_str = dt_obj.strftime(dir_fmt)
     ds = ds_dct.get(date_dir_str)
     if ds is None:
         ds = CLAVRx(clavrx_dir + date_dir_str + '/')
-        # ds = CLAVRx_VIIRS(clavrx_dir + date_dir_str + '/')
+        ds_dct[date_dir_str] = ds
+    return ds
+
+
+def get_clavrx_datasource_viirs(timestamp):
+    dt_obj, time_tup = get_time_tuple_utc(timestamp)
+    date_dir_str = dt_obj.strftime('%j')
+    ds = ds_dct.get(date_dir_str)
+    if ds is None:
+        ds = CLAVRx_VIIRS(clavrx_dir + date_dir_str + '/')
         ds_dct[date_dir_str] = ds
     return ds
 
@@ -204,7 +220,7 @@ def create_file(filename, data_dct, ds_list, ds_types, lon_c, lat_c, time_s, fl_
     h5f_expl.close()
 
 
-def run(pirep_dct, outfile=None, outfile_l1b=None, dt_str_start=None, dt_str_end=None):
+def run(pirep_dct, platform, outfile=None, outfile_l1b=None, dt_str_start=None, dt_str_end=None):
     time_keys = list(pirep_dct.keys())
     l1b_grd_dct = {name: [] for name in l1b_ds_list}
     ds_grd_dct = {name: [] for name in ds_list}
@@ -243,7 +259,7 @@ def run(pirep_dct, outfile=None, outfile_l1b=None, dt_str_start=None, dt_str_end
                 continue
 
         try:
-            clvr_ds = get_clavrx_datasource(time)
+            clvr_ds = get_clavrx_datasource(time, platform)
         except Exception:
             print('run: Problem retrieving Datasource')
             continue