diff --git a/deploy/runtime/cashflow.lk b/deploy/runtime/cashflow.lk
index 86e8cff15..eabca131c 100644
--- a/deploy/runtime/cashflow.lk
+++ b/deploy/runtime/cashflow.lk
@@ -306,6 +306,7 @@ function cf_om_expenses()
 	{
 		cfline( 'cf_om_fixed2_expense,cf_om_production2_expense,cf_om_capacity2_expense', 0);
 		cfline( 'cf_fuelcell_replacement_cost', 0);
+		cfline( 'cf_om_fuel_expense', 0);
 	}
 	if ( is_fuel_tech() ) { cfline('cf_om_fuel_expense', 0); }
 	if ( tech == 'Biopower' ) { cfline( 'cf_om_opt_fuel_1_expense,cf_om_opt_fuel_2_expense', 0); }
@@ -379,7 +380,7 @@ function cf_operating_expenses()
 	cf_om_expenses();
 	cfline( 'cf_property_tax_expense', 0);
 	cfline( 'cf_insurance_expense', 0);
-   	if ( is_land_lease_config() ) { cfline('cf_land_lease_expense', 0); }
+   	if ( is_land_lease_config() && strpos(technology(),'Hybrid') < 0 ) { cfline('cf_land_lease_expense', 0); } // hybrid land lease handled in cf_om_expenses() function
    	if ( fin == 'Community Solar')
 	{
 		cfline('cf_community_solar_recurring_fixed', 0);
diff --git a/deploy/runtime/defaults/Physical Trough IPH_Commercial.json b/deploy/runtime/defaults/Physical Trough IPH_Commercial.json
index aed9181e5..1ddba17a0 100644
--- a/deploy/runtime/defaults/Physical Trough IPH_Commercial.json	
+++ b/deploy/runtime/defaults/Physical Trough IPH_Commercial.json	
@@ -17587,7 +17587,7 @@
         1.0,
         1.0
     ],
-    "COPY_field_thermal_output": 13.3211,
+    "COPY_field_thermal_output": 7.92716,
     "COPY_field_thermal_output_ideal": 14.5179,
     "COPY_q_pb_design": 5000.0,
     "COPY_system_capacity_heat_btu": 17.0607,
@@ -17946,8 +17946,8 @@
         1.0
     ],
     "FIELD_COPY_I_bn_des": 950.0,
-    "FIELD_COPY_T_loop_in_des": 90.0,
-    "FIELD_COPY_T_loop_out": 300.0,
+    "FIELD_COPY_T_loop_in_des": 293.0,
+    "FIELD_COPY_T_loop_out": 391.0,
     "FIELD_COPY_nLoops": 4.0,
     "FIELD_COPY_solar_mult": 2.90358,
     "FieldConfig": 1.0,
@@ -18403,16 +18403,16 @@
         ]
     ],
     "SolarAz": 0.0,
-    "TES_COPY_T_loop_in_des": 90.0,
-    "TES_COPY_T_loop_out": 300.0,
+    "TES_COPY_T_loop_in_des": 293.0,
+    "TES_COPY_T_loop_out": 391.0,
     "TES_COPY_q_pb_design": 5.0,
     "TES_COPY_tshours": 6.0,
     "TES_DISP_tes_type": 0.0,
-    "T_fp": 10.0,
-    "T_loop_in_des": 90.0,
-    "T_loop_out": 300.0,
-    "T_shutdown": 159.3,
-    "T_startup": 159.3,
+    "T_fp": 150.0,
+    "T_loop_in_des": 293.0,
+    "T_loop_out": 391.0,
+    "T_shutdown": 325.34,
+    "T_startup": 325.34,
     "T_tank_cold_ini": 300.0,
     "T_tank_hot_inlet_min": 400.0,
     "Tau_envelope": [
@@ -18544,7 +18544,7 @@
     "V_hdr_cold_min": 2.0,
     "V_hdr_hot_max": 3.0,
     "V_hdr_hot_min": 2.0,
-    "V_tank_hot_ini": 59.7727,
+    "V_tank_hot_ini": 145.32,
     "V_tes_des": 1.85,
     "W_aperture": [
         8.2,
@@ -18552,7 +18552,7 @@
         6.0,
         6.0
     ],
-    "W_dot_pump_SS": 0.0224465,
+    "W_dot_pump_SS": 0.0748562,
     "accept_init": 0.0,
     "accept_loc": 1.0,
     "accept_mode": 0.0,
@@ -18698,7 +18698,7 @@
     "cbi_uti_tax_sta": 1.0,
     "chk_update_peaks": 0.0,
     "city": "-",
-    "cold_tank_Thtr": 60.0,
+    "cold_tank_Thtr": 250.0,
     "cold_tank_max_heat": 0.5,
     "collector_library": "SunBeam IPH",
     "collectors_in_field": "Cold - 1 - 1 - 1 - 1 - Hot",
@@ -18722,21 +18722,21 @@
     "csp.dtr.cost.bop": 450000.0,
     "csp.dtr.cost.bop_mwe": 5.0,
     "csp.dtr.cost.bop_per_kwe": 90.0,
-    "csp.dtr.cost.contingency": 755143.0,
+    "csp.dtr.cost.contingency": 771943.0,
     "csp.dtr.cost.contingency_percent": 7.0,
     "csp.dtr.cost.epc.cost_per_watt": 0.0,
     "csp.dtr.cost.epc.fixed": 0.0,
     "csp.dtr.cost.epc.per_acre": 0.0,
     "csp.dtr.cost.epc.per_watt": 0.0,
     "csp.dtr.cost.epc.percent": 11.0,
-    "csp.dtr.cost.epc.total": 1269720.0,
+    "csp.dtr.cost.epc.total": 1297970.0,
     "csp.dtr.cost.heat_sink": 600000.0,
     "csp.dtr.cost.heat_sink.cost_per_kwe": 120.0,
     "csp.dtr.cost.heat_sink.mwe": 5.0,
     "csp.dtr.cost.htf_system": 1267200.0,
     "csp.dtr.cost.htf_system.area": 21120.0,
     "csp.dtr.cost.htf_system.cost_per_m2": 60.0,
-    "csp.dtr.cost.installed_per_capacity": 2675.87,
+    "csp.dtr.cost.installed_per_capacity": 2734.93,
     "csp.dtr.cost.nameplate": 5.0,
     "csp.dtr.cost.plm.fixed": 0.0,
     "csp.dtr.cost.plm.per_acre": 10000.0,
@@ -18744,7 +18744,7 @@
     "csp.dtr.cost.plm.percent": 0.0,
     "csp.dtr.cost.plm.total": 105011.0,
     "csp.dtr.cost.sales_tax.percent": 80.0,
-    "csp.dtr.cost.sales_tax.total": 461716.0,
+    "csp.dtr.cost.sales_tax.total": 471988.0,
     "csp.dtr.cost.sales_tax.value": 5.0,
     "csp.dtr.cost.site_improvements": 337920.0,
     "csp.dtr.cost.site_improvements.area": 21120.0,
@@ -18752,21 +18752,21 @@
     "csp.dtr.cost.solar_field": 6272640.0,
     "csp.dtr.cost.solar_field.area": 21120.0,
     "csp.dtr.cost.solar_field.cost_per_m2": 297.0,
-    "csp.dtr.cost.storage": 1860000.0,
-    "csp.dtr.cost.storage.cost_per_kwht": 62.0,
+    "csp.dtr.cost.storage": 2100000.0,
+    "csp.dtr.cost.storage.cost_per_kwht": 70.0,
     "csp.dtr.cost.storage.mwht": 30.0,
     "csp.dtr.cost.total_land_area": 10.5011,
     "csp.dtr.tes.fluid_sph": 0.0,
-    "csp.dtr.tes.htf_calc_temp": 195.0,
+    "csp.dtr.tes.htf_calc_temp": 342.0,
     "csp.dtr.tes.htf_max_opt_temp": 593.0,
     "csp.dtr.tes.htf_min_opt_temp": 238.0,
-    "csp.dtr.tes.min_fluid_volume": 6.41463,
+    "csp.dtr.tes.min_fluid_volume": 39.6744,
     "csp.dtr.tes.thermal_capacity": 30.0,
     "csp.pt.par.calc.aux": 0.12121,
     "csp.pt.par.calc.bop": 0.0,
-    "csp.pt.tes.htf_density": 1965.98,
-    "csp.pt.tes.tank_diameter": 4.04162,
-    "csp.pt.tes.tank_height": 15.0,
+    "csp.pt.tes.htf_density": 1872.49,
+    "csp.pt.tes.tank_diameter": 7.10739,
+    "csp.pt.tes.tank_height": 12.0,
     "csp_dtr_hce_absorber_material_1": 0.0,
     "csp_dtr_hce_absorber_material_2": 0.0,
     "csp_dtr_hce_absorber_material_3": 0.0,
@@ -19130,7 +19130,7 @@
     "custom_sf_pipe_sizes": 0.0,
     "custom_tes_p_loss": 0.0,
     "custom_tes_pipe_sizes": 0.0,
-    "dP_sf_SS": 5.03184,
+    "dP_sf_SS": 10.1475,
     "d_tank_in": 0.0,
     "debt_fraction": 60.0,
     "debt_message": "",
@@ -19147,7 +19147,7 @@
     ],
     "depr_sta_sl_years": 7.0,
     "depr_sta_type": 1.0,
-    "direct_subtotal": 10787800.0,
+    "direct_subtotal": 11027800.0,
     "disp_frequency": 24.0,
     "disp_horizon": 48.0,
     "disp_max_iter": 50000.0,
@@ -19395,9 +19395,9 @@
     ],
     "eta_pump": 0.85,
     "f_htfmax": 1.2,
-    "f_htfmax_actual": 0.917563,
+    "f_htfmax_actual": 0.546026,
     "f_htfmin": 0.25,
-    "f_htfmin_actual": 0.0764636,
+    "f_htfmin_actual": 0.0455022,
     "f_tc_cold": 2.0,
     "federal_tax_rate": [
         21.0
@@ -19503,10 +19503,10 @@
             941.0
         ]
     ],
-    "field_htf_cp_avg": 2.85038,
+    "field_htf_cp_avg": 3.3429,
     "field_htf_max_operating_temp": 400.0,
     "field_htf_min_operating_temp": 12.0,
-    "field_thermal_output": 13.3211,
+    "field_thermal_output": 7.92716,
     "field_thermal_output_ideal": 14.5179,
     "file_name": "tucson_az_32.116521_-110.933042_psmv3_60_tmy.csv",
     "fixed_land_area": 9.5465,
@@ -19514,13 +19514,13 @@
     "fluid_dens_outlet_temp": 918.795,
     "fthrctrl": 2.0,
     "fthrok": 1.0,
-    "h_tank_in": 15.0,
-    "h_tank_min": 0.5,
+    "h_tank_in": 12.0,
+    "h_tank_min": 1.0,
     "has_hot_tank_bypass": 0.0,
     "hce_2_is_shown": 1.0,
     "hce_3_is_shown": 1.0,
     "hce_4_is_shown": 1.0,
-    "hot_tank_Thtr": 110.0,
+    "hot_tank_Thtr": 365.0,
     "hot_tank_max_heat": 1.0,
     "hs_phys_N_sub": 100.0,
     "hs_phys_P_steam_hot_des": 4.762,
@@ -37275,11 +37275,11 @@
     "m_dot_htfmin": 1.0,
     "m_dot_htfmin_actual": 1.0,
     "max_collector_width": 6.0,
-    "max_field_flow_velocity": 5.82531,
+    "max_field_flow_velocity": 6.61309,
     "mc_bal_cold": 0.2,
     "mc_bal_hot": 0.2,
     "mc_bal_sca": 4.5,
-    "min_field_flow_velocity": 0.297718,
+    "min_field_flow_velocity": 0.474321,
     "min_inner_diameter": 0.076,
     "mpeak": [
         5000.0,
@@ -37369,7 +37369,7 @@
     "peak_9": 5000.0,
     "prop_tax_assessed_decline": 0.0,
     "prop_tax_cost_assessed_percent": 100.0,
-    "property_assessed_value": 13379400.0,
+    "property_assessed_value": 13674700.0,
     "property_tax_rate": 0.0,
     "ptc_fed_amount_heat_btu": [
         0.0
@@ -37381,7 +37381,7 @@
     ],
     "ptc_sta_escal": 0.0,
     "ptc_sta_term": 10.0,
-    "q_dot_tes_est": 0.0219549,
+    "q_dot_tes_est": 0.0804725,
     "q_pb_design": 5.0,
     "rate_escalation": [
         0.0
@@ -37466,7 +37466,7 @@
     "tanks_in_parallel": 1.0,
     "tc_fill": 7.0,
     "tc_void": 0.25,
-    "tes_avail_vol": 186.024,
+    "tes_avail_vol": 436.418,
     "tes_cyl_piston_loss_poly": [
         0.0,
         0.0,
@@ -37487,7 +37487,7 @@
         ]
     ],
     "tes_n_tsteps": 100.0,
-    "tes_pb_T_charge_min": 290.0,
+    "tes_pb_T_charge_min": 381.0,
     "tes_pb_T_cold_delta": 30.0,
     "tes_pb_T_hot_delta": 30.0,
     "tes_pb_cp_solid": 0.83,
@@ -37503,7 +37503,7 @@
             -1.0
         ]
     ],
-    "thermal_buy_rate_flat_heat_btu": 14.0,
+    "thermal_buy_rate_flat_heat_btu": 14.5,
     "thermal_buy_rate_option": 0.0,
     "thermal_conversion_efficiency": 85.0,
     "thermal_monthly_buy_rate_heat_btu": [
@@ -46298,9 +46298,9 @@
         1.0
     ],
     "total_aperture": 21120.0,
-    "total_direct_cost": 11542900.0,
-    "total_indirect_cost": 1374730.0,
-    "total_installed_cost": 13379400.0,
+    "total_direct_cost": 11799700.0,
+    "total_indirect_cost": 1402980.0,
+    "total_installed_cost": 13674700.0,
     "total_land_area": 10.5011,
     "total_loop_conversion_efficiency": 0.72358,
     "total_required_aperture_for_SM1": 7273.77,
@@ -46324,7 +46324,7 @@
     "tshours": 6.0,
     "tshours_sf": 2.24118,
     "tz": -7.0,
-    "u_tank": 0.3,
+    "u_tank": 0.4,
     "ui_A_aperture": 1320.0,
     "ui_AbsorberMaterial": 0.0,
     "ui_AnnulusGas_1": 2.0,
@@ -46428,8 +46428,8 @@
     "ui_epsilon_4_1": 0.86,
     "ui_epsilon_4_2": 0.86,
     "ui_epsilon_4_3": 1.0,
-    "ui_loan_amount": 8027610.0,
-    "ui_net_capital_cost": 13379400.0,
+    "ui_loan_amount": 8204800.0,
+    "ui_net_capital_cost": 13674700.0,
     "ui_receiver_description": "Schott PTR70 2008",
     "ui_step_minutes": 60.0,
     "ui_wacc": 6.70974,
@@ -65500,7 +65500,7 @@
         300.0,
         300.0
     ],
-    "vol_tank": 192.439,
+    "vol_tank": 476.093,
     "washing_frequency": 12.0,
     "water_usage_per_wash": 0.7,
     "wf_nrecords": 8760.0,
diff --git a/deploy/runtime/defaults/Physical Trough IPH_LCOH Calculator.json b/deploy/runtime/defaults/Physical Trough IPH_LCOH Calculator.json
index 58ef42087..858fa61c0 100644
--- a/deploy/runtime/defaults/Physical Trough IPH_LCOH Calculator.json	
+++ b/deploy/runtime/defaults/Physical Trough IPH_LCOH Calculator.json	
@@ -63,7 +63,7 @@
         2.15,
         2.15
     ],
-    "COPY_field_thermal_output": 13.3211,
+    "COPY_field_thermal_output": 7.92716,
     "COPY_field_thermal_output_ideal": 14.5179,
     "COPY_total_aperture": 21120.0,
     "ColperSCA": [
@@ -419,8 +419,8 @@
         1.0
     ],
     "FIELD_COPY_I_bn_des": 950.0,
-    "FIELD_COPY_T_loop_in_des": 90.0,
-    "FIELD_COPY_T_loop_out": 300.0,
+    "FIELD_COPY_T_loop_in_des": 293.0,
+    "FIELD_COPY_T_loop_out": 391.0,
     "FIELD_COPY_nLoops": 4.0,
     "FIELD_COPY_solar_mult": 2.90358,
     "F_wc": [
@@ -887,16 +887,16 @@
         ]
     ],
     "SolarAz": 0.0,
-    "TES_COPY_T_loop_in_des": 90.0,
-    "TES_COPY_T_loop_out": 300.0,
+    "TES_COPY_T_loop_in_des": 293.0,
+    "TES_COPY_T_loop_out": 391.0,
     "TES_COPY_q_pb_design": 5.0,
     "TES_COPY_tshours": 6.0,
     "TES_DISP_tes_type": 0.0,
-    "T_fp": 10.0,
-    "T_loop_in_des": 90.0,
-    "T_loop_out": 300.0,
-    "T_shutdown": 159.3,
-    "T_startup": 159.3,
+    "T_fp": 150.0,
+    "T_loop_in_des": 293.0,
+    "T_loop_out": 391.0,
+    "T_shutdown": 325.34,
+    "T_startup": 325.34,
     "T_tank_cold_ini": 300.0,
     "T_tank_hot_inlet_min": 400.0,
     "Tau_envelope": [
@@ -1028,7 +1028,7 @@
     "V_hdr_cold_min": 2.0,
     "V_hdr_hot_max": 3.0,
     "V_hdr_hot_min": 2.0,
-    "V_tank_hot_ini": 59.7727,
+    "V_tank_hot_ini": 145.32,
     "V_tes_des": 1.85,
     "W_aperture": [
         8.2,
@@ -1036,7 +1036,7 @@
         6.0,
         6.0
     ],
-    "W_dot_pump_SS": 0.0224465,
+    "W_dot_pump_SS": 0.0748562,
     "accept_init": 0.0,
     "accept_loc": 1.0,
     "accept_mode": 0.0,
@@ -1166,7 +1166,7 @@
     "c_tax_rate": 28.0,
     "calc_design_pipe_vals": 1.0,
     "city": "-",
-    "cold_tank_Thtr": 60.0,
+    "cold_tank_Thtr": 250.0,
     "cold_tank_max_heat": 0.5,
     "collector_library": "SunBeam IPH",
     "collectors_in_field": "Cold - 1 - 1 - 1 - 1 - Hot",
@@ -1178,21 +1178,21 @@
     "csp.dtr.cost.bop": 450000.0,
     "csp.dtr.cost.bop_mwe": 5.0,
     "csp.dtr.cost.bop_per_kwe": 90.0,
-    "csp.dtr.cost.contingency": 755143.0,
+    "csp.dtr.cost.contingency": 771943.0,
     "csp.dtr.cost.contingency_percent": 7.0,
     "csp.dtr.cost.epc.cost_per_watt": 0.0,
     "csp.dtr.cost.epc.fixed": 0.0,
     "csp.dtr.cost.epc.per_acre": 0.0,
     "csp.dtr.cost.epc.per_watt": 0.0,
     "csp.dtr.cost.epc.percent": 11.0,
-    "csp.dtr.cost.epc.total": 1269720.0,
+    "csp.dtr.cost.epc.total": 1297970.0,
     "csp.dtr.cost.heat_sink": 600000.0,
     "csp.dtr.cost.heat_sink.cost_per_kwe": 120.0,
     "csp.dtr.cost.heat_sink.mwe": 5.0,
     "csp.dtr.cost.htf_system": 1267200.0,
     "csp.dtr.cost.htf_system.area": 21120.0,
     "csp.dtr.cost.htf_system.cost_per_m2": 60.0,
-    "csp.dtr.cost.installed_per_capacity": 2675.87,
+    "csp.dtr.cost.installed_per_capacity": 2734.93,
     "csp.dtr.cost.nameplate": 5.0,
     "csp.dtr.cost.plm.fixed": 0.0,
     "csp.dtr.cost.plm.per_acre": 10000.0,
@@ -1200,7 +1200,7 @@
     "csp.dtr.cost.plm.percent": 0.0,
     "csp.dtr.cost.plm.total": 105011.0,
     "csp.dtr.cost.sales_tax.percent": 80.0,
-    "csp.dtr.cost.sales_tax.total": 461716.0,
+    "csp.dtr.cost.sales_tax.total": 471988.0,
     "csp.dtr.cost.sales_tax.value": 5.0,
     "csp.dtr.cost.site_improvements": 337920.0,
     "csp.dtr.cost.site_improvements.area": 21120.0,
@@ -1208,21 +1208,21 @@
     "csp.dtr.cost.solar_field": 6272640.0,
     "csp.dtr.cost.solar_field.area": 21120.0,
     "csp.dtr.cost.solar_field.cost_per_m2": 297.0,
-    "csp.dtr.cost.storage": 1860000.0,
-    "csp.dtr.cost.storage.cost_per_kwht": 62.0,
+    "csp.dtr.cost.storage": 2100000.0,
+    "csp.dtr.cost.storage.cost_per_kwht": 70.0,
     "csp.dtr.cost.storage.mwht": 30.0,
     "csp.dtr.cost.total_land_area": 10.5011,
     "csp.dtr.tes.fluid_sph": 0.0,
-    "csp.dtr.tes.htf_calc_temp": 195.0,
+    "csp.dtr.tes.htf_calc_temp": 342.0,
     "csp.dtr.tes.htf_max_opt_temp": 593.0,
     "csp.dtr.tes.htf_min_opt_temp": 238.0,
-    "csp.dtr.tes.min_fluid_volume": 6.41463,
+    "csp.dtr.tes.min_fluid_volume": 39.6744,
     "csp.dtr.tes.thermal_capacity": 30.0,
     "csp.pt.par.calc.aux": 0.12121,
     "csp.pt.par.calc.bop": 0.0,
-    "csp.pt.tes.htf_density": 1965.98,
-    "csp.pt.tes.tank_diameter": 4.04162,
-    "csp.pt.tes.tank_height": 15.0,
+    "csp.pt.tes.htf_density": 1872.49,
+    "csp.pt.tes.tank_diameter": 7.10739,
+    "csp.pt.tes.tank_height": 12.0,
     "csp_dtr_hce_absorber_material_1": 0.0,
     "csp_dtr_hce_absorber_material_2": 0.0,
     "csp_dtr_hce_absorber_material_3": 0.0,
@@ -1586,9 +1586,9 @@
     "custom_sf_pipe_sizes": 0.0,
     "custom_tes_p_loss": 0.0,
     "custom_tes_pipe_sizes": 0.0,
-    "dP_sf_SS": 5.03184,
+    "dP_sf_SS": 10.1475,
     "d_tank_in": 0.0,
-    "direct_subtotal": 10787800.0,
+    "direct_subtotal": 11027800.0,
     "disp_frequency": 24.0,
     "disp_horizon": 48.0,
     "disp_max_iter": 50000.0,
@@ -1816,9 +1816,9 @@
     ],
     "eta_pump": 0.85,
     "f_htfmax": 1.2,
-    "f_htfmax_actual": 0.917563,
+    "f_htfmax_actual": 0.546026,
     "f_htfmin": 0.25,
-    "f_htfmin_actual": 0.0764636,
+    "f_htfmin_actual": 0.0455022,
     "f_tc_cold": 2.0,
     "f_turb_tou_periods": [
         1.0,
@@ -1932,10 +1932,10 @@
             941.0
         ]
     ],
-    "field_htf_cp_avg": 2.85038,
+    "field_htf_cp_avg": 3.3429,
     "field_htf_max_operating_temp": 400.0,
     "field_htf_min_operating_temp": 12.0,
-    "field_thermal_output": 13.3211,
+    "field_thermal_output": 7.92716,
     "field_thermal_output_ideal": 14.5179,
     "file_name": "tucson_az_32.116521_-110.933042_psmv3_60_tmy.csv",
     "fixed_charge_rate": 0.0690307,
@@ -1945,13 +1945,13 @@
     "fluid_dens_outlet_temp": 918.795,
     "fthrctrl": 2.0,
     "fthrok": 1.0,
-    "h_tank_in": 15.0,
-    "h_tank_min": 0.5,
+    "h_tank_in": 12.0,
+    "h_tank_min": 1.0,
     "has_hot_tank_bypass": 0.0,
     "hce_2_is_shown": 1.0,
     "hce_3_is_shown": 1.0,
     "hce_4_is_shown": 1.0,
-    "hot_tank_Thtr": 110.0,
+    "hot_tank_Thtr": 365.0,
     "hot_tank_max_heat": 1.0,
     "hs_phys_N_sub": 100.0,
     "hs_phys_P_steam_hot_des": 4.762,
@@ -2102,11 +2102,11 @@
     "m_dot_htfmin": 1.0,
     "m_dot_htfmin_actual": 1.0,
     "max_collector_width": 6.0,
-    "max_field_flow_velocity": 5.82531,
+    "max_field_flow_velocity": 6.61309,
     "mc_bal_cold": 0.2,
     "mc_bal_hot": 0.2,
     "mc_bal_sca": 4.5,
-    "min_field_flow_velocity": 0.297718,
+    "min_field_flow_velocity": 0.474321,
     "min_inner_diameter": 0.076,
     "nColt": 4.0,
     "nHCEVar": 4.0,
@@ -2122,7 +2122,7 @@
     "p_start": 0.021,
     "pb_fixed_par": 0.0055,
     "pb_pump_coef": 0.55,
-    "q_dot_tes_est": 0.0219549,
+    "q_dot_tes_est": 0.0804725,
     "q_pb_design": 5.0,
     "rec_qf_delay": 0.25,
     "rec_su_delay": 0.2,
@@ -2196,7 +2196,7 @@
     "tanks_in_parallel": 1.0,
     "tc_fill": 7.0,
     "tc_void": 0.25,
-    "tes_avail_vol": 186.024,
+    "tes_avail_vol": 436.418,
     "tes_cyl_piston_loss_poly": [
         0.0,
         0.0,
@@ -2217,7 +2217,7 @@
         ]
     ],
     "tes_n_tsteps": 100.0,
-    "tes_pb_T_charge_min": 290.0,
+    "tes_pb_T_charge_min": 381.0,
     "tes_pb_T_cold_delta": 30.0,
     "tes_pb_T_hot_delta": 30.0,
     "tes_pb_cp_solid": 0.83,
@@ -11001,9 +11001,9 @@
         1.0
     ],
     "total_aperture": 21120.0,
-    "total_direct_cost": 11542900.0,
-    "total_indirect_cost": 1374730.0,
-    "total_installed_cost": 13379400.0,
+    "total_direct_cost": 11799700.0,
+    "total_indirect_cost": 1402980.0,
+    "total_installed_cost": 13674700.0,
     "total_land_area": 10.5011,
     "total_loop_conversion_efficiency": 0.72358,
     "total_required_aperture_for_SM1": 7273.77,
@@ -11027,7 +11027,7 @@
     "tshours": 6.0,
     "tshours_sf": 2.24118,
     "tz": -7.0,
-    "u_tank": 0.3,
+    "u_tank": 0.4,
     "ui_A_aperture": 1320.0,
     "ui_AbsorberMaterial": 0.0,
     "ui_AnnulusGas_1": 2.0,
@@ -11078,7 +11078,7 @@
     "ui_alpha_env_1": 0.02,
     "ui_alpha_env_2": 0.02,
     "ui_alpha_env_3": 0.0,
-    "ui_capital_cost_reference": 13379400.0,
+    "ui_capital_cost_reference": 13674700.0,
     "ui_cfin": 1.01249,
     "ui_collector_description": " Solar Dynamics SunBeam MT",
     "ui_crf": 0.0641705,
@@ -11156,7 +11156,7 @@
     "use_specific_weather_file": 0.0,
     "user_specified_weather_file": "",
     "variable_operating_cost": 0.002,
-    "vol_tank": 192.439,
+    "vol_tank": 476.093,
     "washing_frequency": 12.0,
     "water_usage_per_wash": 0.7,
     "weekday_schedule": [
diff --git a/deploy/runtime/defaults/Physical Trough IPH_None.json b/deploy/runtime/defaults/Physical Trough IPH_None.json
index 7d4193a58..0b14592f8 100644
--- a/deploy/runtime/defaults/Physical Trough IPH_None.json	
+++ b/deploy/runtime/defaults/Physical Trough IPH_None.json	
@@ -63,7 +63,7 @@
         2.15,
         2.15
     ],
-    "COPY_field_thermal_output": 13.3211,
+    "COPY_field_thermal_output": 7.92716,
     "COPY_field_thermal_output_ideal": 14.5179,
     "COPY_total_aperture": 21120.0,
     "ColperSCA": [
@@ -419,8 +419,8 @@
         1.0
     ],
     "FIELD_COPY_I_bn_des": 950.0,
-    "FIELD_COPY_T_loop_in_des": 90.0,
-    "FIELD_COPY_T_loop_out": 300.0,
+    "FIELD_COPY_T_loop_in_des": 293.0,
+    "FIELD_COPY_T_loop_out": 391.0,
     "FIELD_COPY_nLoops": 4.0,
     "FIELD_COPY_solar_mult": 2.90358,
     "F_wc": [
@@ -887,16 +887,16 @@
         ]
     ],
     "SolarAz": 0.0,
-    "TES_COPY_T_loop_in_des": 90.0,
-    "TES_COPY_T_loop_out": 300.0,
+    "TES_COPY_T_loop_in_des": 293.0,
+    "TES_COPY_T_loop_out": 391.0,
     "TES_COPY_q_pb_design": 5.0,
     "TES_COPY_tshours": 6.0,
     "TES_DISP_tes_type": 0.0,
-    "T_fp": 10.0,
-    "T_loop_in_des": 90.0,
-    "T_loop_out": 300.0,
-    "T_shutdown": 159.3,
-    "T_startup": 159.3,
+    "T_fp": 150.0,
+    "T_loop_in_des": 293.0,
+    "T_loop_out": 391.0,
+    "T_shutdown": 325.34,
+    "T_startup": 325.34,
     "T_tank_cold_ini": 300.0,
     "T_tank_hot_inlet_min": 400.0,
     "Tau_envelope": [
@@ -1028,7 +1028,7 @@
     "V_hdr_cold_min": 2.0,
     "V_hdr_hot_max": 3.0,
     "V_hdr_hot_min": 2.0,
-    "V_tank_hot_ini": 59.7727,
+    "V_tank_hot_ini": 145.32,
     "V_tes_des": 1.85,
     "W_aperture": [
         8.2,
@@ -1036,7 +1036,7 @@
         6.0,
         6.0
     ],
-    "W_dot_pump_SS": 0.0224465,
+    "W_dot_pump_SS": 0.0748562,
     "accept_init": 0.0,
     "accept_loc": 1.0,
     "accept_mode": 0.0,
@@ -1147,7 +1147,7 @@
     "bop_par_f": 1.0,
     "calc_design_pipe_vals": 1.0,
     "city": "-",
-    "cold_tank_Thtr": 60.0,
+    "cold_tank_Thtr": 250.0,
     "cold_tank_max_heat": 0.5,
     "collector_library": "SunBeam IPH",
     "collectors_in_field": "Cold - 1 - 1 - 1 - 1 - Hot",
@@ -1159,21 +1159,21 @@
     "csp.dtr.cost.bop": 450000.0,
     "csp.dtr.cost.bop_mwe": 5.0,
     "csp.dtr.cost.bop_per_kwe": 90.0,
-    "csp.dtr.cost.contingency": 755143.0,
+    "csp.dtr.cost.contingency": 771943.0,
     "csp.dtr.cost.contingency_percent": 7.0,
     "csp.dtr.cost.epc.cost_per_watt": 0.0,
     "csp.dtr.cost.epc.fixed": 0.0,
     "csp.dtr.cost.epc.per_acre": 0.0,
     "csp.dtr.cost.epc.per_watt": 0.0,
     "csp.dtr.cost.epc.percent": 11.0,
-    "csp.dtr.cost.epc.total": 1269720.0,
+    "csp.dtr.cost.epc.total": 1297970.0,
     "csp.dtr.cost.heat_sink": 600000.0,
     "csp.dtr.cost.heat_sink.cost_per_kwe": 120.0,
     "csp.dtr.cost.heat_sink.mwe": 5.0,
     "csp.dtr.cost.htf_system": 1267200.0,
     "csp.dtr.cost.htf_system.area": 21120.0,
     "csp.dtr.cost.htf_system.cost_per_m2": 60.0,
-    "csp.dtr.cost.installed_per_capacity": 2675.87,
+    "csp.dtr.cost.installed_per_capacity": 2734.93,
     "csp.dtr.cost.nameplate": 5.0,
     "csp.dtr.cost.plm.fixed": 0.0,
     "csp.dtr.cost.plm.per_acre": 10000.0,
@@ -1181,7 +1181,7 @@
     "csp.dtr.cost.plm.percent": 0.0,
     "csp.dtr.cost.plm.total": 105011.0,
     "csp.dtr.cost.sales_tax.percent": 80.0,
-    "csp.dtr.cost.sales_tax.total": 461716.0,
+    "csp.dtr.cost.sales_tax.total": 471988.0,
     "csp.dtr.cost.sales_tax.value": 5.0,
     "csp.dtr.cost.site_improvements": 337920.0,
     "csp.dtr.cost.site_improvements.area": 21120.0,
@@ -1189,21 +1189,21 @@
     "csp.dtr.cost.solar_field": 6272640.0,
     "csp.dtr.cost.solar_field.area": 21120.0,
     "csp.dtr.cost.solar_field.cost_per_m2": 297.0,
-    "csp.dtr.cost.storage": 1860000.0,
-    "csp.dtr.cost.storage.cost_per_kwht": 62.0,
+    "csp.dtr.cost.storage": 2100000.0,
+    "csp.dtr.cost.storage.cost_per_kwht": 70.0,
     "csp.dtr.cost.storage.mwht": 30.0,
     "csp.dtr.cost.total_land_area": 10.5011,
     "csp.dtr.tes.fluid_sph": 0.0,
-    "csp.dtr.tes.htf_calc_temp": 195.0,
+    "csp.dtr.tes.htf_calc_temp": 342.0,
     "csp.dtr.tes.htf_max_opt_temp": 593.0,
     "csp.dtr.tes.htf_min_opt_temp": 238.0,
-    "csp.dtr.tes.min_fluid_volume": 6.41463,
+    "csp.dtr.tes.min_fluid_volume": 39.6744,
     "csp.dtr.tes.thermal_capacity": 30.0,
     "csp.pt.par.calc.aux": 0.12121,
     "csp.pt.par.calc.bop": 0.0,
-    "csp.pt.tes.htf_density": 1965.98,
-    "csp.pt.tes.tank_diameter": 4.04162,
-    "csp.pt.tes.tank_height": 15.0,
+    "csp.pt.tes.htf_density": 1872.49,
+    "csp.pt.tes.tank_diameter": 7.10739,
+    "csp.pt.tes.tank_height": 12.0,
     "csp_dtr_hce_absorber_material_1": 0.0,
     "csp_dtr_hce_absorber_material_2": 0.0,
     "csp_dtr_hce_absorber_material_3": 0.0,
@@ -1567,9 +1567,9 @@
     "custom_sf_pipe_sizes": 0.0,
     "custom_tes_p_loss": 0.0,
     "custom_tes_pipe_sizes": 0.0,
-    "dP_sf_SS": 5.03184,
+    "dP_sf_SS": 10.1475,
     "d_tank_in": 0.0,
-    "direct_subtotal": 10787800.0,
+    "direct_subtotal": 11027800.0,
     "disp_frequency": 24.0,
     "disp_horizon": 48.0,
     "disp_max_iter": 50000.0,
@@ -1796,9 +1796,9 @@
     ],
     "eta_pump": 0.85,
     "f_htfmax": 1.2,
-    "f_htfmax_actual": 0.917563,
+    "f_htfmax_actual": 0.546026,
     "f_htfmin": 0.25,
-    "f_htfmin_actual": 0.0764636,
+    "f_htfmin_actual": 0.0455022,
     "f_tc_cold": 2.0,
     "f_turb_tou_periods": [
         1.0,
@@ -1912,10 +1912,10 @@
             941.0
         ]
     ],
-    "field_htf_cp_avg": 2.85038,
+    "field_htf_cp_avg": 3.3429,
     "field_htf_max_operating_temp": 400.0,
     "field_htf_min_operating_temp": 12.0,
-    "field_thermal_output": 13.3211,
+    "field_thermal_output": 7.92716,
     "field_thermal_output_ideal": 14.5179,
     "file_name": "tucson_az_32.116521_-110.933042_psmv3_60_tmy.csv",
     "fixed_land_area": 9.5465,
@@ -1923,13 +1923,13 @@
     "fluid_dens_outlet_temp": 918.795,
     "fthrctrl": 2.0,
     "fthrok": 1.0,
-    "h_tank_in": 15.0,
-    "h_tank_min": 0.5,
+    "h_tank_in": 12.0,
+    "h_tank_min": 1.0,
     "has_hot_tank_bypass": 0.0,
     "hce_2_is_shown": 1.0,
     "hce_3_is_shown": 1.0,
     "hce_4_is_shown": 1.0,
-    "hot_tank_Thtr": 110.0,
+    "hot_tank_Thtr": 365.0,
     "hot_tank_max_heat": 1.0,
     "hs_phys_N_sub": 100.0,
     "hs_phys_P_steam_hot_des": 4.762,
@@ -2080,11 +2080,11 @@
     "m_dot_htfmin": 1.0,
     "m_dot_htfmin_actual": 1.0,
     "max_collector_width": 6.0,
-    "max_field_flow_velocity": 5.82531,
+    "max_field_flow_velocity": 6.61309,
     "mc_bal_cold": 0.2,
     "mc_bal_hot": 0.2,
     "mc_bal_sca": 4.5,
-    "min_field_flow_velocity": 0.297718,
+    "min_field_flow_velocity": 0.474321,
     "min_inner_diameter": 0.076,
     "nColt": 4.0,
     "nHCEVar": 4.0,
@@ -2100,7 +2100,7 @@
     "p_start": 0.021,
     "pb_fixed_par": 0.0055,
     "pb_pump_coef": 0.55,
-    "q_dot_tes_est": 0.0219549,
+    "q_dot_tes_est": 0.0804725,
     "q_pb_design": 5.0,
     "rec_qf_delay": 0.25,
     "rec_su_delay": 0.2,
@@ -2174,7 +2174,7 @@
     "tanks_in_parallel": 1.0,
     "tc_fill": 7.0,
     "tc_void": 0.25,
-    "tes_avail_vol": 186.024,
+    "tes_avail_vol": 436.418,
     "tes_cyl_piston_loss_poly": [
         0.0,
         0.0,
@@ -2195,7 +2195,7 @@
         ]
     ],
     "tes_n_tsteps": 100.0,
-    "tes_pb_T_charge_min": 290.0,
+    "tes_pb_T_charge_min": 381.0,
     "tes_pb_T_cold_delta": 30.0,
     "tes_pb_T_hot_delta": 30.0,
     "tes_pb_cp_solid": 0.83,
@@ -10979,9 +10979,9 @@
         1.0
     ],
     "total_aperture": 21120.0,
-    "total_direct_cost": 11542900.0,
-    "total_indirect_cost": 1374730.0,
-    "total_installed_cost": 13379400.0,
+    "total_direct_cost": 11799700.0,
+    "total_indirect_cost": 1402980.0,
+    "total_installed_cost": 13674700.0,
     "total_land_area": 10.5011,
     "total_loop_conversion_efficiency": 0.72358,
     "total_required_aperture_for_SM1": 7273.77,
@@ -11005,7 +11005,7 @@
     "tshours": 6.0,
     "tshours_sf": 2.24118,
     "tz": -7.0,
-    "u_tank": 0.3,
+    "u_tank": 0.4,
     "ui_A_aperture": 1320.0,
     "ui_AbsorberMaterial": 0.0,
     "ui_AnnulusGas_1": 2.0,
@@ -11123,7 +11123,7 @@
     "use_solar_mult_or_aperture_area": 0.0,
     "use_specific_weather_file": 0.0,
     "user_specified_weather_file": "",
-    "vol_tank": 192.439,
+    "vol_tank": 476.093,
     "washing_frequency": 12.0,
     "water_usage_per_wash": 0.7,
     "weekday_schedule": [
diff --git a/deploy/runtime/defaults/Physical Trough IPH_Single Owner.json b/deploy/runtime/defaults/Physical Trough IPH_Single Owner.json
index 83671aea9..912ea75f1 100644
--- a/deploy/runtime/defaults/Physical Trough IPH_Single Owner.json	
+++ b/deploy/runtime/defaults/Physical Trough IPH_Single Owner.json	
@@ -63,7 +63,7 @@
         2.15,
         2.15
     ],
-    "COPY_field_thermal_output": 13.3211,
+    "COPY_field_thermal_output": 7.92716,
     "COPY_field_thermal_output_ideal": 14.5179,
     "COPY_system_capacity_heat_btu": 17.0607,
     "COPY_total_aperture": 21120.0,
@@ -420,8 +420,8 @@
         1.0
     ],
     "FIELD_COPY_I_bn_des": 950.0,
-    "FIELD_COPY_T_loop_in_des": 90.0,
-    "FIELD_COPY_T_loop_out": 300.0,
+    "FIELD_COPY_T_loop_in_des": 293.0,
+    "FIELD_COPY_T_loop_out": 391.0,
     "FIELD_COPY_nLoops": 4.0,
     "FIELD_COPY_solar_mult": 2.90358,
     "F_wc": [
@@ -888,16 +888,16 @@
         ]
     ],
     "SolarAz": 0.0,
-    "TES_COPY_T_loop_in_des": 90.0,
-    "TES_COPY_T_loop_out": 300.0,
+    "TES_COPY_T_loop_in_des": 293.0,
+    "TES_COPY_T_loop_out": 391.0,
     "TES_COPY_q_pb_design": 5.0,
     "TES_COPY_tshours": 6.0,
     "TES_DISP_tes_type": 0.0,
-    "T_fp": 10.0,
-    "T_loop_in_des": 90.0,
-    "T_loop_out": 300.0,
-    "T_shutdown": 159.3,
-    "T_startup": 159.3,
+    "T_fp": 150.0,
+    "T_loop_in_des": 293.0,
+    "T_loop_out": 391.0,
+    "T_shutdown": 325.34,
+    "T_startup": 325.34,
     "T_tank_cold_ini": 300.0,
     "T_tank_hot_inlet_min": 400.0,
     "Tau_envelope": [
@@ -1029,7 +1029,7 @@
     "V_hdr_cold_min": 2.0,
     "V_hdr_hot_max": 3.0,
     "V_hdr_hot_min": 2.0,
-    "V_tank_hot_ini": 59.7727,
+    "V_tank_hot_ini": 145.32,
     "V_tes_des": 1.85,
     "W_aperture": [
         8.2,
@@ -1037,7 +1037,7 @@
         6.0,
         6.0
     ],
-    "W_dot_pump_SS": 0.0224465,
+    "W_dot_pump_SS": 0.0748562,
     "accept_init": 0.0,
     "accept_loc": 1.0,
     "accept_mode": 0.0,
@@ -1181,7 +1181,7 @@
     "cbi_uti_tax_sta": 1.0,
     "chk_update_peaks": 0.0,
     "city": "-",
-    "cold_tank_Thtr": 60.0,
+    "cold_tank_Thtr": 250.0,
     "cold_tank_max_heat": 0.5,
     "collector_library": "SunBeam IPH",
     "collectors_in_field": "Cold - 1 - 1 - 1 - 1 - Hot",
@@ -1189,7 +1189,7 @@
     "combo_feather": 1.0,
     "combo_htf_type": 3.0,
     "combo_tes_htf_type": 0.0,
-    "const_per_interest1": 869658.0,
+    "const_per_interest1": 888854.0,
     "const_per_interest2": 0.0,
     "const_per_interest3": 0.0,
     "const_per_interest4": 0.0,
@@ -1199,7 +1199,7 @@
     "const_per_interest_rate3": 0.0,
     "const_per_interest_rate4": 0.0,
     "const_per_interest_rate5": 0.0,
-    "const_per_interest_total": 869658.0,
+    "const_per_interest_total": 888854.0,
     "const_per_months1": 24.0,
     "const_per_months2": 0.0,
     "const_per_months3": 0.0,
@@ -1216,13 +1216,13 @@
     "const_per_percent4": 0.0,
     "const_per_percent5": 0.0,
     "const_per_percent_total": 100.0,
-    "const_per_principal1": 13379400.0,
+    "const_per_principal1": 13674700.0,
     "const_per_principal2": 0.0,
     "const_per_principal3": 0.0,
     "const_per_principal4": 0.0,
     "const_per_principal5": 0.0,
-    "const_per_principal_total": 13379400.0,
-    "const_per_total1": 1003450.0,
+    "const_per_principal_total": 13674700.0,
+    "const_per_total1": 1025600.0,
     "const_per_total2": 0.0,
     "const_per_total3": 0.0,
     "const_per_total4": 0.0,
@@ -1232,7 +1232,7 @@
     "const_per_upfront_rate3": 0.0,
     "const_per_upfront_rate4": 0.0,
     "const_per_upfront_rate5": 0.0,
-    "construction_financing_cost": 1003450.0,
+    "construction_financing_cost": 1025600.0,
     "cost_debt_closing": 0.0,
     "cost_debt_fee": 2.75,
     "cost_other_financing": 0.0,
@@ -1240,21 +1240,21 @@
     "csp.dtr.cost.bop": 450000.0,
     "csp.dtr.cost.bop_mwe": 5.0,
     "csp.dtr.cost.bop_per_kwe": 90.0,
-    "csp.dtr.cost.contingency": 755143.0,
+    "csp.dtr.cost.contingency": 771943.0,
     "csp.dtr.cost.contingency_percent": 7.0,
     "csp.dtr.cost.epc.cost_per_watt": 0.0,
     "csp.dtr.cost.epc.fixed": 0.0,
     "csp.dtr.cost.epc.per_acre": 0.0,
     "csp.dtr.cost.epc.per_watt": 0.0,
     "csp.dtr.cost.epc.percent": 11.0,
-    "csp.dtr.cost.epc.total": 1269720.0,
+    "csp.dtr.cost.epc.total": 1297970.0,
     "csp.dtr.cost.heat_sink": 600000.0,
     "csp.dtr.cost.heat_sink.cost_per_kwe": 120.0,
     "csp.dtr.cost.heat_sink.mwe": 5.0,
     "csp.dtr.cost.htf_system": 1267200.0,
     "csp.dtr.cost.htf_system.area": 21120.0,
     "csp.dtr.cost.htf_system.cost_per_m2": 60.0,
-    "csp.dtr.cost.installed_per_capacity": 2675.87,
+    "csp.dtr.cost.installed_per_capacity": 2734.93,
     "csp.dtr.cost.nameplate": 5.0,
     "csp.dtr.cost.plm.fixed": 0.0,
     "csp.dtr.cost.plm.per_acre": 10000.0,
@@ -1262,7 +1262,7 @@
     "csp.dtr.cost.plm.percent": 0.0,
     "csp.dtr.cost.plm.total": 105011.0,
     "csp.dtr.cost.sales_tax.percent": 80.0,
-    "csp.dtr.cost.sales_tax.total": 461716.0,
+    "csp.dtr.cost.sales_tax.total": 471988.0,
     "csp.dtr.cost.sales_tax.value": 5.0,
     "csp.dtr.cost.site_improvements": 337920.0,
     "csp.dtr.cost.site_improvements.area": 21120.0,
@@ -1270,21 +1270,21 @@
     "csp.dtr.cost.solar_field": 6272640.0,
     "csp.dtr.cost.solar_field.area": 21120.0,
     "csp.dtr.cost.solar_field.cost_per_m2": 297.0,
-    "csp.dtr.cost.storage": 1860000.0,
-    "csp.dtr.cost.storage.cost_per_kwht": 62.0,
+    "csp.dtr.cost.storage": 2100000.0,
+    "csp.dtr.cost.storage.cost_per_kwht": 70.0,
     "csp.dtr.cost.storage.mwht": 30.0,
     "csp.dtr.cost.total_land_area": 10.5011,
     "csp.dtr.tes.fluid_sph": 0.0,
-    "csp.dtr.tes.htf_calc_temp": 195.0,
+    "csp.dtr.tes.htf_calc_temp": 342.0,
     "csp.dtr.tes.htf_max_opt_temp": 593.0,
     "csp.dtr.tes.htf_min_opt_temp": 238.0,
-    "csp.dtr.tes.min_fluid_volume": 6.41463,
+    "csp.dtr.tes.min_fluid_volume": 39.6744,
     "csp.dtr.tes.thermal_capacity": 30.0,
     "csp.pt.par.calc.aux": 0.12121,
     "csp.pt.par.calc.bop": 0.0,
-    "csp.pt.tes.htf_density": 1965.98,
-    "csp.pt.tes.tank_diameter": 4.04162,
-    "csp.pt.tes.tank_height": 15.0,
+    "csp.pt.tes.htf_density": 1872.49,
+    "csp.pt.tes.tank_diameter": 7.10739,
+    "csp.pt.tes.tank_height": 12.0,
     "csp_dtr_hce_absorber_material_1": 0.0,
     "csp_dtr_hce_absorber_material_2": 0.0,
     "csp_dtr_hce_absorber_material_3": 0.0,
@@ -1648,7 +1648,7 @@
     "custom_sf_pipe_sizes": 0.0,
     "custom_tes_p_loss": 0.0,
     "custom_tes_pipe_sizes": 0.0,
-    "dP_sf_SS": 5.03184,
+    "dP_sf_SS": 10.1475,
     "d_tank_in": 0.0,
     "debt_message": "",
     "debt_option": 1.0,
@@ -1699,7 +1699,7 @@
     "depr_itc_sta_sl_39": 0.0,
     "depr_itc_sta_sl_5": 0.0,
     "depr_stabas_method": 1.0,
-    "direct_subtotal": 10787800.0,
+    "direct_subtotal": 11027800.0,
     "disp_frequency": 24.0,
     "disp_horizon": 48.0,
     "disp_max_iter": 50000.0,
@@ -1938,9 +1938,9 @@
     "equip_reserve_depr_sta": 0.0,
     "eta_pump": 0.85,
     "f_htfmax": 1.2,
-    "f_htfmax_actual": 0.917563,
+    "f_htfmax_actual": 0.546026,
     "f_htfmin": 0.25,
-    "f_htfmin_actual": 0.0764636,
+    "f_htfmin_actual": 0.0455022,
     "f_tc_cold": 2.0,
     "f_turb_tou_periods": [
         1.0,
@@ -2057,10 +2057,10 @@
             941.0
         ]
     ],
-    "field_htf_cp_avg": 2.85038,
+    "field_htf_cp_avg": 3.3429,
     "field_htf_max_operating_temp": 400.0,
     "field_htf_min_operating_temp": 12.0,
-    "field_thermal_output": 13.3211,
+    "field_thermal_output": 7.92716,
     "field_thermal_output_ideal": 14.5179,
     "file_name": "tucson_az_32.116521_-110.933042_psmv3_60_tmy.csv",
     "fixed_land_area": 9.5465,
@@ -2069,13 +2069,13 @@
     "fluid_dens_outlet_temp": 918.795,
     "fthrctrl": 2.0,
     "fthrok": 1.0,
-    "h_tank_in": 15.0,
-    "h_tank_min": 0.5,
+    "h_tank_in": 12.0,
+    "h_tank_min": 1.0,
     "has_hot_tank_bypass": 0.0,
     "hce_2_is_shown": 1.0,
     "hce_3_is_shown": 1.0,
     "hce_4_is_shown": 1.0,
-    "hot_tank_Thtr": 110.0,
+    "hot_tank_Thtr": 365.0,
     "hot_tank_max_heat": 1.0,
     "hs_phys_N_sub": 100.0,
     "hs_phys_P_steam_hot_des": 4.762,
@@ -2300,7 +2300,7 @@
     "m_dot_htfmin": 1.0,
     "m_dot_htfmin_actual": 1.0,
     "max_collector_width": 6.0,
-    "max_field_flow_velocity": 5.82531,
+    "max_field_flow_velocity": 6.61309,
     "mc_bal_cold": 0.2,
     "mc_bal_hot": 0.2,
     "mc_bal_sca": 4.5,
@@ -2310,7 +2310,7 @@
     "mera_name1": "Replacement Reserve 1",
     "mera_name2": "Replacement Reserve 2",
     "mera_name3": "Replacement Reserve 3",
-    "min_field_flow_velocity": 0.297718,
+    "min_field_flow_velocity": 0.474321,
     "min_inner_diameter": 0.076,
     "months_receivables_reserve": 0.0,
     "months_working_reserve": 6.0,
@@ -2376,12 +2376,12 @@
     "pbi_uti_term": 0.0,
     "ppa_escalation": 1.0,
     "ppa_price_input_heat_btu": [
-        15.0
+        19.0
     ],
     "ppa_soln_mode": 1.0,
     "prop_tax_assessed_decline": 0.0,
     "prop_tax_cost_assessed_percent": 100.0,
-    "property_assessed_value": 13379400.0,
+    "property_assessed_value": 13674700.0,
     "property_tax_rate": 0.0,
     "ptc_fed_amount_heat_btu": [
         0.0
@@ -2393,7 +2393,7 @@
     ],
     "ptc_sta_escal": 0.0,
     "ptc_sta_term": 10.0,
-    "q_dot_tes_est": 0.0219549,
+    "q_dot_tes_est": 0.0804725,
     "q_pb_design": 5.0,
     "rate_escalation": [
         0.0
@@ -2484,7 +2484,7 @@
     "tc_void": 0.25,
     "term_int_rate": 4.0,
     "term_tenor": 18.0,
-    "tes_avail_vol": 186.024,
+    "tes_avail_vol": 436.418,
     "tes_cyl_piston_loss_poly": [
         0.0,
         0.0,
@@ -2505,7 +2505,7 @@
         ]
     ],
     "tes_n_tsteps": 100.0,
-    "tes_pb_T_charge_min": 290.0,
+    "tes_pb_T_charge_min": 381.0,
     "tes_pb_T_cold_delta": 30.0,
     "tes_pb_T_hot_delta": 30.0,
     "tes_pb_cp_solid": 0.83,
@@ -11289,9 +11289,9 @@
         1.0
     ],
     "total_aperture": 21120.0,
-    "total_direct_cost": 11542900.0,
-    "total_indirect_cost": 1374730.0,
-    "total_installed_cost": 13379400.0,
+    "total_direct_cost": 11799700.0,
+    "total_indirect_cost": 1402980.0,
+    "total_installed_cost": 13674700.0,
     "total_land_area": 10.5011,
     "total_loop_conversion_efficiency": 0.72358,
     "total_required_aperture_for_SM1": 7273.77,
@@ -11315,7 +11315,7 @@
     "tshours": 6.0,
     "tshours_sf": 2.24118,
     "tz": -7.0,
-    "u_tank": 0.3,
+    "u_tank": 0.4,
     "ui_A_aperture": 1320.0,
     "ui_AbsorberMaterial": 0.0,
     "ui_AnnulusGas_1": 2.0,
@@ -12868,7 +12868,7 @@
     "use_solar_mult_or_aperture_area": 0.0,
     "use_specific_weather_file": 0.0,
     "user_specified_weather_file": "",
-    "vol_tank": 192.439,
+    "vol_tank": 476.093,
     "washing_frequency": 12.0,
     "water_usage_per_wash": 0.7,
     "weekday_schedule": [
diff --git a/deploy/runtime/spreadsheets/residential_commercial.xlsx b/deploy/runtime/spreadsheets/residential_commercial.xlsx
index 4e9566552..8438f5aa0 100644
Binary files a/deploy/runtime/spreadsheets/residential_commercial.xlsx and b/deploy/runtime/spreadsheets/residential_commercial.xlsx differ
diff --git a/test_results_win64.csv b/test_results_win64.csv
index 3d4034029..273a5e72f 100644
--- a/test_results_win64.csv
+++ b/test_results_win64.csv
@@ -108,10 +108,10 @@ Generic CSP System,None,592360448,NA,NA,; Notice: time 0.00 { Generic solar mode
 MSPT IPH,None,1496956800,NA,NA,; 
 MSPT IPH,LCOH Calculator,1496956800,NA,NA,; 
 MSPT IPH,Single Owner,1550245888,6.26452,6.83681,; 
-Physical Trough IPH,None,22067516,NA,NA,; 
-Physical Trough IPH,LCOH Calculator,22067516,NA,NA,; 
-Physical Trough IPH,Single Owner,22067516,6.75611,5.54336,; 
-Physical Trough IPH,Commercial,22067516,4.66723,NA,; 
+Physical Trough IPH,None,20884994,NA,NA,; 
+Physical Trough IPH,LCOH Calculator,20884994,NA,NA,; 
+Physical Trough IPH,Single Owner,20884994,7.55453,7.02159,; 
+Physical Trough IPH,Commercial,20884994,5.13905,NA,; 
 DSGL IPH,None,10833103,NA,NA,; 
 DSGL IPH,LCOH Calculator,10833103,NA,NA,; 
 DSGL IPH,Single Owner,10833103,5.44917,7.02159,;