diff --git a/python/fastsim/resources/FASTSim_py_veh_db.csv b/python/fastsim/resources/FASTSim_py_veh_db.csv
index b5360336..e015d22e 100644
--- a/python/fastsim/resources/FASTSim_py_veh_db.csv
+++ b/python/fastsim/resources/FASTSim_py_veh_db.csv
@@ -1,4 +1,4 @@
-selection,Scenario name,veh_year,veh_pt_type,drag_coef,frontal_area_m2,glider_kg,veh_cg_m,drive_axle_weight_frac,wheel_base_m,cargo_kg,veh_override_kg,fs_max_kw,fs_secs_to_peak_pwr,fs_kwh,fs_kwh_per_kg,fc_max_kw,fc_eff_map,fc_eff_type,fc_sec_to_peak_pwr,fc_base_kg,fc_kw_per_kg,mc_pwr_out_perc,mc_max_kw,mc_sec_to_peak_pwr,stop_start,mc_pe_kg_per_kw,mc_pe_base_kg,ess_max_kw,ess_max_kwh,ess_kg_per_kwh,ess_base_kg,ess_round_trip_eff,ess_life_coef_a,ess_life_coef_b,wheel_inertia_kg_m2,num_wheels,wheel_rr_coef,wheel_radius_m,wheel_coef_of_fric,min_soc,max_soc,ess_dischg_to_fc_max_eff_perc,ess_chg_to_fc_max_eff_perc,max_accel_buffer_mph,max_accel_buffer_perc_of_useable_soc,perc_high_acc_buf,mph_fc_on,kw_demand_fc_on,alt_eff,chg_eff,aux_kw,force_aux_on_fc,trans_kg,trans_eff,comp_mass_multiplier,ess_to_fuel_ok_error,max_regen,val_udds_mpgge,val_hwy_mpgge,val_comb_mpgge,val_udds_kwh_per_mile,val_hwy_kwh_per_mile,val_comb_kwh_per_mile,val_cd_range_mi,val_const65_mph_kwh_per_mile,val_const60_mph_kwh_per_mile,val_const55_mph_kwh_per_mile,val_const45_mph_kwh_per_mile,val_unadj_udds_kwh_per_mile,val_unadj_hwy_kwh_per_mile,val0_to60_mph,val_ess_life_miles,val_range_miles,val_veh_base_cost,val_msrp,min_fc_time_on,idle_fc_kw
+selection,Scenario name,veh_year,veh_pt_type,drag_coef,frontal_area_m2,glider_kg,veh_cg_m,drive_axle_weight_frac,wheel_base_m,cargo_kg,veh_override_kg,fs_max_kw,fs_secs_to_peak_pwr,fs_kwh,fs_kwh_per_kg,fc_max_kw,fc_eff_map,fc_eff_type,fc_sec_to_peak_pwr,fc_base_kg,fc_kw_per_kg,mc_pwr_out_perc,mc_max_kw,mc_sec_to_peak_pwr,stop_start,mc_pe_kg_per_kw,mc_pe_base_kg,ess_max_kw,ess_max_kwh,ess_kg_per_kwh,ess_base_kg,ess_round_trip_eff,ess_life_coef_a,ess_life_coef_b,wheel_inertia_kg_m2,num_wheels,wheel_rr_coef,wheel_radius_m,wheel_coef_of_fric,min_soc,max_soc,ess_dischg_to_fc_max_eff_perc,ess_chg_to_fc_max_eff_perc,max_accel_buffer_mph,max_accel_buffer_perc_of_useable_soc,perc_high_acc_buf,mph_fc_on,kw_demand_fc_on,alt_eff,chg_eff,aux_kw,force_aux_on_fc,trans_kg,trans_eff,comp_mass_multiplier,ess_to_fuel_ok_error,max_regen,val_udds_mpgge,val_hwy_mpgge,val_comb_mpgge,val_udds_kwh_per_mile,val_hwy_kwh_per_mile,val_comb_kwh_per_mile,val_cd_range_mi,val_const65_mph_kwh_per_mile,val_const60_mph_kwh_per_mile,val_const55_mph_kwh_per_mile,val_const45_mph_kwh_per_mile,val_unadj_udds_kwh_per_mile,val_unadj_hwy_kwh_per_mile,val0_to60_mph,val_ess_life_miles,val_range_miles,val_veh_base_cost,val_msrp,min_fc_time_on,idle_fc_kw,mc_eff_map
 1,2016 TOYOTA Corolla 4cyl 2WD,,Conv,0.3,2.574,1045.636,0.53,0.61,2.6,136,,2000,1,441,9.89,98,"[0.10, 0.12, 0.16, 0.22, 0.28, 0.33, 0.35, 0.36, 0.35, 0.34, 0.32, 0.30]",SI,6,61,2.13,"[0.00, 0.02, 0.04, 0.06, 0.08,  0.10,  0.20,  0.40,  0.60,  0.80,  1.00]",0,4,FALSE,0.833,21.6,0,0,8,75,0.97,110,-0.6811,0.815,4,0.01,0.336,0.8,0.1,0.95,0,0,60,0.2,0,55,100,1,0.86,0.7,FALSE,114,0.92,1.4,0.005,0.98,27,36,31,,,,,,,,,,,9.9,,,,,30,1.96,
 2,2016 HYUNDAI Elantra 4cyl 2WD,,Conv,0.3,2.611,1090.626,0.53,0.59,2.6,136,,2000,1,468,9.89,110,"[0.10, 0.12, 0.16, 0.22, 0.28, 0.33, 0.35, 0.36, 0.35, 0.34, 0.32, 0.30]",SI,6,61,2.13,"[0.00, 0.02, 0.04, 0.06, 0.08,  0.10,  0.20,  0.40,  0.60,  0.80,  1.00]",0,4,FALSE,0.833,21.6,0,0,8,75,0.97,110,-0.6811,0.815,4,0.012,0.336,0.7,0.4,0.8,0,0,60,0.2,0,30,100,1,0.86,0.7,FALSE,114,0.92,1.4,0.005,0.98,27,37,31,,,,,,,,,,,9.9,,,,,30,2.2,
 3,2016 TOYOTA Camry 4cyl 2WD,,Conv,0.3,2.694,1334.332,0.53,0.59,2.6,136,,2000,1,568,9.89,149,"[0.10, 0.12, 0.16, 0.22, 0.28, 0.33, 0.35, 0.36, 0.35, 0.34, 0.32, 0.30]",SI,6,61,2.13,"[0.00, 0.02, 0.04, 0.06, 0.08,  0.10,  0.20,  0.40,  0.60,  0.80,  1.00]",0,4,FALSE,0.833,21.6,0,0,8,75,0.97,110,-0.6811,0.815,4,0.007,0.336,0.7,0.4,0.8,0,0,60,0.2,0,30,100,1,0.86,0.7,FALSE,114,0.92,1.4,0.005,0.98,25,35,28,,,,,,,,,,,8.6,,,,,30,2.98,
@@ -56,5 +56,5 @@ selection,Scenario name,veh_year,veh_pt_type,drag_coef,frontal_area_m2,glider_kg
 55,Toyota Corolla Cross Hybrid,2022,HEV,0.33,2.7,1650,0.53,0.61,2.56,136,1750,2000,1.1,325.62,12.06,126,,Atkinson,6.1,61.3,2.13,"[0.00, 0.02, 0.04, 0.06, 0.08, 0.10, 0.20, 0.40, 0.60, 0.80, 1.00]",20,4.8,FALSE,0.833,21.6,1000,4.1,8.9,75.8,0.97,110.8,-0.6811,0.815,4,0.01,0.311,0.7,0.4,0.8,0.3,0.3,60.3,0.2,0.8,55.8,100.8,0.9,0.86,0.5,FALSE,114.9,0.97,1.4,0.005,0.98,,,,,,,,,,,,,,9.7,,,,,30.3,3.75,"[0.83, 0.85, 0.87, 0.89, 0.90, 0.91, 0.93, 0.94, 0.94, 0.93, 0.92]"
 56,2022 MINI Cooper SE Hardtop 2 door,2022,BEV,0.3261816574680473,2.4,1359.166,0.45,0.59,2.495,136.0,1587.573,0,1,0,9.89,0,,SI,6,61,2.13,"[0.0, 0.02, 0.04, 0.06, 0.08, 0.1, 0.2, 0.4, 0.6, 0.8, 1.0]",135,4,FALSE,0.833,21.6,1000,32.6,8,75,0.97,110,-0.6811,0.815,4,0.009,0.30815,0.7,0,1,0,0,60,0.2,0,1,100,1,0.86,0.20,FALSE,114,0.98,1.4,0.005,0.98,,,,,,,,,,,,,,,,,,,30,0,"[0.84, 0.86, 0.88, 0.9, 0.91, 0.92, 0.94, 0.95, 0.95, 0.94, 0.93]"
 57,2021 Honda N-Box G,2021,Conv,0.38,2.19,0,0.53,0.61,2.52,0,1050,2000,1.1,239.27,9.89,43,,SI,6.1,0,2.13,,0,4.8,FALSE,0,0,0,0,0,0,1,110.8,-0.6811,0.815,4,0.0101,0.27855,0.8,0,1,0,0,60.3,0.2,0.8,55.8,100.8,1,0.86,0.7,FALSE,114.9,0.95,1.4,0.005,0.98,,,,,,,,,,,,,,17.1,,,,,30.3,0,
-58,2021 BMW iX xDrive40,2021,BEV,0.3,2.82,0,-0.53,0.61,3,0,2600,0,1.1,0,0,0,,SI,6.1,0,0,,240,4.8,FALSE,0.833,21.6,1000,76.6,8.9,75,0.97,110.8,-0.6811,0.815,4,0.011,0.395,0.8,0.04,0.96689295039,0,0,60.3,0.2,0.8,55.8,100.8,1,0.86,0.45,FALSE,114.9,0.98,1.4,0.005,0.98,,,,,,,,,,,,,,5.5,,,,,30.3,0,
+58,2021 BMW iX xDrive40,2021,BEV,0.25,2.82,0,-0.53,0.61,3,0,2600,0,1.1,0,0,0,,SI,6.1,0,0,,240,4.8,FALSE,0.833,21.6,1000,76.6,8.9,75,0.97,110.8,-0.6811,0.815,4,0.0101,0.395,0.8,0.04,0.96689295039,0,0,60.3,0.2,0.8,55.8,100.8,1,0.86,0.25,FALSE,114.9,0.98,1.4,0.005,0.98,,,,,,,,,,,,,,5.5,,,,,30.3,0,
 59,2021 Cupra Born,2021,BEV,0.27,2.31,0,-0.53,0.61,2.766,0,1927,0,1.1,0,0,0,,SI,6.1,0,0,,150,4.8,FALSE,0.833,21.6,1000,82,8.9,75,0.97,110.8,-0.6811,0.815,4,0.011,0.3488,0.8,0.04,0.97902439024,0,0,60.3,0.2,0.8,55.8,100.8,1,0.86,0.25,FALSE,114.9,0.98,1.4,0.005,0.98,,,,,,,,,,,,,,6.8,,,,,30.3,0,