diff --git a/rate_design/hp_rates/Justfile b/rate_design/hp_rates/Justfile
index 2a1b73ae..203c6675 100644
--- a/rate_design/hp_rates/Justfile
+++ b/rate_design/hp_rates/Justfile
@@ -13,7 +13,7 @@
 # Tier 1: Identity (set by state wrapper, dispatch, or manual source)
 # =============================================================================
 
-set allow-duplicate-variables
+set allow-duplicate-variables := true
 
 state := env_var_or_default('STATE', '')
 utility := env_var_or_default('UTILITY', '')
diff --git a/rate_design/hp_rates/ny/config/rev_requirement/cenhud_elec_heat_vs_non_elec_heat.yaml b/rate_design/hp_rates/ny/config/rev_requirement/cenhud_elec_heat_vs_non_elec_heat.yaml
index 396ca0b1..dec11f0f 100644
--- a/rate_design/hp_rates/ny/config/rev_requirement/cenhud_elec_heat_vs_non_elec_heat.yaml
+++ b/rate_design/hp_rates/ny/config/rev_requirement/cenhud_elec_heat_vs_non_elec_heat.yaml
@@ -1,93 +1,93 @@
 utility: cenhud
 group_col: heating_type_v2
-source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/cenhud/ny_20260416a_r1-36/20260416_154247_ny_cenhud_run1_up00_precalc__default
+source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/cenhud/ny_20260424_r1-36_ancillary/20260426_053904_ny_cenhud_run1_up00_precalc__default
 total_delivery_revenue_requirement: 418151641.73
 total_delivery_and_supply_revenue_requirement: 646688375.32
 subclass_revenue_requirements:
   delivery:
     percustomer:
       non_electric_heating: 358129539.60407346
-      electric_heating: 60022102.12592653
+      electric_heating: 60022102.12592657
     epmc:
       non_electric_heating: 343994202.85370314
-      electric_heating: 74157438.87629698
+      electric_heating: 74157438.87629697
     volumetric:
       non_electric_heating: 296918685.8159985
       electric_heating: 121232955.91400164
     passthrough:
       non_electric_heating: 307197130.32113546
-      electric_heating: 110954511.40886566
+      electric_heating: 110954511.40886569
   supply:
     passthrough:
-      non_electric_heating: 163060388.15272713
+      non_electric_heating: 163060388.15272707
       electric_heating: 65476345.437273085
     percustomer:
       non_electric_heating: 169020861.18028414
-      electric_heating: 59515872.409716
+      electric_heating: 59515872.409715995
     volumetric:
       non_electric_heating: 159764969.4583534
       electric_heating: 68771764.1316466
 heating_type_breakdown:
   percustomer:
     delivered_fuels:
-      delivery: 208316692.32024446
-      supply: 104112822.92386767
-      total: 312429515.24411213
+      delivery: 208316692.3202445
+      supply: 104112822.92386758
+      total: 312429515.2441121
     electrical_resistance:
-      delivery: 43263272.95735656
+      delivery: 43263272.95735657
       supply: 40802530.42360629
-      total: 84065803.38096285
+      total: 84065803.38096286
     heat_pump:
       delivery: 16758829.168569993
-      supply: 18713341.986109715
-      total: 35472171.15467971
+      supply: 18713341.986109708
+      total: 35472171.1546797
     natgas:
       delivery: 133595872.61715741
-      supply: 57662336.66775088
-      total: 191258209.2849083
+      supply: 57662336.66775094
+      total: 191258209.28490835
     other:
-      delivery: 16216974.666671583
-      supply: 7245701.588665577
-      total: 23462676.25533716
+      delivery: 16216974.666671585
+      supply: 7245701.588665571
+      total: 23462676.255337156
   epmc:
     delivered_fuels:
-      delivery: 215563739.32845712
-      supply: 73648451.00360006
+      delivery: 215563739.3284571
+      supply: 73648451.00360009
       total: 289212190.3320572
     electrical_resistance:
       delivery: 45752677.677387804
       supply: 81671448.7535452
       total: 127424126.430933
     heat_pump:
-      delivery: 28404761.198909156
-      supply: 32867542.545307167
+      delivery: 28404761.198909163
+      supply: 32867542.54530716
       total: 61272303.74421632
     natgas:
       delivery: 113563038.01081619
       supply: 36021672.62870848
       total: 149584710.63952467
     other:
-      delivery: 14867425.514429778
-      supply: 4327618.658839241
-      total: 19195044.17326902
+      delivery: 14867425.51442978
+      supply: 4327618.6588392425
+      total: 19195044.173269022
   volumetric:
     delivered_fuels:
-      delivery: 187374899.85640055
-      supply: 100946146.56644237
-      total: 288321046.4228429
+      delivery: 187374899.85640052
+      supply: 100946146.56644288
+      total: 288321046.4228434
     electrical_resistance:
-      delivery: 82309590.37290454
-      supply: 46706850.71604529
-      total: 129016441.08894983
+      delivery: 82309590.37290455
+      supply: 46706850.716045216
+      total: 129016441.08894977
     heat_pump:
-      delivery: 38923365.541097105
+      delivery: 38923365.54109711
       supply: 22064913.415601373
-      total: 60988278.95669848
+      total: 60988278.956698485
     natgas:
-      delivery: 97035864.77872546
-      supply: 52133979.31013177
-      total: 149169844.08885723
+      delivery: 97035864.77872548
+      supply: 52133979.31013164
+      total: 149169844.0888571
     other:
-      delivery: 12507921.180872414
-      supply: 6684843.581778988
-      total: 19192764.762651403
+      delivery: 12507921.180872416
+      supply: 6684843.581778979
+      total: 19192764.762651395
diff --git a/rate_design/hp_rates/ny/config/rev_requirement/cenhud_hp_vs_nonhp.yaml b/rate_design/hp_rates/ny/config/rev_requirement/cenhud_hp_vs_nonhp.yaml
index 105e2cc3..91d1f9ae 100644
--- a/rate_design/hp_rates/ny/config/rev_requirement/cenhud_hp_vs_nonhp.yaml
+++ b/rate_design/hp_rates/ny/config/rev_requirement/cenhud_hp_vs_nonhp.yaml
@@ -1,91 +1,91 @@
 utility: cenhud
 group_col: has_hp
-source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/cenhud/ny_20260416a_r1-36/20260416_154247_ny_cenhud_run1_up00_precalc__default
+source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/cenhud/ny_20260424_r1-36_ancillary/20260426_053904_ny_cenhud_run1_up00_precalc__default
 total_delivery_revenue_requirement: 418151641.73
 total_delivery_and_supply_revenue_requirement: 646688375.32
 subclass_revenue_requirements:
   delivery:
     percustomer:
-      non-hp: 401392812.56143016
+      non-hp: 401392812.5614301
       hp: 16758829.168569993
     epmc:
       non-hp: 389746880.53109086
-      hp: 28404761.198909156
+      hp: 28404761.198909163
     volumetric:
-      non-hp: 379228276.1889029
+      non-hp: 379228276.188903
       hp: 38923365.54109711
     passthrough:
-      non-hp: 383128700.05550337
+      non-hp: 383128700.0555033
       hp: 35022941.67449789
   supply:
     passthrough:
-      non-hp: 207655314.4622444
-      hp: 20881419.12775468
+      non-hp: 207655314.4622454
+      hp: 20881419.12775469
     percustomer:
-      non-hp: 209823391.6038893
+      non-hp: 209823391.6038903
       hp: 18713341.986109708
     volumetric:
-      non-hp: 206471820.17439872
+      non-hp: 206471820.17439783
       hp: 22064913.415601365
 heating_type_breakdown:
   percustomer:
     delivered_fuels:
-      delivery: 208316692.32024446
-      supply: 104112822.92386761
-      total: 312429515.2441121
+      delivery: 208316692.3202445
+      supply: 104112822.92386764
+      total: 312429515.24411213
     electrical_resistance:
       delivery: 43263272.95735657
       supply: 40802530.42360628
       total: 84065803.38096285
     heat_pump:
-      delivery: 16758829.16856999
-      supply: 18713341.98610971
+      delivery: 16758829.168569986
+      supply: 18713341.986109715
       total: 35472171.1546797
     natgas:
       delivery: 133595872.6171574
-      supply: 57662336.667750955
-      total: 191258209.28490835
+      supply: 57662336.667750895
+      total: 191258209.2849083
     other:
       delivery: 16216974.666671582
-      supply: 7245701.588665582
-      total: 23462676.255337164
+      supply: 7245701.5886655785
+      total: 23462676.25533716
   epmc:
     delivered_fuels:
-      delivery: 215563739.32845712
-      supply: 73648451.0036
+      delivery: 215563739.3284571
+      supply: 73648451.00360003
       total: 289212190.3320571
     electrical_resistance:
-      delivery: 45752677.677387826
+      delivery: 45752677.67738783
       supply: 81671448.75354517
       total: 127424126.430933
     heat_pump:
-      delivery: 28404761.198909163
-      supply: 32867542.545307152
-      total: 61272303.744216315
+      delivery: 28404761.198909156
+      supply: 32867542.545307167
+      total: 61272303.74421632
     natgas:
-      delivery: 113563038.0108162
-      supply: 36021672.62870847
-      total: 149584710.63952467
+      delivery: 113563038.01081619
+      supply: 36021672.62870845
+      total: 149584710.63952464
     other:
-      delivery: 14867425.51442978
-      supply: 4327618.658839239
+      delivery: 14867425.514429776
+      supply: 4327618.6588392425
       total: 19195044.17326902
   volumetric:
     delivered_fuels:
-      delivery: 187374899.85640052
-      supply: 100946146.56644282
+      delivery: 187374899.8564005
+      supply: 100946146.56644285
       total: 288321046.42284334
     electrical_resistance:
       delivery: 82309590.37290454
-      supply: 46706850.71604523
-      total: 129016441.08894977
+      supply: 46706850.71604526
+      total: 129016441.0889498
     heat_pump:
       delivery: 38923365.54109711
-      supply: 22064913.415601373
-      total: 60988278.956698485
+      supply: 22064913.415601358
+      total: 60988278.95669847
     natgas:
-      delivery: 97035864.77872548
-      supply: 52133979.31013167
+      delivery: 97035864.77872549
+      supply: 52133979.310131654
       total: 149169844.08885714
     other:
       delivery: 12507921.180872416
diff --git a/rate_design/hp_rates/ny/config/rev_requirement/coned_elec_heat_vs_non_elec_heat.yaml b/rate_design/hp_rates/ny/config/rev_requirement/coned_elec_heat_vs_non_elec_heat.yaml
index 8189d90f..15ea8bb8 100644
--- a/rate_design/hp_rates/ny/config/rev_requirement/coned_elec_heat_vs_non_elec_heat.yaml
+++ b/rate_design/hp_rates/ny/config/rev_requirement/coned_elec_heat_vs_non_elec_heat.yaml
@@ -1,93 +1,93 @@
 utility: coned
 group_col: heating_type_v2
-source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/coned/ny_20260416a_r1-36/20260416_185305_ny_coned_run1_up00_precalc__default
+source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/coned/ny_20260424_r1-36_ancillary/20260426_065100_ny_coned_run1_up00_precalc__default
 total_delivery_revenue_requirement: 3287782738.4
 total_delivery_and_supply_revenue_requirement: 4894675585.19
 subclass_revenue_requirements:
   delivery:
     percustomer:
-      non_electric_heating: 2888299091.372285
-      electric_heating: 399483647.0277145
+      non_electric_heating: 2888299091.3722844
+      electric_heating: 399483647.0277146
     epmc:
-      non_electric_heating: 2812194899.8079896
+      non_electric_heating: 2812194899.8079886
       electric_heating: 475587838.5920111
     volumetric:
-      non_electric_heating: 2513497145.0289707
-      electric_heating: 774285593.3710291
+      non_electric_heating: 2513497145.0289702
+      electric_heating: 774285593.3710294
     passthrough:
-      non_electric_heating: 2602830279.2916856
-      electric_heating: 684952459.1082449
+      non_electric_heating: 2602830279.2916846
+      electric_heating: 684952459.108245
   supply:
     passthrough:
-      non_electric_heating: 1213570758.6797767
-      electric_heating: 393322088.1102257
+      non_electric_heating: 1213570758.6797752
+      electric_heating: 393322088.11022556
     percustomer:
-      non_electric_heating: 1255737590.5574856
-      electric_heating: 351155256.2325196
+      non_electric_heating: 1255737590.5574837
+      electric_heating: 351155256.2325195
     volumetric:
-      non_electric_heating: 1226832019.9797225
-      electric_heating: 380060826.81028056
+      non_electric_heating: 1226832019.979721
+      electric_heating: 380060826.8102803
 heating_type_breakdown:
   percustomer:
     delivered_fuels:
-      delivery: 669663690.0944506
-      supply: 275562827.276436
-      total: 945226517.3708866
+      delivery: 669663690.0944502
+      supply: 275562827.2764368
+      total: 945226517.370887
     electrical_resistance:
       delivery: 320445856.848802
-      supply: 288724924.4903424
-      total: 609170781.3391443
+      supply: 288724924.490343
+      total: 609170781.339145
     heat_pump:
-      delivery: 79037790.17891255
-      supply: 62430331.742176384
-      total: 141468121.92108893
+      delivery: 79037790.17891258
+      supply: 62430331.742176324
+      total: 141468121.9210889
     natgas:
-      delivery: 2131074770.7751138
-      supply: 947057424.748255
-      total: 3078132195.523369
+      delivery: 2131074770.7751124
+      supply: 947057424.7482603
+      total: 3078132195.5233727
     other:
-      delivery: 87560630.50272052
-      supply: 33117338.53278455
-      total: 120677969.03550507
+      delivery: 87560630.5027205
+      supply: 33117338.53278458
+      total: 120677969.03550509
   epmc:
     delivered_fuels:
-      delivery: 599850308.7098999
-      supply: 218135925.9179163
-      total: 817986234.6278162
+      delivery: 599850308.7098995
+      supply: 218135925.9179182
+      total: 817986234.6278177
     electrical_resistance:
       delivery: 371629210.7580286
-      supply: 543966827.9872413
-      total: 915596038.7452699
+      supply: 543966827.9872407
+      total: 915596038.7452693
     heat_pump:
-      delivery: 103958627.8339826
-      supply: 95001161.12761663
+      delivery: 103958627.83398265
+      supply: 95001161.12761658
       total: 198959788.96159923
     natgas:
-      delivery: 2144174311.2538214
-      supply: 722005439.4544945
-      total: 2866179750.708316
+      delivery: 2144174311.2538195
+      supply: 722005439.4544859
+      total: 2866179750.7083054
     other:
       delivery: 68170279.84426926
-      supply: 27783492.302731723
-      total: 95953772.14700098
+      supply: 27783492.302731693
+      total: 95953772.14700095
   volumetric:
     delivered_fuels:
-      delivery: 544646306.8154904
-      supply: 265921204.9981296
-      total: 810567511.81362
+      delivery: 544646306.815491
+      supply: 265921204.9981277
+      total: 810567511.8136187
     electrical_resistance:
-      delivery: 638800740.7603828
-      supply: 313277170.4310621
-      total: 952077911.1914449
+      delivery: 638800740.7603837
+      supply: 313277170.43106234
+      total: 952077911.1914461
     heat_pump:
-      delivery: 135484852.61064553
-      supply: 66783656.37921876
+      delivery: 135484852.61064562
+      supply: 66783656.37921867
       total: 202268508.9898643
     natgas:
-      delivery: 1904532642.97288
-      supply: 929585985.4243302
-      total: 2834118628.39721
+      delivery: 1904532642.9728768
+      supply: 929585985.424341
+      total: 2834118628.3972178
     other:
       delivery: 64318195.2406036
-      supply: 31324829.55725015
-      total: 95643024.79785375
+      supply: 31324829.557250135
+      total: 95643024.79785374
diff --git a/rate_design/hp_rates/ny/config/rev_requirement/coned_hp_vs_nonhp.yaml b/rate_design/hp_rates/ny/config/rev_requirement/coned_hp_vs_nonhp.yaml
index 142b6a8f..ac60484d 100644
--- a/rate_design/hp_rates/ny/config/rev_requirement/coned_hp_vs_nonhp.yaml
+++ b/rate_design/hp_rates/ny/config/rev_requirement/coned_hp_vs_nonhp.yaml
@@ -1,93 +1,93 @@
 utility: coned
 group_col: has_hp
-source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/coned/ny_20260416a_r1-36/20260416_185305_ny_coned_run1_up00_precalc__default
+source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/coned/ny_20260424_r1-36_ancillary/20260426_065100_ny_coned_run1_up00_precalc__default
 total_delivery_revenue_requirement: 3287782738.4
 total_delivery_and_supply_revenue_requirement: 4894675585.19
 subclass_revenue_requirements:
   delivery:
     percustomer:
-      non-hp: 3208744948.2210884
-      hp: 79037790.17891258
+      non-hp: 3208744948.221088
+      hp: 79037790.17891255
     epmc:
-      non-hp: 3183824110.566017
-      hp: 103958627.83398263
+      non-hp: 3183824110.566018
+      hp: 103958627.83398253
     volumetric:
-      non-hp: 3152297885.7893553
+      non-hp: 3152297885.7893524
       hp: 135484852.6106456
     passthrough:
-      non-hp: 3165595031.589577
-      hp: 122187706.81035446
+      non-hp: 3165595031.5895767
+      hp: 122187706.81035444
   supply:
     passthrough:
-      non-hp: 1538974919.440805
-      hp: 67917927.34919392
+      non-hp: 1538974919.440795
+      hp: 67917927.34919393
     percustomer:
-      non-hp: 1544462515.0478249
-      hp: 62430331.742176294
+      non-hp: 1544462515.0478148
+      hp: 62430331.742176324
     volumetric:
-      non-hp: 1540109190.410778
+      non-hp: 1540109190.410799
       hp: 66783656.3792187
 heating_type_breakdown:
   percustomer:
     delivered_fuels:
-      delivery: 669663690.0944507
-      supply: 275562827.27643657
-      total: 945226517.3708873
+      delivery: 669663690.0944504
+      supply: 275562827.27643645
+      total: 945226517.3708868
     electrical_resistance:
       delivery: 320445856.8488019
-      supply: 288724924.4903433
-      total: 609170781.3391452
+      supply: 288724924.4903434
+      total: 609170781.3391453
     heat_pump:
       delivery: 79037790.17891258
       supply: 62430331.742176324
       total: 141468121.9210889
     natgas:
-      delivery: 2131074770.7751145
-      supply: 947057424.7482591
-      total: 3078132195.5233736
+      delivery: 2131074770.775113
+      supply: 947057424.7482586
+      total: 3078132195.5233717
     other:
       delivery: 87560630.50272052
-      supply: 33117338.532784566
-      total: 120677969.03550509
+      supply: 33117338.532784596
+      total: 120677969.03550512
   epmc:
     delivered_fuels:
-      delivery: 599850308.7098993
-      supply: 218135925.917917
-      total: 817986234.6278163
+      delivery: 599850308.7098992
+      supply: 218135925.91791677
+      total: 817986234.627816
     electrical_resistance:
-      delivery: 371629210.7580284
-      supply: 543966827.9872411
-      total: 915596038.7452695
+      delivery: 371629210.7580289
+      supply: 543966827.987241
+      total: 915596038.74527
     heat_pump:
       delivery: 103958627.83398263
-      supply: 95001161.12761666
-      total: 198959788.9615993
+      supply: 95001161.1276166
+      total: 198959788.96159923
     natgas:
-      delivery: 2144174311.2538204
-      supply: 722005439.4544926
-      total: 2866179750.708313
+      delivery: 2144174311.253818
+      supply: 722005439.4545045
+      total: 2866179750.7083225
     other:
-      delivery: 68170279.84426926
-      supply: 27783492.302731723
-      total: 95953772.14700098
+      delivery: 68170279.84426925
+      supply: 27783492.302731767
+      total: 95953772.14700101
   volumetric:
     delivered_fuels:
-      delivery: 544646306.8154907
-      supply: 265921204.99812794
-      total: 810567511.8136187
+      delivery: 544646306.8154901
+      supply: 265921204.99812877
+      total: 810567511.8136189
     electrical_resistance:
-      delivery: 638800740.7603834
-      supply: 313277170.4310621
-      total: 952077911.1914455
+      delivery: 638800740.7603837
+      supply: 313277170.43106186
+      total: 952077911.1914456
     heat_pump:
-      delivery: 135484852.61064562
-      supply: 66783656.37921861
+      delivery: 135484852.61064556
+      supply: 66783656.37921867
       total: 202268508.98986423
     natgas:
-      delivery: 1904532642.9728782
-      supply: 929585985.4243386
-      total: 2834118628.397217
+      delivery: 1904532642.9728725
+      supply: 929585985.4243429
+      total: 2834118628.3972154
     other:
-      delivery: 64318195.24060362
-      supply: 31324829.55725009
-      total: 95643024.79785371
+      delivery: 64318195.2406036
+      supply: 31324829.55725012
+      total: 95643024.79785372
diff --git a/rate_design/hp_rates/ny/config/rev_requirement/nimo_elec_heat_vs_non_elec_heat.yaml b/rate_design/hp_rates/ny/config/rev_requirement/nimo_elec_heat_vs_non_elec_heat.yaml
index 16fd7c01..ef2f1f03 100644
--- a/rate_design/hp_rates/ny/config/rev_requirement/nimo_elec_heat_vs_non_elec_heat.yaml
+++ b/rate_design/hp_rates/ny/config/rev_requirement/nimo_elec_heat_vs_non_elec_heat.yaml
@@ -1,53 +1,53 @@
 utility: nimo
 group_col: heating_type_v2
-source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/nimo/ny_20260416a_r1-36/20260416_170911_ny_nimo_run1_up00_precalc__default
+source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/nimo/ny_20260424_r1-36_ancillary/20260426_124442_ny_nimo_run1_up00_precalc__default
 total_delivery_revenue_requirement: 1419812826.56
 total_delivery_and_supply_revenue_requirement: 2572877123.2
 subclass_revenue_requirements:
   delivery:
     percustomer:
       non_electric_heating: 1225938695.4192746
-      electric_heating: 193874131.14072606
+      electric_heating: 193874131.14072603
     epmc:
       non_electric_heating: 1168933004.6336038
-      electric_heating: 250879821.92639595
+      electric_heating: 250879821.92639592
     volumetric:
-      non_electric_heating: 1001356399.9467068
-      electric_heating: 418456426.61329347
+      non_electric_heating: 1001356399.946706
+      electric_heating: 418456426.6132935
     passthrough:
-      non_electric_heating: 1049738882.7621092
+      non_electric_heating: 1049738882.762109
       electric_heating: 370073943.79785514
   supply:
     passthrough:
-      non_electric_heating: 819194966.4110454
+      non_electric_heating: 819194966.4110456
       electric_heating: 333869330.2289535
     percustomer:
-      non_electric_heating: 859528896.6054616
-      electric_heating: 293535400.0345384
+      non_electric_heating: 859528896.6054614
+      electric_heating: 293535400.0345386
     volumetric:
-      non_electric_heating: 806655766.6231625
-      electric_heating: 346408530.01683754
+      non_electric_heating: 806655766.6231618
+      electric_heating: 346408530.01683724
 heating_type_breakdown:
   percustomer:
     delivered_fuels:
       delivery: 268515154.26083004
-      supply: 209034733.671077
-      total: 477549887.93190706
+      supply: 209034733.67107695
+      total: 477549887.931907
     electrical_resistance:
       delivery: 145441267.24542624
-      supply: 217514258.29921597
-      total: 362955525.5446422
+      supply: 217514258.2992162
+      total: 362955525.54464245
     heat_pump:
-      delivery: 48432863.895299755
-      supply: 76021141.73532245
-      total: 124454005.63062221
+      delivery: 48432863.89529977
+      supply: 76021141.73532239
+      total: 124454005.63062215
     natgas:
-      delivery: 876607000.6562673
-      supply: 588601433.3974208
-      total: 1465208434.053688
+      delivery: 876607000.6562674
+      supply: 588601433.3974216
+      total: 1465208434.053689
     other:
-      delivery: 80816540.50217743
-      supply: 61892729.53696288
+      delivery: 80816540.50217739
+      supply: 61892729.53696293
       total: 142709270.0391403
   epmc:
     delivered_fuels:
@@ -55,39 +55,39 @@ heating_type_breakdown:
       supply: 167695745.34276044
       total: 461084338.74664
     electrical_resistance:
-      delivery: 173909734.33097553
-      supply: 391739943.50386024
+      delivery: 173909734.33097565
+      supply: 391739943.5038601
       total: 565649677.8348358
     heat_pump:
-      delivery: 76970087.5954204
-      supply: 123581363.56642972
+      delivery: 76970087.59542039
+      supply: 123581363.56642973
       total: 200551451.16185012
     natgas:
-      delivery: 788844172.784869
-      supply: 421170550.1775212
-      total: 1210014722.9623902
+      delivery: 788844172.7848697
+      supply: 421170550.1775217
+      total: 1210014722.9623914
     other:
-      delivery: 86700238.44485526
-      supply: 48876694.049428
+      delivery: 86700238.44485524
+      supply: 48876694.049428016
       total: 135576932.49428326
   volumetric:
     delivered_fuels:
-      delivery: 254759388.80865157
-      supply: 205796230.9510445
-      total: 460555619.75969607
+      delivery: 254759388.80865154
+      supply: 205796230.95104435
+      total: 460555619.7596959
     electrical_resistance:
-      delivery: 310320399.2309134
-      supply: 256331546.89488864
-      total: 566651946.125802
+      delivery: 310320399.23091346
+      supply: 256331546.89488882
+      total: 566651946.1258023
     heat_pump:
       delivery: 108136027.38238008
-      supply: 90076983.12194873
-      total: 198213010.50432882
+      supply: 90076983.1219488
+      total: 198213010.50432888
     natgas:
-      delivery: 671246293.3358425
-      supply: 540253617.9627177
+      delivery: 671246293.3358423
+      supply: 540253617.9627179
       total: 1211499911.2985601
     other:
-      delivery: 75350717.80221269
-      supply: 60605917.70939946
+      delivery: 75350717.8022127
+      supply: 60605917.70939945
       total: 135956635.51161215
diff --git a/rate_design/hp_rates/ny/config/rev_requirement/nimo_hp_vs_nonhp.yaml b/rate_design/hp_rates/ny/config/rev_requirement/nimo_hp_vs_nonhp.yaml
index 3bd7475c..1a9513d2 100644
--- a/rate_design/hp_rates/ny/config/rev_requirement/nimo_hp_vs_nonhp.yaml
+++ b/rate_design/hp_rates/ny/config/rev_requirement/nimo_hp_vs_nonhp.yaml
@@ -1,93 +1,93 @@
 utility: nimo
 group_col: has_hp
-source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/nimo/ny_20260416a_r1-36/20260416_170911_ny_nimo_run1_up00_precalc__default
+source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/nimo/ny_20260424_r1-36_ancillary/20260426_124442_ny_nimo_run1_up00_precalc__default
 total_delivery_revenue_requirement: 1419812826.56
 total_delivery_and_supply_revenue_requirement: 2572877123.2
 subclass_revenue_requirements:
   delivery:
     percustomer:
-      non-hp: 1371379962.6647005
+      non-hp: 1371379962.6647007
       hp: 48432863.89529975
     epmc:
-      non-hp: 1342842738.964579
-      hp: 76970087.59542039
+      non-hp: 1342842738.9645796
+      hp: 76970087.59542042
     volumetric:
-      non-hp: 1311676799.1776195
-      hp: 108136027.3823801
+      non-hp: 1311676799.17762
+      hp: 108136027.38238011
     passthrough:
-      non-hp: 1324995597.7432485
-      hp: 94817228.81671539
+      non-hp: 1324995597.7432487
+      hp: 94817228.8167154
   supply:
     passthrough:
-      non-hp: 1066158769.432982
-      hp: 86905527.20701441
+      non-hp: 1066158769.4329813
+      hp: 86905527.20701443
     percustomer:
-      non-hp: 1077043154.904675
-      hp: 76021141.73532239
+      non-hp: 1077043154.9046743
+      hp: 76021141.73532242
     volumetric:
-      non-hp: 1062987313.5180421
-      hp: 90076983.12194863
+      non-hp: 1062987313.5180411
+      hp: 90076983.12194858
 heating_type_breakdown:
   percustomer:
     delivered_fuels:
       delivery: 268515154.26083004
-      supply: 209034733.67107725
-      total: 477549887.9319073
+      supply: 209034733.6710769
+      total: 477549887.93190694
     electrical_resistance:
       delivery: 145441267.2454263
-      supply: 217514258.29921585
-      total: 362955525.54464215
+      supply: 217514258.2992162
+      total: 362955525.5446425
     heat_pump:
-      delivery: 48432863.89529975
-      supply: 76021141.7353225
-      total: 124454005.63062225
+      delivery: 48432863.895299755
+      supply: 76021141.73532248
+      total: 124454005.63062224
     natgas:
-      delivery: 876607000.6562667
-      supply: 588601433.3974226
-      total: 1465208434.0536892
+      delivery: 876607000.6562668
+      supply: 588601433.3974222
+      total: 1465208434.053689
     other:
       delivery: 80816540.50217742
-      supply: 61892729.53696284
-      total: 142709270.03914025
+      supply: 61892729.5369629
+      total: 142709270.0391403
   epmc:
     delivered_fuels:
-      delivery: 293388593.40387964
-      supply: 167695745.34276038
-      total: 461084338.74664
+      delivery: 293388593.40387976
+      supply: 167695745.34276044
+      total: 461084338.7466402
     electrical_resistance:
-      delivery: 173909734.33097562
-      supply: 391739943.50386
+      delivery: 173909734.33097547
+      supply: 391739943.5038602
       total: 565649677.8348356
     heat_pump:
-      delivery: 76970087.59542042
-      supply: 123581363.5664297
-      total: 200551451.16185012
+      delivery: 76970087.5954204
+      supply: 123581363.56642975
+      total: 200551451.16185015
     natgas:
       delivery: 788844172.7848693
-      supply: 421170550.1775218
-      total: 1210014722.9623911
+      supply: 421170550.17752206
+      total: 1210014722.9623914
     other:
-      delivery: 86700238.44485529
-      supply: 48876694.04942797
+      delivery: 86700238.4448553
+      supply: 48876694.04942796
       total: 135576932.49428326
   volumetric:
     delivered_fuels:
-      delivery: 254759388.80865148
-      supply: 205796230.95104465
+      delivery: 254759388.80865157
+      supply: 205796230.95104456
       total: 460555619.7596961
     electrical_resistance:
-      delivery: 310320399.2309134
-      supply: 256331546.89488876
+      delivery: 310320399.23091334
+      supply: 256331546.89488882
       total: 566651946.1258022
     heat_pump:
-      delivery: 108136027.3823801
-      supply: 90076983.12194872
-      total: 198213010.50432882
+      delivery: 108136027.38238013
+      supply: 90076983.12194866
+      total: 198213010.5043288
     natgas:
-      delivery: 671246293.335842
-      supply: 540253617.9627186
-      total: 1211499911.2985606
+      delivery: 671246293.3358425
+      supply: 540253617.9627179
+      total: 1211499911.2985604
     other:
-      delivery: 75350717.80221269
-      supply: 60605917.70939949
-      total: 135956635.51161218
+      delivery: 75350717.80221267
+      supply: 60605917.70939948
+      total: 135956635.51161215
diff --git a/rate_design/hp_rates/ny/config/rev_requirement/nyseg_elec_heat_vs_non_elec_heat.yaml b/rate_design/hp_rates/ny/config/rev_requirement/nyseg_elec_heat_vs_non_elec_heat.yaml
index d1a7a788..dfb6c0bf 100644
--- a/rate_design/hp_rates/ny/config/rev_requirement/nyseg_elec_heat_vs_non_elec_heat.yaml
+++ b/rate_design/hp_rates/ny/config/rev_requirement/nyseg_elec_heat_vs_non_elec_heat.yaml
@@ -1,93 +1,93 @@
 utility: nyseg
 group_col: heating_type_v2
-source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/nyseg/ny_20260416a_r1-36/20260416_143815_ny_nyseg_run1_up00_precalc__default
+source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/nyseg/ny_20260424_r1-36_ancillary/20260426_135500_ny_nyseg_run1_up00_precalc__default
 total_delivery_revenue_requirement: 913708327.54
 total_delivery_and_supply_revenue_requirement: 1617781931.62
 subclass_revenue_requirements:
   delivery:
     percustomer:
-      non_electric_heating: 793858074.4539466
-      electric_heating: 119850253.08605364
+      non_electric_heating: 793858074.4539467
+      electric_heating: 119850253.0860536
     epmc:
       non_electric_heating: 747874547.5904777
-      electric_heating: 165833779.94952253
+      electric_heating: 165833779.94952247
     volumetric:
-      non_electric_heating: 636573257.992327
+      non_electric_heating: 636573257.9923273
       electric_heating: 277135069.54767287
     passthrough:
       non_electric_heating: 673898697.5988866
-      electric_heating: 239809629.94112736
+      electric_heating: 239809629.9411273
   supply:
     passthrough:
-      non_electric_heating: 480654188.2272655
-      electric_heating: 223419415.85273528
+      non_electric_heating: 480654188.22726524
+      electric_heating: 223419415.85273534
     percustomer:
-      non_electric_heating: 532035550.9585285
-      electric_heating: 172038053.12147132
+      non_electric_heating: 532035550.9585284
+      electric_heating: 172038053.1214714
     volumetric:
-      non_electric_heating: 487363470.7988999
-      electric_heating: 216710133.28109992
+      non_electric_heating: 487363470.79889953
+      electric_heating: 216710133.28110003
 heating_type_breakdown:
   percustomer:
     delivered_fuels:
-      delivery: 291113109.98147327
-      supply: 203868081.5819444
-      total: 494981191.5634177
+      delivery: 291113109.98147345
+      supply: 203868081.58194363
+      total: 494981191.5634171
     electrical_resistance:
-      delivery: 88310044.41997764
-      supply: 128482779.15482154
-      total: 216792823.57479918
+      delivery: 88310044.41997775
+      supply: 128482779.15482208
+      total: 216792823.57479984
     heat_pump:
       delivery: 31540208.666075975
-      supply: 43555273.96664977
-      total: 75095482.63272575
+      supply: 43555273.9666498
+      total: 75095482.63272578
     natgas:
-      delivery: 422185154.10833204
-      supply: 274318133.42256117
-      total: 696503287.5308932
+      delivery: 422185154.1083316
+      supply: 274318133.4225629
+      total: 696503287.5308945
     other:
-      delivery: 80559810.36414178
-      supply: 53849335.954022184
-      total: 134409146.31816396
+      delivery: 80559810.36414173
+      supply: 53849335.95402226
+      total: 134409146.318164
   epmc:
     delivered_fuels:
       delivery: 292787053.7497347
       supply: 151302656.2981643
       total: 444089710.047899
     electrical_resistance:
-      delivery: 117252432.06653896
-      supply: 252298820.84439096
-      total: 369551252.9109299
+      delivery: 117252432.06653906
+      supply: 252298820.84439093
+      total: 369551252.91093
     heat_pump:
       delivery: 48581347.882983565
-      supply: 75728311.49867207
-      total: 124309659.38165563
+      supply: 75728311.49867208
+      total: 124309659.38165565
     natgas:
-      delivery: 380197622.7532775
-      supply: 186143076.441603
-      total: 566340699.1948805
+      delivery: 380197622.75327796
+      supply: 186143076.44160265
+      total: 566340699.1948806
     other:
-      delivery: 74889871.08746526
-      supply: 38600738.997169465
-      total: 113490610.08463472
+      delivery: 74889871.0874653
+      supply: 38600738.997169435
+      total: 113490610.08463474
   volumetric:
     delivered_fuels:
-      delivery: 251456583.61920696
-      supply: 192604823.21816027
-      total: 444061406.83736724
+      delivery: 251456583.61920694
+      supply: 192604823.21816006
+      total: 444061406.837367
     electrical_resistance:
-      delivery: 208576332.7214761
-      supply: 162640845.9814218
-      total: 371217178.7028979
+      delivery: 208576332.72147626
+      supply: 162640845.98142177
+      total: 371217178.702898
     heat_pump:
       delivery: 68558736.82619676
-      supply: 54069287.2996781
-      total: 122628024.12587486
+      supply: 54069287.29967809
+      total: 122628024.12587485
     natgas:
-      delivery: 320587997.5823129
-      supply: 245462478.93268198
-      total: 566050476.5149949
+      delivery: 320587997.58231294
+      supply: 245462478.93268216
+      total: 566050476.5149951
     other:
-      delivery: 64528676.7908072
+      delivery: 64528676.79080717
       supply: 49296168.648057476
-      total: 113824845.43886468
+      total: 113824845.43886465
diff --git a/rate_design/hp_rates/ny/config/rev_requirement/nyseg_hp_vs_nonhp.yaml b/rate_design/hp_rates/ny/config/rev_requirement/nyseg_hp_vs_nonhp.yaml
index 5287313c..ef87062f 100644
--- a/rate_design/hp_rates/ny/config/rev_requirement/nyseg_hp_vs_nonhp.yaml
+++ b/rate_design/hp_rates/ny/config/rev_requirement/nyseg_hp_vs_nonhp.yaml
@@ -1,93 +1,93 @@
 utility: nyseg
 group_col: has_hp
-source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/nyseg/ny_20260416a_r1-36/20260416_143815_ny_nyseg_run1_up00_precalc__default
+source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/nyseg/ny_20260424_r1-36_ancillary/20260426_135500_ny_nyseg_run1_up00_precalc__default
 total_delivery_revenue_requirement: 913708327.54
 total_delivery_and_supply_revenue_requirement: 1617781931.62
 subclass_revenue_requirements:
   delivery:
     percustomer:
-      non-hp: 882168118.8739246
-      hp: 31540208.666075964
+      non-hp: 882168118.8739244
+      hp: 31540208.66607597
     epmc:
-      non-hp: 865126979.6570164
-      hp: 48581347.88298356
+      non-hp: 865126979.6570163
+      hp: 48581347.882983565
     volumetric:
-      non-hp: 845149590.7138032
+      non-hp: 845149590.713803
       hp: 68558736.82619676
     passthrough:
-      non-hp: 853832084.4134887
-      hp: 59876243.126525365
+      non-hp: 853832084.4134885
+      hp: 59876243.12652538
   supply:
     passthrough:
-      non-hp: 649492087.4598595
-      hp: 54581516.62014074
+      non-hp: 649492087.45986
+      hp: 54581516.62014075
     percustomer:
-      non-hp: 660518330.1133498
-      hp: 43555273.966649756
+      non-hp: 660518330.1133503
+      hp: 43555273.96664977
     volumetric:
-      non-hp: 650004316.780321
+      non-hp: 650004316.7803221
       hp: 54069287.29967809
 heating_type_breakdown:
   percustomer:
     delivered_fuels:
-      delivery: 291113109.9814733
-      supply: 203868081.5819443
+      delivery: 291113109.9814734
+      supply: 203868081.58194423
       total: 494981191.5634176
     electrical_resistance:
-      delivery: 88310044.41997766
-      supply: 128482779.1548217
-      total: 216792823.57479936
+      delivery: 88310044.4199777
+      supply: 128482779.15482163
+      total: 216792823.57479933
     heat_pump:
       delivery: 31540208.666075975
-      supply: 43555273.96664974
-      total: 75095482.63272572
+      supply: 43555273.966649726
+      total: 75095482.6327257
     natgas:
-      delivery: 422185154.10833174
+      delivery: 422185154.1083316
       supply: 274318133.4225616
-      total: 696503287.5308933
+      total: 696503287.5308932
     other:
-      delivery: 80559810.36414175
-      supply: 53849335.95402224
+      delivery: 80559810.36414178
+      supply: 53849335.954022214
       total: 134409146.318164
   epmc:
     delivered_fuels:
-      delivery: 292787053.74973476
-      supply: 151302656.29816365
-      total: 444089710.0478984
+      delivery: 292787053.7497347
+      supply: 151302656.29816383
+      total: 444089710.04789853
     electrical_resistance:
-      delivery: 117252432.06653897
-      supply: 252298820.84439117
-      total: 369551252.91093016
+      delivery: 117252432.06653893
+      supply: 252298820.8443914
+      total: 369551252.91093034
     heat_pump:
       delivery: 48581347.882983565
-      supply: 75728311.49867214
-      total: 124309659.38165571
+      supply: 75728311.49867213
+      total: 124309659.3816557
     natgas:
-      delivery: 380197622.7532776
-      supply: 186143076.4416042
-      total: 566340699.1948818
+      delivery: 380197622.7532774
+      supply: 186143076.44160426
+      total: 566340699.1948817
     other:
-      delivery: 74889871.08746529
-      supply: 38600738.99716936
-      total: 113490610.08463465
+      delivery: 74889871.08746527
+      supply: 38600738.99716939
+      total: 113490610.08463466
   volumetric:
     delivered_fuels:
-      delivery: 251456583.61920702
-      supply: 192604823.21816027
-      total: 444061406.8373673
+      delivery: 251456583.61920682
+      supply: 192604823.2181603
+      total: 444061406.8373671
     electrical_resistance:
-      delivery: 208576332.72147626
-      supply: 162640845.98142165
+      delivery: 208576332.7214761
+      supply: 162640845.9814218
       total: 371217178.7028979
     heat_pump:
       delivery: 68558736.82619676
-      supply: 54069287.29967812
-      total: 122628024.12587488
+      supply: 54069287.2996781
+      total: 122628024.12587486
     natgas:
-      delivery: 320587997.58231264
-      supply: 245462478.93268186
-      total: 566050476.5149945
+      delivery: 320587997.582313
+      supply: 245462478.93268174
+      total: 566050476.5149947
     other:
-      delivery: 64528676.7908072
+      delivery: 64528676.79080719
       supply: 49296168.64805746
-      total: 113824845.43886466
+      total: 113824845.43886465
diff --git a/rate_design/hp_rates/ny/config/rev_requirement/or_elec_heat_vs_non_elec_heat.yaml b/rate_design/hp_rates/ny/config/rev_requirement/or_elec_heat_vs_non_elec_heat.yaml
index b9b7f267..3392ad24 100644
--- a/rate_design/hp_rates/ny/config/rev_requirement/or_elec_heat_vs_non_elec_heat.yaml
+++ b/rate_design/hp_rates/ny/config/rev_requirement/or_elec_heat_vs_non_elec_heat.yaml
@@ -1,6 +1,6 @@
 utility: or
 group_col: heating_type_v2
-source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/or/ny_20260416a_r1-36/20260416_152714_ny_or_run1_up00_precalc__default
+source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/or/ny_20260424_r1-36_ancillary/20260426_143140_ny_or_run1_up00_precalc__default
 total_delivery_revenue_requirement: 263364257.0
 total_delivery_and_supply_revenue_requirement: 431562114.21
 subclass_revenue_requirements:
@@ -46,8 +46,8 @@ heating_type_breakdown:
       supply: 103087336.64685962
       total: 282713796.7778486
     other:
-      delivery: 4435611.936726664
-      supply: 2559948.844980308
+      delivery: 4435611.936726665
+      supply: 2559948.844980307
       total: 6995560.781706972
   epmc:
     delivered_fuels:
diff --git a/rate_design/hp_rates/ny/config/rev_requirement/or_hp_vs_nonhp.yaml b/rate_design/hp_rates/ny/config/rev_requirement/or_hp_vs_nonhp.yaml
index 9ff9cc9d..ab109911 100644
--- a/rate_design/hp_rates/ny/config/rev_requirement/or_hp_vs_nonhp.yaml
+++ b/rate_design/hp_rates/ny/config/rev_requirement/or_hp_vs_nonhp.yaml
@@ -1,6 +1,6 @@
 utility: or
 group_col: has_hp
-source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/or/ny_20260416a_r1-36/20260416_152714_ny_or_run1_up00_precalc__default
+source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/or/ny_20260424_r1-36_ancillary/20260426_143140_ny_or_run1_up00_precalc__default
 total_delivery_revenue_requirement: 263364257.0
 total_delivery_and_supply_revenue_requirement: 431562114.21
 subclass_revenue_requirements:
@@ -38,8 +38,8 @@ heating_type_breakdown:
       supply: 17652100.335090727
       total: 33908949.087222315
     heat_pump:
-      delivery: 8387766.13555118
-      supply: 9210885.255922925
+      delivery: 8387766.135551178
+      supply: 9210885.255922928
       total: 17598651.391474105
     natgas:
       delivery: 179626460.130989
@@ -59,8 +59,8 @@ heating_type_breakdown:
       supply: 33634728.592646584
       total: 50999946.2864369
     heat_pump:
-      delivery: 10978105.150236435
-      supply: 16057570.541742578
+      delivery: 10978105.150236433
+      supply: 16057570.54174258
       total: 27035675.691979013
     natgas:
       delivery: 169430111.27941787
@@ -80,8 +80,8 @@ heating_type_breakdown:
       supply: 20621890.764150135
       total: 51582996.250010505
     heat_pump:
-      delivery: 16188913.23844962
-      supply: 10786467.920276834
+      delivery: 16188913.238449618
+      supply: 10786467.920276836
       total: 26975381.158726454
     natgas:
       delivery: 155396992.27215794
diff --git a/rate_design/hp_rates/ny/config/rev_requirement/psegli_elec_heat_vs_non_elec_heat.yaml b/rate_design/hp_rates/ny/config/rev_requirement/psegli_elec_heat_vs_non_elec_heat.yaml
index 33ac8393..595086a1 100644
--- a/rate_design/hp_rates/ny/config/rev_requirement/psegli_elec_heat_vs_non_elec_heat.yaml
+++ b/rate_design/hp_rates/ny/config/rev_requirement/psegli_elec_heat_vs_non_elec_heat.yaml
@@ -1,13 +1,13 @@
 utility: psegli
 group_col: heating_type_v2
-source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/psegli/ny_20260416a_r1-36/20260416_161934_ny_psegli_run1_up00_precalc__default
+source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/psegli/ny_20260424_r1-36_ancillary/20260426_144810_ny_psegli_run1_up00_precalc__default
 total_delivery_revenue_requirement: 1167061663.64
 total_delivery_and_supply_revenue_requirement: 2152328483.56
 subclass_revenue_requirements:
   delivery:
     percustomer:
-      non_electric_heating: 1096974897.5883353
-      electric_heating: 70086766.05166472
+      non_electric_heating: 1096974897.588335
+      electric_heating: 70086766.0516647
     epmc:
       non_electric_heating: 1097487021.2664788
       electric_heating: 69574642.3735213
@@ -15,79 +15,79 @@ subclass_revenue_requirements:
       non_electric_heating: 1028689796.3412014
       electric_heating: 138371867.2987988
     passthrough:
-      non_electric_heating: 1044526159.9854783
-      electric_heating: 122535503.65451245
+      non_electric_heating: 1044526159.9854782
+      electric_heating: 122535503.6545124
   supply:
     passthrough:
-      non_electric_heating: 870500440.7444717
-      electric_heating: 114766379.1755306
+      non_electric_heating: 870500440.744472
+      electric_heating: 114766379.17553064
     percustomer:
-      non_electric_heating: 880076800.2014573
-      electric_heating: 105190019.7185423
+      non_electric_heating: 880076800.201458
+      electric_heating: 105190019.71854232
     volumetric:
-      non_electric_heating: 863523916.9773949
-      electric_heating: 121742902.94260466
+      non_electric_heating: 863523916.9773947
+      electric_heating: 121742902.94260472
 heating_type_breakdown:
   percustomer:
     delivered_fuels:
-      delivery: 495534595.1719726
-      supply: 428533739.96322924
-      total: 924068335.1352018
+      delivery: 495534595.17197245
+      supply: 428533739.9632295
+      total: 924068335.1352019
     electrical_resistance:
       delivery: 53614437.464322016
-      supply: 79395848.11369292
-      total: 133010285.57801494
+      supply: 79395848.11369291
+      total: 133010285.57801493
     heat_pump:
-      delivery: 16472328.587342715
-      supply: 25794171.604849406
-      total: 42266500.19219212
+      delivery: 16472328.58734272
+      supply: 25794171.604849387
+      total: 42266500.19219211
     natgas:
-      delivery: 593845905.5110091
-      supply: 445511092.1695845
-      total: 1039356997.6805936
+      delivery: 593845905.5110096
+      supply: 445511092.16958416
+      total: 1039356997.6805937
     other:
-      delivery: 7594396.905353459
-      supply: 6031968.068643687
+      delivery: 7594396.905353456
+      supply: 6031968.06864369
       total: 13626364.973997146
   epmc:
     delivered_fuels:
       delivery: 545393055.7780459
-      supply: 407143899.24183047
-      total: 952536955.0198764
+      supply: 407143899.2418318
+      total: 952536955.0198777
     electrical_resistance:
-      delivery: 47702570.051196255
-      supply: 141633672.23138052
-      total: 189336242.28257677
+      delivery: 47702570.05119625
+      supply: 141633672.23138055
+      total: 189336242.2825768
     heat_pump:
-      delivery: 21872072.322325047
-      supply: 41695363.55833627
-      total: 63567435.88066132
+      delivery: 21872072.32232505
+      supply: 41695363.55833628
+      total: 63567435.88066133
     natgas:
-      delivery: 545199048.7120194
-      supply: 388861333.3275273
-      total: 934060382.0395467
+      delivery: 545199048.7120193
+      supply: 388861333.32752585
+      total: 934060382.0395452
     other:
       delivery: 6894916.776413782
-      supply: 5932551.560924491
-      total: 12827468.337338272
+      supply: 5932551.560924487
+      total: 12827468.337338269
   volumetric:
     delivered_fuels:
-      delivery: 515295806.8985358
+      delivery: 515295806.8985359
       supply: 433324023.9944696
-      total: 948619830.8930054
+      total: 948619830.8930055
     electrical_resistance:
-      delivery: 103966673.99837975
-      supply: 91601654.00980128
+      delivery: 103966673.99837977
+      supply: 91601654.00980127
       total: 195568328.00818104
     heat_pump:
       delivery: 34405193.30041905
       supply: 30141248.932803422
       total: 64546442.23322247
     natgas:
-      delivery: 506402762.7678767
-      supply: 424314138.4544011
+      delivery: 506402762.7678768
+      supply: 424314138.45440096
       total: 930716901.2222778
     other:
-      delivery: 6991226.674789048
-      supply: 5885754.528524167
+      delivery: 6991226.674789047
+      supply: 5885754.528524168
       total: 12876981.203313215
diff --git a/rate_design/hp_rates/ny/config/rev_requirement/psegli_hp_vs_nonhp.yaml b/rate_design/hp_rates/ny/config/rev_requirement/psegli_hp_vs_nonhp.yaml
index b1a286a2..0c4b6d21 100644
--- a/rate_design/hp_rates/ny/config/rev_requirement/psegli_hp_vs_nonhp.yaml
+++ b/rate_design/hp_rates/ny/config/rev_requirement/psegli_hp_vs_nonhp.yaml
@@ -1,93 +1,93 @@
 utility: psegli
 group_col: has_hp
-source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/psegli/ny_20260416a_r1-36/20260416_161934_ny_psegli_run1_up00_precalc__default
+source_run_dir: s3://data.sb/switchbox/cairo/outputs/hp_rates/ny/psegli/ny_20260424_r1-36_ancillary/20260426_144810_ny_psegli_run1_up00_precalc__default
 total_delivery_revenue_requirement: 1167061663.64
 total_delivery_and_supply_revenue_requirement: 2152328483.56
 subclass_revenue_requirements:
   delivery:
     percustomer:
       non-hp: 1150589335.0526571
-      hp: 16472328.58734272
+      hp: 16472328.587342717
     epmc:
-      non-hp: 1145189591.3176758
+      non-hp: 1145189591.317675
       hp: 21872072.32232505
     volumetric:
-      non-hp: 1132656470.3395815
-      hp: 34405193.300419055
+      non-hp: 1132656470.339581
+      hp: 34405193.30041905
     passthrough:
       non-hp: 1136561476.293861
-      hp: 30500187.346129816
+      hp: 30500187.346129812
   supply:
     passthrough:
-      non-hp: 956686620.9966557
-      hp: 28580198.923346628
+      non-hp: 956686620.996656
+      hp: 28580198.92334663
     percustomer:
-      non-hp: 959472648.3151505
-      hp: 25794171.604849387
+      non-hp: 959472648.3151507
+      hp: 25794171.604849398
     volumetric:
-      non-hp: 955125570.9871967
-      hp: 30141248.932803422
+      non-hp: 955125570.9871962
+      hp: 30141248.932803415
 heating_type_breakdown:
   percustomer:
     delivered_fuels:
-      delivery: 495534595.1719725
+      delivery: 495534595.1719724
       supply: 428533739.96322966
-      total: 924068335.1352022
+      total: 924068335.135202
     electrical_resistance:
-      delivery: 53614437.464321986
-      supply: 79395848.11369297
-      total: 133010285.57801495
+      delivery: 53614437.464322
+      supply: 79395848.11369294
+      total: 133010285.57801494
     heat_pump:
-      delivery: 16472328.587342726
-      supply: 25794171.604849383
-      total: 42266500.19219211
+      delivery: 16472328.587342722
+      supply: 25794171.604849398
+      total: 42266500.19219212
     natgas:
       delivery: 593845905.5110093
-      supply: 445511092.16958475
-      total: 1039356997.6805941
+      supply: 445511092.16958416
+      total: 1039356997.6805935
     other:
-      delivery: 7594396.905353458
-      supply: 6031968.068643688
+      delivery: 7594396.905353457
+      supply: 6031968.068643689
       total: 13626364.973997146
   epmc:
     delivered_fuels:
-      delivery: 545393055.7780458
-      supply: 407143899.24183214
-      total: 952536955.0198779
+      delivery: 545393055.7780454
+      supply: 407143899.2418331
+      total: 952536955.0198785
     electrical_resistance:
-      delivery: 47702570.051196255
-      supply: 141633672.23138055
+      delivery: 47702570.05119628
+      supply: 141633672.23138052
       total: 189336242.2825768
     heat_pump:
-      delivery: 21872072.322325043
-      supply: 41695363.55833628
+      delivery: 21872072.32232505
+      supply: 41695363.55833627
       total: 63567435.88066132
     natgas:
-      delivery: 545199048.7120193
+      delivery: 545199048.7120194
       supply: 388861333.32752585
-      total: 934060382.0395452
+      total: 934060382.0395453
     other:
-      delivery: 6894916.7764137825
-      supply: 5932551.560924486
-      total: 12827468.337338269
+      delivery: 6894916.776413782
+      supply: 5932551.560924485
+      total: 12827468.337338267
   volumetric:
     delivered_fuels:
-      delivery: 515295806.89853585
-      supply: 433324023.9944695
-      total: 948619830.8930054
+      delivery: 515295806.8985358
+      supply: 433324023.99446946
+      total: 948619830.8930053
     electrical_resistance:
       delivery: 103966673.99837974
-      supply: 91601654.0098013
-      total: 195568328.00818104
+      supply: 91601654.00980124
+      total: 195568328.00818098
     heat_pump:
       delivery: 34405193.30041905
       supply: 30141248.932803415
       total: 64546442.23322246
     natgas:
-      delivery: 506402762.76787674
-      supply: 424314138.4544016
-      total: 930716901.2222784
+      delivery: 506402762.7678767
+      supply: 424314138.4544012
+      total: 930716901.2222779
     other:
-      delivery: 6991226.674789048
-      supply: 5885754.528524167
+      delivery: 6991226.674789047
+      supply: 5885754.528524168
       total: 12876981.203313215
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_flat.json b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_flat.json
index 49366651..17079abe 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_flat.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_flat.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.0717788757394314,
+            "rate": 0.07177887573943137,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_flat_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_flat_calibrated.json
index 48b83bcf..9c7ab7e5 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_flat_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_flat_calibrated.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.07177887573943136,
+            "rate": 0.07177887573943141,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_flat_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_flat_supply_calibrated.json
index b5a82d1b..4a12aebd 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_flat_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_flat_supply_calibrated.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.16604162683737542,
+            "rate": 0.16604162683737547,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_seasonal_percustomer.json b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_seasonal_percustomer.json
index f424472e..bbd001b2 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_seasonal_percustomer.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_seasonal_percustomer.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.1451035090401053,
+            "rate": 0.14510350904010536,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.04533816317068608,
+            "rate": 0.04533816317068616,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_seasonal_percustomer_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_seasonal_percustomer_calibrated.json
index d349e272..25b97ed1 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_seasonal_percustomer_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_seasonal_percustomer_calibrated.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.14583268062797555,
+            "rate": 0.14583268062797566,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.04556559307232481,
+            "rate": 0.04556559307232484,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_seasonal_percustomer_supply.json b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_seasonal_percustomer_supply.json
index 4d0d1e3e..bf4c134f 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_seasonal_percustomer_supply.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_seasonal_percustomer_supply.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.23936626013804943,
+            "rate": 0.2393662601380494,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.12792566345070422,
+            "rate": 0.12792566345070416,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_seasonal_percustomer_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_seasonal_percustomer_supply_calibrated.json
index cd858f7c..2fac4599 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_seasonal_percustomer_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_elec_heat_seasonal_percustomer_supply_calibrated.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.25305161378855134,
+            "rate": 0.2530516137885514,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.13524216438915682,
+            "rate": 0.13524216438915687,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_flat.json b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_flat.json
index 4a987ed8..c920aa22 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_flat.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_flat.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.11547258471299748,
+            "rate": 0.11547258471299755,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_flat_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_flat_supply_calibrated.json
index 3766eb75..d28e0cf8 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_flat_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_flat_supply_calibrated.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.15709496639921627,
+            "rate": 0.15709496639921636,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal.json b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal.json
index 483aafa6..bc31535f 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.14529932053295458,
+            "rate": 0.14529932053295452,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.02572076942583784,
+            "rate": 0.025720769425837828,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonalTOU_flex_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonalTOU_flex_supply_calibrated.json
index baa3900a..26ecf00b 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonalTOU_flex_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonalTOU_flex_supply_calibrated.json
@@ -640,28 +640,28 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.13407916776674708,
+            "rate": 0.13407916776674716,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.20800697734177045,
+            "rate": 0.20800697734177057,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.11625697369873154,
+            "rate": 0.1162569736987316,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.3505961555832647,
+            "rate": 0.35059615558326485,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonalTOU_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonalTOU_supply_calibrated.json
index 66e6ec79..1ead96be 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonalTOU_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonalTOU_supply_calibrated.json
@@ -640,28 +640,28 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.13076757506069778,
+            "rate": 0.13076757506069786,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.20501026125714303,
+            "rate": 0.20501026125714314,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.11625851267842975,
+            "rate": 0.1162585126784298,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.3545070827103359,
+            "rate": 0.35450708271033604,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal_percustomer.json b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal_percustomer.json
index b3d88574..149b4dad 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal_percustomer.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal_percustomer.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.14529932053295458,
+            "rate": 0.14529932053295455,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.025720769425837883,
+            "rate": 0.025720769425837856,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal_percustomer_supply.json b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal_percustomer_supply.json
index d7e86620..37b7abda 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal_percustomer_supply.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal_percustomer_supply.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.2394074480109882,
+            "rate": 0.23940744801098823,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal_percustomer_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal_percustomer_supply_calibrated.json
index 2d7db8a6..f164b92f 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal_percustomer_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal_percustomer_supply_calibrated.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.25593401916983344,
+            "rate": 0.25593401916983355,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.11292535261641079,
+            "rate": 0.11292535261641085,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal_supply.json b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal_supply.json
index 6053361c..4367cd59 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal_supply.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal_supply.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.23940744801098823,
+            "rate": 0.23940744801098826,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.10563409147863001,
+            "rate": 0.10563409147863004,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal_supply_calibrated.json
index c2074d38..88c30ac8 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_hp_seasonal_supply_calibrated.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.25593401916983344,
+            "rate": 0.25593401916983355,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.11292535261641079,
+            "rate": 0.11292535261641085,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_non_electric_heating_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_non_electric_heating_supply_calibrated.json
index 0b6ba178..67a4079f 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_non_electric_heating_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_non_electric_heating_supply_calibrated.json
@@ -640,84 +640,84 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.2394272795640087,
+            "rate": 0.2394272795640086,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.26614736396335203,
+            "rate": 0.266147363963352,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.3003615222130489,
+            "rate": 0.3003615222130488,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2947349811432947,
+            "rate": 0.2947349811432946,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.27167813412128067,
+            "rate": 0.27167813412128056,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2571688409797018,
+            "rate": 0.25716884097970166,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2675360421848233,
+            "rate": 0.2675360421848232,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.30392898867855267,
+            "rate": 0.30392898867855256,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.28771976185206927,
+            "rate": 0.28771976185206916,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2610954483645515,
+            "rate": 0.2610954483645514,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.26274749659354313,
+            "rate": 0.262747496593543,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2692838613256406,
+            "rate": 0.2692838613256405,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_nonhp_default_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_nonhp_default_calibrated.json
index 21728e6c..551c7678 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_nonhp_default_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_nonhp_default_calibrated.json
@@ -640,84 +640,84 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.15079795404759164,
+            "rate": 0.1507979540475916,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.14971997026170733,
+            "rate": 0.1497199702617073,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.1506482340773299,
+            "rate": 0.15064823407732988,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.1522801817531825,
+            "rate": 0.15228018175318248,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.15519972117328582,
+            "rate": 0.1551997211732858,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.15419659737253238,
+            "rate": 0.15419659737253236,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.15624776096511778,
+            "rate": 0.15624776096511775,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.1586432804893051,
+            "rate": 0.15864328048930507,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.15895769242685467,
+            "rate": 0.15895769242685465,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.1584785885220172,
+            "rate": 0.15847858852201718,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.15379235345282574,
+            "rate": 0.15379235345282571,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.15722094077181886,
+            "rate": 0.15722094077181883,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_nonhp_default_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_nonhp_default_supply_calibrated.json
index 0071ca59..080fe1ba 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_nonhp_default_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/cenhud_nonhp_default_supply_calibrated.json
@@ -640,84 +640,84 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.22035695147419807,
+            "rate": 0.22035695147419845,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.24494878725871855,
+            "rate": 0.244948787258719,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2764377956243815,
+            "rate": 0.2764377956243819,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.27125940726473785,
+            "rate": 0.2712594072647383,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.25003903283777257,
+            "rate": 0.250039032837773,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.23668540157843615,
+            "rate": 0.23668540157843657,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2462268575772689,
+            "rate": 0.24622685757726934,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.27972111420134704,
+            "rate": 0.27972111420134754,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2648029485865438,
+            "rate": 0.2648029485865443,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.240299255582613,
+            "rate": 0.24029925558261342,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.24181971854778495,
+            "rate": 0.24181971854778536,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.24783546332303058,
+            "rate": 0.247835463323031,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_elec_heat_flat.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_elec_heat_flat.json
index 4b80ac7a..0b7f79f0 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_elec_heat_flat.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_elec_heat_flat.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.07964165803409923,
+            "rate": 0.07964165803409926,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_elec_heat_flat_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_elec_heat_flat_calibrated.json
index f8a76c08..d17b1908 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_elec_heat_flat_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_elec_heat_flat_calibrated.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.07964165803409896,
+            "rate": 0.07964165803409899,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_elec_heat_flat_supply.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_elec_heat_flat_supply.json
index a62319d4..fe1053f8 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_elec_heat_flat_supply.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_elec_heat_flat_supply.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.17127640283217205,
+            "rate": 0.171276402832172,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_elec_heat_seasonal_percustomer.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_elec_heat_seasonal_percustomer.json
index af46c535..3ce5e0d1 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_elec_heat_seasonal_percustomer.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_elec_heat_seasonal_percustomer.json
@@ -647,7 +647,7 @@
         ],
         [
           {
-            "rate": 0.04890520062056815,
+            "rate": 0.04890520062056812,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_elec_heat_seasonal_percustomer_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_elec_heat_seasonal_percustomer_calibrated.json
index ef51f36f..d64eb502 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_elec_heat_seasonal_percustomer_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_elec_heat_seasonal_percustomer_calibrated.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.1548459251799179,
+            "rate": 0.15484592517991796,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.04913092146458036,
+            "rate": 0.049130921464580375,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_flat.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_flat.json
index 9302f86c..a42d9d15 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_flat.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_flat.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.12815487568442815,
+            "rate": 0.12815487568442813,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_flat_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_flat_calibrated.json
index c4969d07..68799203 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_flat_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_flat_calibrated.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.09075993307368678,
+            "rate": 0.09075993307368674,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_flat_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_flat_supply_calibrated.json
index 0fc2ae01..86469272 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_flat_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_flat_supply_calibrated.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.1926741235442025,
+            "rate": 0.19267412354420244,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal.json
index 21d2cc90..17c6f665 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.15550850526956425,
+            "rate": 0.15550850526956422,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.05197527052866528,
+            "rate": 0.05197527052866524,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonalTOU_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonalTOU_calibrated.json
index f2b40156..bd29cad8 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonalTOU_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonalTOU_calibrated.json
@@ -640,28 +640,28 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.06879538566057987,
+            "rate": 0.06879538566057983,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.1360910319137591,
+            "rate": 0.13609103191375901,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.07331524249847997,
+            "rate": 0.07331524249847993,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.31760077744063303,
+            "rate": 0.3176007774406328,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonalTOU_flex_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonalTOU_flex_calibrated.json
index 9d0cc7fd..5fa54f16 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonalTOU_flex_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonalTOU_flex_calibrated.json
@@ -640,28 +640,28 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.07401682782443532,
+            "rate": 0.07401682782443529,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.14911545669862855,
+            "rate": 0.1491154566986285,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.07212006998385981,
+            "rate": 0.07212006998385978,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2988439339921199,
+            "rate": 0.2988439339921198,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonalTOU_flex_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonalTOU_flex_supply_calibrated.json
index 274696eb..7fe99e25 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonalTOU_flex_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonalTOU_flex_supply_calibrated.json
@@ -640,28 +640,28 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.15587685834028778,
+            "rate": 0.15587685834028775,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.31403195196763034,
+            "rate": 0.3140319519676303,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.1518823524703184,
+            "rate": 0.15188235247031837,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.6293549039312584,
+            "rate": 0.6293549039312583,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonalTOU_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonalTOU_supply_calibrated.json
index e866e94e..a3a3f497 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonalTOU_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonalTOU_supply_calibrated.json
@@ -640,28 +640,28 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.14604561932935747,
+            "rate": 0.14604561932935745,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.28890744415733494,
+            "rate": 0.2889074441573349,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.15564081651929626,
+            "rate": 0.15564081651929623,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.6742342061959117,
+            "rate": 0.6742342061959116,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_calibrated.json
index bd6c0e51..fe5fdfca 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_calibrated.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.15583222756733392,
+            "rate": 0.15583222756733384,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.05208296375913567,
+            "rate": 0.05208296375913564,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_percustomer.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_percustomer.json
index 1a4e0275..1b0b1925 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_percustomer.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_percustomer.json
@@ -647,7 +647,7 @@
         ],
         [
           {
-            "rate": 0.0519752705286652,
+            "rate": 0.05197527052866524,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_percustomer_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_percustomer_calibrated.json
index 4313773f..4c106bff 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_percustomer_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_percustomer_calibrated.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.15583222756733392,
+            "rate": 0.15583222756733384,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.05208296375913567,
+            "rate": 0.05208296375913564,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_percustomer_supply.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_percustomer_supply.json
index 0e6b75f4..9481ebd5 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_percustomer_supply.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_percustomer_supply.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.25742269574008,
+            "rate": 0.2574226957400801,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.14072260997146685,
+            "rate": 0.140722609971467,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_percustomer_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_percustomer_supply_calibrated.json
index 0110aede..4b16c5b3 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_percustomer_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_percustomer_supply_calibrated.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.26922575022953205,
+            "rate": 0.269225750229532,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.14717419243947524,
+            "rate": 0.14717419243947522,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_supply_calibrated.json
index 61fc35a2..5a069b48 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_hp_seasonal_supply_calibrated.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.26922575022953205,
+            "rate": 0.269225750229532,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.14717419243947524,
+            "rate": 0.14717419243947522,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_non_electric_heating_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_non_electric_heating_calibrated.json
index 2d7df8b8..b5d02f47 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_non_electric_heating_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_non_electric_heating_calibrated.json
@@ -640,26 +640,26 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.17458430485785154,
+            "rate": 0.1745843048578515,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.19913085812086548,
+            "rate": 0.19913085812086545,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.17514297463339668,
+            "rate": 0.17514297463339665,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.17514297463339668,
+            "rate": 0.17514297463339665,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_non_electric_heating_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_non_electric_heating_supply_calibrated.json
index dfb3777d..8c0ad2f6 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_non_electric_heating_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_non_electric_heating_supply_calibrated.json
@@ -640,156 +640,156 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.28358892884113146,
+            "rate": 0.2835889288411313,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.28358892884113146,
+            "rate": 0.2835889288411313,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2874536275894363,
+            "rate": 0.28745362758943616,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.2874536275894363,
+            "rate": 0.28745362758943616,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.27609940919786474,
+            "rate": 0.2760994091978646,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.27609940919786474,
+            "rate": 0.2760994091978646,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.27196817950140084,
+            "rate": 0.2719681795014007,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.27196817950140084,
+            "rate": 0.2719681795014007,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2686365426494139,
+            "rate": 0.2686365426494137,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.2686365426494139,
+            "rate": 0.2686365426494137,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2709553618983968,
+            "rate": 0.27095536189839664,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.2953695967497574,
+            "rate": 0.2953695967497572,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.27199483259621676,
+            "rate": 0.2719948325962166,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.29640906744757733,
+            "rate": 0.29640906744757717,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.27196817950140084,
+            "rate": 0.2719681795014007,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.29638241435276147,
+            "rate": 0.29638241435276125,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2665309481589581,
+            "rate": 0.26653094815895795,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.29094518301031863,
+            "rate": 0.29094518301031846,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2698092788213133,
+            "rate": 0.2698092788213131,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.2698092788213133,
+            "rate": 0.2698092788213131,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.26996919739020864,
+            "rate": 0.26996919739020847,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.26996919739020864,
+            "rate": 0.26996919739020847,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.29046542730363256,
+            "rate": 0.2904654273036324,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.29046542730363256,
+            "rate": 0.2904654273036324,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_nonhp_default_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_nonhp_default_calibrated.json
index a69969a0..62ebf069 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_nonhp_default_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_nonhp_default_calibrated.json
@@ -640,26 +640,26 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.15466173642964567,
+            "rate": 0.15466173642964562,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.17640717657165386,
+            "rate": 0.1764071765716538,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.15515665398622056,
+            "rate": 0.1551566539862205,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.15515665398622056,
+            "rate": 0.1551566539862205,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/coned_nonhp_default_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/coned_nonhp_default_supply_calibrated.json
index 499fdcbc..5c78df2f 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/coned_nonhp_default_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/coned_nonhp_default_supply_calibrated.json
@@ -640,156 +640,156 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.26271970732678307,
+            "rate": 0.26271970732678235,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.26271970732678307,
+            "rate": 0.26271970732678235,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.26630000409016497,
+            "rate": 0.2663000040901642,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.26630000409016497,
+            "rate": 0.2663000040901642,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2557813391163671,
+            "rate": 0.25578133911636636,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.2557813391163671,
+            "rate": 0.25578133911636636,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2519541253348209,
+            "rate": 0.25195412533482014,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.2519541253348209,
+            "rate": 0.25195412533482014,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.24886766260776755,
+            "rate": 0.24886766260776683,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.24886766260776755,
+            "rate": 0.24886766260776683,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2510158406657967,
+            "rate": 0.25101584066579596,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.2736334395296438,
+            "rate": 0.27363343952964303,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2519788170366373,
+            "rate": 0.2519788170366366,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.2745964159004845,
+            "rate": 0.27459641590048367,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2519541253348209,
+            "rate": 0.25195412533482014,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.27457172419866804,
+            "rate": 0.27457172419866727,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2469170181642698,
+            "rate": 0.2469170181642691,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.2695346170281169,
+            "rate": 0.2695346170281161,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.24995409748769032,
+            "rate": 0.2499540974876896,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.24995409748769032,
+            "rate": 0.2499540974876896,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.25010224769858885,
+            "rate": 0.25010224769858813,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.25010224769858885,
+            "rate": 0.25010224769858813,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.26909016639542127,
+            "rate": 0.2690901663954205,
             "adj": 0.0,
             "unit": "kWh",
             "max": 250.0
           },
           {
-            "rate": 0.26909016639542127,
+            "rate": 0.2690901663954205,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_flat.json b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_flat.json
index 9811d4a2..c09314a8 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_flat.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_flat.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.039505441805242944,
+            "rate": 0.03950544180524293,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_flat_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_flat_calibrated.json
index dbd33c9f..27ab745a 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_flat_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_flat_calibrated.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.03950544180524284,
+            "rate": 0.039505441805242826,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_flat_supply.json b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_flat_supply.json
index 2c94c827..48e59131 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_flat_supply.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_flat_supply.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.1172215585894347,
+            "rate": 0.11722155858943467,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_seasonal_percustomer_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_seasonal_percustomer_calibrated.json
index c7e7f2cf..4f1f18c2 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_seasonal_percustomer_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_seasonal_percustomer_calibrated.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.08669383664906775,
+            "rate": 0.08669383664906771,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.024626132442071284,
+            "rate": 0.024626132442071274,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_seasonal_percustomer_supply.json b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_seasonal_percustomer_supply.json
index d16664e7..61eea25c 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_seasonal_percustomer_supply.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_seasonal_percustomer_supply.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.17455079944143653,
+            "rate": 0.17455079944143656,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.09874884079274919,
+            "rate": 0.09874884079274922,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_seasonal_percustomer_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_seasonal_percustomer_supply_calibrated.json
index 3efbf3d0..8caea0bf 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_seasonal_percustomer_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_elec_heat_seasonal_percustomer_supply_calibrated.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.19094074969270355,
+            "rate": 0.19094074969270353,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.10802260109340549,
+            "rate": 0.10802260109340547,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_hp_flat.json b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_hp_flat.json
index 605ef2ab..3f6e7ae2 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_hp_flat.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_hp_flat.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.06754889313442085,
+            "rate": 0.06754889313442086,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_hp_flat_supply.json b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_hp_flat_supply.json
index ee30857e..0dbe0649 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_hp_flat_supply.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_hp_flat_supply.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.19426579415994638,
+            "rate": 0.19426579415994635,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_hp_seasonal.json b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_hp_seasonal.json
index dcba1135..03c271e8 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_hp_seasonal.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_hp_seasonal.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.08584885651451217,
+            "rate": 0.0858488565145122,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.018794894273444343,
+            "rate": 0.0187948942734444,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_hp_seasonal_supply.json b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_hp_seasonal_supply.json
index d99c5127..c7280303 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_hp_seasonal_supply.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_hp_seasonal_supply.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.17495937263001682,
+            "rate": 0.17495937263001685,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.09217077278697769,
+            "rate": 0.0921707727869777,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_non_electric_heating_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_non_electric_heating_supply_calibrated.json
index 904aff83..6c108874 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_non_electric_heating_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_non_electric_heating_supply_calibrated.json
@@ -640,84 +640,84 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.18673257854448125,
+            "rate": 0.18673257854448133,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.19606577614905657,
+            "rate": 0.19606577614905665,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.1946074640233417,
+            "rate": 0.19460746402334175,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.17667880318367035,
+            "rate": 0.1766788031836704,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.17156613243704635,
+            "rate": 0.1715661324370464,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.1910732016951385,
+            "rate": 0.19107320169513858,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.1969750766509729,
+            "rate": 0.19697507665097297,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.21555568879390502,
+            "rate": 0.2155556887939051,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.21776889190234294,
+            "rate": 0.21776889190234303,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.20313430080546288,
+            "rate": 0.20313430080546294,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.18796785469802796,
+            "rate": 0.18796785469802804,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2069773821720527,
+            "rate": 0.20697738217205278,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_nonhp_default_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_nonhp_default_calibrated.json
index b76e1a42..c21b6624 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_nonhp_default_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_nonhp_default_calibrated.json
@@ -640,35 +640,35 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.08774580209119302,
+            "rate": 0.08774580209119305,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.0878851982817874,
+            "rate": 0.08788519828178741,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.08324412511258683,
+            "rate": 0.08324412511258684,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.08199775917315487,
+            "rate": 0.08199775917315488,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.09530599548695791,
+            "rate": 0.09530599548695792,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_nonhp_default_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_nonhp_default_supply_calibrated.json
index e95e3bf3..2bd9ac88 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nimo_nonhp_default_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nimo_nonhp_default_supply_calibrated.json
@@ -640,84 +640,84 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.17180666043129722,
+            "rate": 0.1718066604312972,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.18039383640287254,
+            "rate": 0.1803938364028725,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.1790520901573139,
+            "rate": 0.17905209015731385,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.16255650396191645,
+            "rate": 0.16255650396191643,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.15785249947748733,
+            "rate": 0.1578524994774873,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.17580032866807763,
+            "rate": 0.1758003286680776,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.1812304546501032,
+            "rate": 0.18123045465010315,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.1983258803435151,
+            "rate": 0.19832588034351506,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2003621775867747,
+            "rate": 0.20036217758677466,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.186897359381345,
+            "rate": 0.18689735938134497,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.1729431984275351,
+            "rate": 0.17294319842753508,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.1904332553696407,
+            "rate": 0.19043325536964067,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_elec_heat_flat_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_elec_heat_flat_calibrated.json
index 01083455..d18c58e2 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_elec_heat_flat_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_elec_heat_flat_calibrated.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.04501407763652302,
+            "rate": 0.04501407763652301,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_elec_heat_flat_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_elec_heat_flat_supply_calibrated.json
index 3b71e37c..4ba6e9b2 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_elec_heat_flat_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_elec_heat_flat_supply_calibrated.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.1506576629394312,
+            "rate": 0.15065766293943123,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_elec_heat_seasonal_percustomer_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_elec_heat_seasonal_percustomer_calibrated.json
index 985e54f1..1535b59c 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_elec_heat_seasonal_percustomer_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_elec_heat_seasonal_percustomer_calibrated.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.1024112835374042,
+            "rate": 0.10241128353740415,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.027385625076854263,
+            "rate": 0.027385625076854252,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_elec_heat_seasonal_percustomer_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_elec_heat_seasonal_percustomer_supply_calibrated.json
index 1398d648..5963b3bd 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_elec_heat_seasonal_percustomer_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_elec_heat_seasonal_percustomer_supply_calibrated.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.24808543359066113,
+            "rate": 0.24808543359066118,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.12073458905521758,
+            "rate": 0.12073458905521761,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_flat.json b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_flat.json
index c4d7c240..6ab4a174 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_flat.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_flat.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.08055461835098121,
+            "rate": 0.08055461835098122,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_flat_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_flat_calibrated.json
index 35933d65..1ebfefc1 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_flat_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_flat_calibrated.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.047955678712038916,
+            "rate": 0.04795567871203893,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_flat_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_flat_supply_calibrated.json
index 9f4e7cdd..25b510de 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_flat_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_flat_supply_calibrated.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.1523676867975391,
+            "rate": 0.15236768679753912,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal.json b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal.json
index b54a3182..07f1acd5 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.10216124943272714,
+            "rate": 0.10216124943272713,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.02733210851986201,
+            "rate": 0.02733210851986198,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonalTOU_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonalTOU_calibrated.json
index c94bef6c..dfd91b2c 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonalTOU_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonalTOU_calibrated.json
@@ -640,28 +640,28 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.043843426125226063,
+            "rate": 0.04384342612522608,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.0767543514357834,
+            "rate": 0.07675435143578341,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.036588021468101535,
+            "rate": 0.03658802146810154,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.10733461977882267,
+            "rate": 0.10733461977882269,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonalTOU_flex_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonalTOU_flex_calibrated.json
index 2fda26c2..abdf54a0 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonalTOU_flex_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonalTOU_flex_calibrated.json
@@ -640,28 +640,28 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.0447100552376827,
+            "rate": 0.044710055237682705,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.07756991406134928,
+            "rate": 0.07756991406134929,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.03660857712084066,
+            "rate": 0.03660857712084067,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.10484330401637557,
+            "rate": 0.1048433040163756,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonalTOU_flex_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonalTOU_flex_supply_calibrated.json
index 508593ba..64e375b0 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonalTOU_flex_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonalTOU_flex_supply_calibrated.json
@@ -640,28 +640,28 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.14350816750859596,
+            "rate": 0.14158535276538695,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.22730058071614506,
+            "rate": 0.24564415293095748,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.11750443585408658,
+            "rate": 0.11593003583508306,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.3294236859169318,
+            "rate": 0.3320120296280944,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonalTOU_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonalTOU_supply_calibrated.json
index 9a0c53b8..901d8b2f 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonalTOU_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonalTOU_supply_calibrated.json
@@ -640,28 +640,28 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.1393019888237437,
+            "rate": 0.13930198882374373,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.24386857394179215,
+            "rate": 0.24386857394179218,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.11624967772990379,
+            "rate": 0.1162496777299038,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.34103005458844576,
+            "rate": 0.3410300545884458,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_calibrated.json
index 47a811ef..45da674c 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_calibrated.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.10266246930154868,
+            "rate": 0.10266246930154871,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.027466014581183765,
+            "rate": 0.027466014581183775,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_percustomer.json b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_percustomer.json
index 69984441..2547ae4c 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_percustomer.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_percustomer.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.10216124943272714,
+            "rate": 0.10216124943272716,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_percustomer_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_percustomer_calibrated.json
index 50a3b4ae..2fde4d08 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_percustomer_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_percustomer_calibrated.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.10266246930154868,
+            "rate": 0.10266246930154871,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.027466014581183765,
+            "rate": 0.027466014581183775,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_percustomer_supply.json b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_percustomer_supply.json
index cd883fd0..476b9a4c 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_percustomer_supply.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_percustomer_supply.json
@@ -647,7 +647,7 @@
         ],
         [
           {
-            "rate": 0.10262627139631751,
+            "rate": 0.10262627139631755,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_percustomer_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_percustomer_supply_calibrated.json
index 15423bcd..b5dbd9a9 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_percustomer_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_percustomer_supply_calibrated.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.24036182300595776,
+            "rate": 0.24036182300595782,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.11941071240794761,
+            "rate": 0.11941071240794764,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_supply.json b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_supply.json
index c7458027..f3709316 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_supply.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_supply.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.2065732575182274,
+            "rate": 0.20657325751822736,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.10262627139631755,
+            "rate": 0.10262627139631753,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_supply_calibrated.json
index a28b8d06..3e3b2b26 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_hp_seasonal_supply_calibrated.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.24036182300595776,
+            "rate": 0.24036182300595782,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.11941071240794761,
+            "rate": 0.11941071240794764,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_non_electric_heating_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_non_electric_heating_calibrated.json
index 62f330c1..32caf2b8 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_non_electric_heating_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_non_electric_heating_calibrated.json
@@ -640,42 +640,42 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.11524427614942828,
+            "rate": 0.11524427614942831,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.11539065383286183,
+            "rate": 0.11539065383286186,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.11259821802582147,
+            "rate": 0.1125982180258215,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.13691943311939891,
+            "rate": 0.13691943311939894,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.13833817066652423,
+            "rate": 0.1383381706665243,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.13765132153656673,
+            "rate": 0.13765132153656678,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_nonhp_default_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_nonhp_default_calibrated.json
index 798e981f..2f8e9691 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_nonhp_default_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_nonhp_default_calibrated.json
@@ -640,42 +640,42 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.09721765716709156,
+            "rate": 0.09721765716709153,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.09734113831444594,
+            "rate": 0.09734113831444591,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.09498549796491602,
+            "rate": 0.094985497964916,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.11550236552533788,
+            "rate": 0.11550236552533785,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.11669918279969582,
+            "rate": 0.11669918279969578,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.11611977126210983,
+            "rate": 0.1161197712621098,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_nonhp_default_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_nonhp_default_supply_calibrated.json
index a13d42eb..e4b059da 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_nonhp_default_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/nyseg_nonhp_default_supply_calibrated.json
@@ -640,84 +640,84 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.2062546164701932,
+            "rate": 0.20625461647019322,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.20842087464113207,
+            "rate": 0.2084208746411321,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.20934105510312387,
+            "rate": 0.2093410551031239,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2371381732257914,
+            "rate": 0.23713817322579145,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.22667112047063517,
+            "rate": 0.2266711204706352,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.19172343334124006,
+            "rate": 0.1917234333412401,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.19979418280995942,
+            "rate": 0.19979418280995945,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.2001967617620808,
+            "rate": 0.20019676176208082,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.19170426291494858,
+            "rate": 0.1917042629149486,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.22856899267349318,
+            "rate": 0.2285689926734932,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.1931228744605192,
+            "rate": 0.19312287446051923,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.22680531345467567,
+            "rate": 0.2268053134546757,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/or_elec_heat_flat.json b/rate_design/hp_rates/ny/config/tariffs/electric/or_elec_heat_flat.json
index cfe418b3..35bfd8ae 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/or_elec_heat_flat.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/or_elec_heat_flat.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.06232260379626814,
+            "rate": 0.06232260379626818,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/or_elec_heat_flat_supply.json b/rate_design/hp_rates/ny/config/tariffs/electric/or_elec_heat_flat_supply.json
index 31032036..b2191a30 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/or_elec_heat_flat_supply.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/or_elec_heat_flat_supply.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.15054605299657714,
+            "rate": 0.1505460529965771,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/or_elec_heat_seasonal_percustomer.json b/rate_design/hp_rates/ny/config/tariffs/electric/or_elec_heat_seasonal_percustomer.json
index c7e8cee3..ee00d49b 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/or_elec_heat_seasonal_percustomer.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/or_elec_heat_seasonal_percustomer.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.11693461974147241,
+            "rate": 0.11693461974147236,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.040690178655169204,
+            "rate": 0.040690178655169135,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/or_elec_heat_seasonal_percustomer_supply.json b/rate_design/hp_rates/ny/config/tariffs/electric/or_elec_heat_seasonal_percustomer_supply.json
index 80ac0ab5..307df5a8 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/or_elec_heat_seasonal_percustomer_supply.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/or_elec_heat_seasonal_percustomer_supply.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.21646026426953044,
+            "rate": 0.21646026426953063,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.12443670294937435,
+            "rate": 0.12443670294937455,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/or_hp_flat.json b/rate_design/hp_rates/ny/config/tariffs/electric/or_hp_flat.json
index e88d4b4b..0c185c87 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/or_hp_flat.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/or_hp_flat.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.087025109033098,
+            "rate": 0.08702510903309801,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/or_hp_flat_supply.json b/rate_design/hp_rates/ny/config/tariffs/electric/or_hp_flat_supply.json
index 759758a4..8dd9f9f1 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/or_hp_flat_supply.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/or_hp_flat_supply.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.24119349055019804,
+            "rate": 0.24119349055019798,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/or_hp_seasonal.json b/rate_design/hp_rates/ny/config/tariffs/electric/or_hp_seasonal.json
index 3d69f7bd..5a35affb 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/or_hp_seasonal.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/or_hp_seasonal.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.11794666757211653,
+            "rate": 0.11794666757211655,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.035861114448089315,
+            "rate": 0.03586111444808936,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/or_hp_seasonal_percustomer_supply.json b/rate_design/hp_rates/ny/config/tariffs/electric/or_hp_seasonal_percustomer_supply.json
index cb886a66..105b1d0b 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/or_hp_seasonal_percustomer_supply.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/or_hp_seasonal_percustomer_supply.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.21787656740603706,
+            "rate": 0.21787656740603703,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.11887642359986217,
+            "rate": 0.1188764235998621,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/or_hp_seasonal_supply.json b/rate_design/hp_rates/ny/config/tariffs/electric/or_hp_seasonal_supply.json
index cc7cf21d..cb919aa1 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/or_hp_seasonal_supply.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/or_hp_seasonal_supply.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.21787656740603706,
+            "rate": 0.217876567406037,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.11887642359986214,
+            "rate": 0.11887642359986207,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_elec_heat_flat.json b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_elec_heat_flat.json
index d2e6de87..ca1bf45b 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_elec_heat_flat.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_elec_heat_flat.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.05262317064690512,
+            "rate": 0.05262317064690511,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_elec_heat_flat_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_elec_heat_flat_calibrated.json
index 17df2a91..ca1bf45b 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_elec_heat_flat_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_elec_heat_flat_calibrated.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.05262317064690514,
+            "rate": 0.05262317064690511,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_elec_heat_seasonal_percustomer.json b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_elec_heat_seasonal_percustomer.json
index 625e78ba..fe6fb3ef 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_elec_heat_seasonal_percustomer.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_elec_heat_seasonal_percustomer.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.10030393005633598,
+            "rate": 0.10030393005633599,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.03409811132178239,
+            "rate": 0.03409811132178241,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_elec_heat_seasonal_percustomer_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_elec_heat_seasonal_percustomer_calibrated.json
index a81772aa..bfe59390 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_elec_heat_seasonal_percustomer_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_elec_heat_seasonal_percustomer_calibrated.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.10082524893336012,
+            "rate": 0.10082524893336008,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.03427564894389452,
+            "rate": 0.0342756489438945,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_flat.json b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_flat.json
index 0cc3057e..8dd10fe1 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_flat.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_flat.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.07017222658406364,
+            "rate": 0.07017222658406361,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_flat_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_flat_calibrated.json
index effe0a1b..a80a4ac0 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_flat_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_flat_calibrated.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.05030686846074137,
+            "rate": 0.05030686846074136,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_flat_supply.json b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_flat_supply.json
index d9cf0ab7..80587f92 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_flat_supply.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_flat_supply.json
@@ -640,7 +640,7 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.22356715971808547,
+            "rate": 0.22356715971808544,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal.json b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal.json
index 0d3fc07f..3d768d47 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.10191458386792446,
+            "rate": 0.10191458386792449,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.024289282212933958,
+            "rate": 0.024289282212933985,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonalTOU_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonalTOU_calibrated.json
index 2c133751..8f730550 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonalTOU_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonalTOU_calibrated.json
@@ -640,28 +640,28 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.037300878718238034,
+            "rate": 0.03730087871823802,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.06216564447181551,
+            "rate": 0.06216564447181549,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.03731952915759715,
+            "rate": 0.037319529157597134,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.1418962727320493,
+            "rate": 0.14189627273204924,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonalTOU_flex_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonalTOU_flex_calibrated.json
index fde24c96..c11fa8ec 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonalTOU_flex_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonalTOU_flex_calibrated.json
@@ -640,28 +640,28 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.0373685127014076,
+            "rate": 0.037368512701407584,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.06351899788985263,
+            "rate": 0.06351899788985262,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.03866520009214644,
+            "rate": 0.038665200092146426,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.14789336271836084,
+            "rate": 0.1478933627183608,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal_calibrated.json
index de304302..2af8690b 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal_calibrated.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.10234238143931512,
+            "rate": 0.1023423814393151,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.024391043980865876,
+            "rate": 0.02439104398086587,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal_percustomer.json b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal_percustomer.json
index 793b160e..fb59a898 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal_percustomer.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal_percustomer.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.10191458386792446,
+            "rate": 0.10191458386792443,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.02428928221293397,
+            "rate": 0.02428928221293393,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal_percustomer_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal_percustomer_calibrated.json
index 6d107540..4b2f7c1e 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal_percustomer_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal_percustomer_calibrated.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.10234238143931512,
+            "rate": 0.1023423814393151,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.024391043980865876,
+            "rate": 0.02439104398086587,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal_percustomer_supply.json b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal_percustomer_supply.json
index 5b73283e..0e94a14d 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal_percustomer_supply.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal_percustomer_supply.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.20705955272447452,
+            "rate": 0.20705955272447454,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.11401734284876772,
+            "rate": 0.11401734284876776,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal_supply.json b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal_supply.json
index 0f784e79..09d1c2af 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal_supply.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_hp_seasonal_supply.json
@@ -640,14 +640,14 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.20705955272447452,
+            "rate": 0.20705955272447454,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.11401734284876773,
+            "rate": 0.11401734284876776,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_non_electric_heating_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_non_electric_heating_calibrated.json
index 2915fd88..e4177c95 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_non_electric_heating_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_non_electric_heating_calibrated.json
@@ -640,28 +640,28 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.10819218543817677,
+            "rate": 0.10819218543817674,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.21378827764448366,
+            "rate": 0.2137882776444836,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.09271761542392387,
+            "rate": 0.09271761542392384,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.18263515886204523,
+            "rate": 0.18263515886204518,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_nonhp_default_supply_calibrated.json b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_nonhp_default_supply_calibrated.json
index 4a16613c..b4c7825a 100644
--- a/rate_design/hp_rates/ny/config/tariffs/electric/psegli_nonhp_default_supply_calibrated.json
+++ b/rate_design/hp_rates/ny/config/tariffs/electric/psegli_nonhp_default_supply_calibrated.json
@@ -640,168 +640,168 @@
       "energyratestructure": [
         [
           {
-            "rate": 0.17413686549338042,
+            "rate": 0.17413686549338045,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.39761136826083887,
+            "rate": 0.397611368260839,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.17119235695377547,
+            "rate": 0.1711923569537755,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.4090470177053511,
+            "rate": 0.4090470177053512,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.17905008613795376,
+            "rate": 0.17905008613795378,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.42895668881907517,
+            "rate": 0.4289566888190753,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.17233934574536575,
+            "rate": 0.17233934574536577,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.41194016853786986,
+            "rate": 0.41194016853786997,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.17259613428079643,
+            "rate": 0.17259613428079645,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.4131898727436325,
+            "rate": 0.41318987274363256,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.19360143647902467,
+            "rate": 0.1936014364790247,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.43909127635073875,
+            "rate": 0.4390912763507388,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.18423721455365316,
+            "rate": 0.1842372145536532,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.4171444161892647,
+            "rate": 0.41714441618926473,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.19178679749531466,
+            "rate": 0.1917867974953147,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.43484570589828503,
+            "rate": 0.4348457058982851,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.19370415189319692,
+            "rate": 0.19370415189319695,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.439330945650474,
+            "rate": 0.43933094565047404,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.17797157428914498,
+            "rate": 0.177971574289145,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.427313242192319,
+            "rate": 0.42731324219231903,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.1765849161978194,
+            "rate": 0.17658491619781944,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.42359836804642204,
+            "rate": 0.4235983680464221,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.17357193071543295,
+            "rate": 0.17357193071543298,
             "adj": 0.0,
             "unit": "kWh"
           }
         ],
         [
           {
-            "rate": 0.4177778279099936,
+            "rate": 0.4177778279099937,
             "adj": 0.0,
             "unit": "kWh"
           }
diff --git a/utils/post/build_master_bat.py b/utils/post/build_master_bat.py
index 9a59daa2..e9673696 100644
--- a/utils/post/build_master_bat.py
+++ b/utils/post/build_master_bat.py
@@ -703,6 +703,27 @@ def main() -> None:
             output_batch_all_util=output_batch_all_util,
             storage_options=storage_options,
         )
+
+        # --- Write per-utility output ---
+        per_util_output_s3 = (
+            f"{s3_base}/run_{args.run_delivery}+{args.run_supply}/"
+            f"cross_subsidization_BAT_values/"
+        )
+        t_util = _log(f"  Writing per-utility output to {per_util_output_s3}...")
+        tmp_util_dir = Path(tempfile.mkdtemp(prefix=f"master_bat_{utility}_"))
+        try:
+            df.write_parquet(tmp_util_dir / "data.parquet")
+            subprocess.run(
+                ["aws", "s3", "sync", str(tmp_util_dir), per_util_output_s3],
+                check=True,
+                capture_output=True,
+            )
+        finally:
+            import shutil
+
+            shutil.rmtree(tmp_util_dir, ignore_errors=True)
+        _log_done(f"  Writing per-utility {utility}", t_util)
+
         all_dfs.append(df)
 
     # --- Concatenate ---
diff --git a/utils/post/build_master_bills.py b/utils/post/build_master_bills.py
index cdd1729b..1021fe03 100644
--- a/utils/post/build_master_bills.py
+++ b/utils/post/build_master_bills.py
@@ -912,6 +912,27 @@ def main() -> None:
             output_batch_all_util=output_batch_all_util,
             storage_options=storage_options,
         )
+
+        # --- Write per-utility output ---
+        per_util_output_s3 = (
+            f"{s3_base}/run_{args.run_delivery}+{args.run_supply}/"
+            f"comb_bills_year_target/"
+        )
+        t_util = _log(f"  Writing per-utility output to {per_util_output_s3}...")
+        tmp_util_dir = Path(tempfile.mkdtemp(prefix=f"master_bills_{utility}_"))
+        try:
+            df.write_parquet(tmp_util_dir / "data.parquet")
+            subprocess.run(
+                ["aws", "s3", "sync", str(tmp_util_dir), per_util_output_s3],
+                check=True,
+                capture_output=True,
+            )
+        finally:
+            import shutil
+
+            shutil.rmtree(tmp_util_dir, ignore_errors=True)
+        _log_done(f"  Writing per-utility {utility}", t_util)
+
         all_dfs.append(df)
 
     # --- Concatenate ---