diff --git a/modules/aeolus/aeolus_amv.py b/modules/aeolus/aeolus_amv.py
index db685703a1bb82cfd492b84eacee064ce30a7472..2745eab20c408fdbf9db6ffe1ff8bce41219768a 100644
--- a/modules/aeolus/aeolus_amv.py
+++ b/modules/aeolus/aeolus_amv.py
@@ -291,12 +291,12 @@ def run_best_fit_all(full_domain=False):
 
             out_list.append((amvs, np.array(bfs), prds))
 
-        for dct in out_list:
-            keys = list(dct.keys())
-            for key in keys:
-                tup = dct.get(key)
-                amvs_list.append(tup[0])
-                bfs_list.append(tup[1])
+        # for dct in out_list:
+        #     keys = list(dct.keys())
+        #     for key in keys:
+        #         tup = dct.get(key)
+        #         amvs_list.append(tup[0])
+        #         bfs_list.append(tup[1])
 
         for tup in out_list:
             amvs_list.append(tup[0])
@@ -482,22 +482,23 @@ def run_best_fit(raob_to_amv_dct, raob_dct, gfs_filename=None):
     return out_dct
 
 
-def analyze2(amvs_list, bf_list, raob_match_list, bf_gfs_list, amv_prod_list):
+#def analyze2(amvs_list, bf_list, raob_match_list, bf_gfs_list, amv_prod_list):
+def analyze2(amvs, bfs, raob_match, bfs_gfs, amv_prod):
 
-    amvs = np.concatenate(amvs_list, axis=1)
-    amvs = np.transpose(amvs, axes=[1, 0])
-    bfs = np.stack(bf_list, axis=0)
-    raob_match = np.stack(raob_match_list, axis=0)
-    if len(bf_gfs_list) > 0:
-        bfs_gfs = np.stack(bf_gfs_list, axis=0)
-    if len(amv_prod_list) > 0:
-        amv_prd = np.concatenate(amv_prod_list, axis=1)
-        amv_prd = np.transpose(amv_prd, axes=[1, 0])
-
-    vld = amv_prd[:, 2] > 0
-    #print(np.histogram(amv_prd[:, 0]))
-    #print(np.histogram(amv_prd[:, 1]))
-    print(np.histogram(amv_prd[vld, 2], bins=20))
+    # amvs = np.concatenate(amvs_list, axis=1)
+    # amvs = np.transpose(amvs, axes=[1, 0])
+    # bfs = np.stack(bf_list, axis=0)
+    # raob_match = np.stack(raob_match_list, axis=0)
+    # if len(bf_gfs_list) > 0:
+    #     bfs_gfs = np.stack(bf_gfs_list, axis=0)
+    # if len(amv_prod_list) > 0:
+    #     amv_prd = np.concatenate(amv_prod_list, axis=1)
+    #     amv_prd = np.transpose(amv_prd, axes=[1, 0])
+    #
+    # vld = amv_prd[:, 2] > 0
+    # #print(np.histogram(amv_prd[:, 0]))
+    # #print(np.histogram(amv_prd[:, 1]))
+    # print(np.histogram(amv_prd[vld, 2], bins=20))
 
     good_amvs = amvs
     num_good = good_amvs.shape[0]
@@ -913,17 +914,17 @@ def compare_amvs_bestfit_driver(amvs, bfs, prd, bfs_gfs, rbm, bin_size=200):
     values_prs = []
     values_spd = []
     values_dir = []
-    bin_ranges, bin_pres, bin_spd, bin_dir = compare_amvs_bestfit(amvs_thin, rbm_thin, bin_size=bin_size)
+    bin_ranges, bin_pres, bin_spd, bin_dir = compare_amvs_bestfit(amvs_thin, bfs_thin, bin_size=bin_size)
     values_prs.append(bin_pres)
     values_spd.append(bin_spd)
     values_dir.append(bin_dir)
 
-    bin_ranges, bin_pres, bin_spd, bin_dir = compare_amvs_bestfit(amvs_thick, rbm_thick, bin_size=bin_size)
+    bin_ranges, bin_pres, bin_spd, bin_dir = compare_amvs_bestfit(amvs_thick, bfs_thick, bin_size=bin_size)
     values_prs.append(bin_pres)
     values_spd.append(bin_spd)
     values_dir.append(bin_dir)
 
-    bin_ranges, bin_pres, bin_spd, bin_dir = compare_amvs_bestfit(amvs, rbm, bin_size=bin_size)
+    bin_ranges, bin_pres, bin_spd, bin_dir = compare_amvs_bestfit(amvs, bfs, bin_size=bin_size)
     values_prs.append(bin_pres)
     values_spd.append(bin_spd)
     values_dir.append(bin_dir)