diff --git a/modules/util/viirs_l1b_l2.py b/modules/util/viirs_l1b_l2.py
index 1445886def8cc9170b4e0613e0ae3da4f5c3ff1a..a83657c9348cdd5545f551fcb764e3262c354b2a 100644
--- a/modules/util/viirs_l1b_l2.py
+++ b/modules/util/viirs_l1b_l2.py
@@ -5,15 +5,21 @@ import glob
 import os
 from pathlib import Path
 
-emis_params = ['temp_10_4um_nom', 'temp_11_0um_nom', 'temp_12_0um_nom', 'temp_13_3um_nom', 'temp_3_9um_nom',
-               'temp_6_7um_nom']
-l2_params = ['cloud_fraction', 'cld_temp_acha', 'cld_press_acha']
+emis_params = ['temp_10_4um_nom', 'temp_11_0um_nom', 'temp_12_0um_nom', 'temp_13_3um_nom', 'temp_3_75um_nom',
+               'temp_6_2um_nom', 'temp_6_7um_nom', 'temp_7_3um_nom', 'temp_8_5um_nom', 'temp_9_7um_nom']
+
+refl_params = ['refl_0_47um_nom', 'refl_0_65um_nom', 'refl_0_86um_nom', 'refl_1_38um_nom', 'refl_1_60um_nom']
+
+data_params = refl_params + emis_params
+
+l2_params = ['cloud_fraction', 'cld_temp_acha', 'cld_press_acha', 'cld_opd_acha', 'cld_reff_acha']
+label_params = l2_params
 
 # data_params = ['cloud_fraction']
 # label_params = ['cloud_fraction']
 
-data_params = ['observation_data/M15']
-label_params = ['observation_data/M15_highres']
+# data_params = ['observation_data/M15']
+# label_params = ['observation_data/M15_highres']
 
 
 def run_all(directory, out_directory):
@@ -24,8 +30,8 @@ def run_all(directory, out_directory):
         if not p.is_dir():
             continue
 
-        # data_files = glob.glob(directory + p.name+'/'+'clavrx_snpp_viirs*.uwssec*.nc')
-        data_files = glob.glob(directory + p.name + '/' + 'VNP02MOD*.uwssec.nc')
+        data_files = glob.glob(directory + p.name+'/'+'clavrx_snpp_viirs*.uwssec*.nc')
+        # data_files = glob.glob(directory + p.name + '/' + 'VNP02MOD*.uwssec.nc')
 
         label_valid_tiles = []
         label_train_tiles = []
@@ -37,7 +43,8 @@ def run_all(directory, out_directory):
             # if idx % 8 == 0:  # if we want to skip some files
             if True:
                 w_o_ext, ext = os.path.splitext(data_f)
-                label_f = w_o_ext+'.highres'+ext
+                label_f = data_f
+                # label_f = w_o_ext+'.highres'+ext
                 # label_f = label_f.replace('snpp_viirs', 'VNP02MOD')
                 if not os.path.exists(label_f):
                     continue
@@ -59,7 +66,7 @@ def run_all(directory, out_directory):
                 label_tiles = []
 
                 try:
-                    run(data_h5f, label_h5f, data_tiles, label_tiles, factor=2)
+                    run(data_h5f, label_h5f, data_tiles, label_tiles)
                 except Exception as e:
                     print(e)
                     data_h5f.close()
@@ -132,24 +139,24 @@ def run_all(directory, out_directory):
     print('num_train_samples, num_valid_samples: ', num_train_samples, num_valid_samples)
 
 
-def run(data_h5f, label_h5f, data_tiles, label_tiles, factor=2, border=9):
+def run(data_h5f, label_h5f, data_tiles, label_tiles, mod_tile_width=64, border=9):
     if label_h5f is None:
         label_h5f = data_h5f
 
     l1b_param_name = data_params[0]
     l2_param_name = label_params[0]
 
-    mod_tile_width = 64
-    img_tile_width = mod_tile_width * factor
-
     mod_num_lines = data_h5f[l1b_param_name].shape[0]
     mod_num_pixels = data_h5f[l1b_param_name].shape[1]
 
     img_num_lines = label_h5f[l2_param_name].shape[0]
     img_num_pixels = label_h5f[l2_param_name].shape[1]
 
-    mod_num_y_tiles = int(mod_num_lines / mod_tile_width)
-    mod_num_x_tiles = int(mod_num_pixels / mod_tile_width)
+    factor = img_num_pixels / mod_num_pixels
+    img_tile_width = mod_tile_width * factor
+
+    # mod_num_y_tiles = int(mod_num_lines / mod_tile_width)
+    # mod_num_x_tiles = int(mod_num_pixels / mod_tile_width)
 
     l1b_grd_s = []
     l2_grd_s = []