diff --git a/pipt/misc_tools/data_tools.py b/pipt/misc_tools/data_tools.py
index 275fc3c..1f000c9 100644
--- a/pipt/misc_tools/data_tools.py
+++ b/pipt/misc_tools/data_tools.py
@@ -124,7 +124,10 @@ def en_pred_to_pred_data(en_pred):
             if has_data:
                 member_list = []
                 for el in en_pred:
-                    member_data = el[ind][typ][:, np.newaxis]
+                    if not isinstance(el[ind][typ],np.ndarray):
+                        member_data = np.array([el[ind][typ]])[:, np.newaxis]
+                    else:
+                        member_data = el[ind][typ][:, np.newaxis]
                     member_list.append(member_data)
                 
                 data_type_dict[typ] = np.concatenate(tuple(member_list), axis=1)
diff --git a/popt/cost_functions/ecalc_npv.py b/popt/cost_functions/ecalc_npv.py
index 30c46b4..bfeded9 100644
--- a/popt/cost_functions/ecalc_npv.py
+++ b/popt/cost_functions/ecalc_npv.py
@@ -71,10 +71,10 @@ def ecalc_npv(pred_data, **kwargs):
             Qgp.append([])
             Qwp.append([])
             Qwi.append([])
-            Qop[l].append(np.squeeze(pred_data[i][l]['fopt']) - np.squeeze(pred_data[i - 1][l]['fopt']))
-            Qgp[l].append(np.squeeze(pred_data[i][l]['fgpt']) - np.squeeze(pred_data[i - 1][l]['fgpt']))
-            Qwp[l].append(np.squeeze(pred_data[i][l]['fwpt']) - np.squeeze(pred_data[i - 1][l]['fwpt']))
-            Qwi[l].append(np.squeeze(pred_data[i][l]['fwit']) - np.squeeze(pred_data[i - 1][l]['fwit']))
+            Qop[l].append(np.squeeze(pred_data[i][l]['FOPT']) - np.squeeze(pred_data[i - 1][l]['FOPT']))
+            Qgp[l].append(np.squeeze(pred_data[i][l]['FGPT']) - np.squeeze(pred_data[i - 1][l]['FGPT']))
+            Qwp[l].append(np.squeeze(pred_data[i][l]['FWPT']) - np.squeeze(pred_data[i - 1][l]['FWPT']))
+            Qwi[l].append(np.squeeze(pred_data[i][l]['FWIT']) - np.squeeze(pred_data[i - 1][l]['FWIT']))
         Dd.append((report[1][i] - report[1][i - 1]).days)
         T.append((report[1][i] - report[1][0]).days)
 
diff --git a/popt/cost_functions/npv.py b/popt/cost_functions/npv.py
index e7e6384..f28ac2f 100644
--- a/popt/cost_functions/npv.py
+++ b/popt/cost_functions/npv.py
@@ -42,10 +42,10 @@ def npv(pred_data, **kwargs):
 
     values = []
     for i in np.arange(1, len(pred_data)):
-        Qop = np.squeeze(pred_data[i]['fopt']) - np.squeeze(pred_data[i - 1]['fopt'])
-        Qgp = np.squeeze(pred_data[i]['fgpt']) - np.squeeze(pred_data[i - 1]['fgpt'])
-        Qwp = np.squeeze(pred_data[i]['fwpt']) - np.squeeze(pred_data[i - 1]['fwpt'])
-        Qwi = np.squeeze(pred_data[i]['fwit']) - np.squeeze(pred_data[i - 1]['fwit'])
+        Qop = np.squeeze(pred_data[i]['FOPT']) - np.squeeze(pred_data[i - 1]['FOPT'])
+        Qgp = np.squeeze(pred_data[i]['FGPT']) - np.squeeze(pred_data[i - 1]['FGPT'])
+        Qwp = np.squeeze(pred_data[i]['FWPT']) - np.squeeze(pred_data[i - 1]['FWPT'])
+        Qwi = np.squeeze(pred_data[i]['FWIT']) - np.squeeze(pred_data[i - 1]['FWIT'])
         delta_days = (report[1][i] - report[1][0]).days
 
         val = (Qop * npv_const['wop'] + Qgp * npv_const['wgp'] - Qwp * npv_const['wwp'] - Qwi * npv_const['wwi']) / (