diff --git a/modules/aeolus/aeolus_amv.py b/modules/aeolus/aeolus_amv.py
index 6580501e535d7972a2de5f849dfd9c3d515ba9e2..c167b117b04007c6e36e4900ba2c3e802ce93b29 100644
--- a/modules/aeolus/aeolus_amv.py
+++ b/modules/aeolus/aeolus_amv.py
@@ -238,10 +238,9 @@ def create_file2(filename, raob_to_amv_dct, raob_dct, amv_files):
     rootgrp.close()
 
 
-def run_best_fit_all(amv_path=None, product_path=None, raob_path=None, gfs_path=None, source='FMWK', full_domain=False):
-    amv_files = get_datasource('/apollo/cloud/scratch/AMV_BUST/FMWK_TEST3/', 10, 'FMWK')
-    #prd_files = get_datasource('/apollo/cloud/scratch/AMV_BUST/FMWK_TEST3/', 10, 'FMWK_CLD_HGT')
-    prd_files = get_datasource('/apollo/cloud/scratch/AMV_BUST/FMWK_TEST3/', 10, 'FMWK_CLD_PHASE')
+def run_best_fit_all(amv_dir, source, product_dir, product, raob_path=None, gfs_path=None, full_domain=False):
+    amv_files = get_datasource(amv_dir, 10, source)
+    prd_files = get_datasource(product_dir, 10, product)
 
     raob_dir = '/home/rink/data/raob/'
     raob_files = ['raob_soundings20191117_0000.cdf',
@@ -493,7 +492,8 @@ def run_best_fit(raob_to_amv_dct, raob_dct, gfs_filename=None):
             elif pdiff[lev_idx] > 60.0:
                 tup = (raob_spd[lev_idx], raob_dir[lev_idx], raob_prs[lev_idx], -9)
             else:
-                tup = (raob_spd[lev_idx], raob_dir[lev_idx], raob_prs[lev_idx], 0)
+                uv = uv_from_spd_dir(raob_spd[lev_idx], raob_dir[lev_idx])
+                tup = (uv[0].magnitude, uv[1].magnitude, 0)
             raob_match_list.append(tup)
 
             if do_gfs_best_fit:
@@ -504,6 +504,7 @@ def run_best_fit(raob_to_amv_dct, raob_dct, gfs_filename=None):
 
     return out_dct
 
+
 def run_compare():
 
     raob_dir = '/home/rink/data/raob/'