diff --git a/docs/inputs/technodata.rst b/docs/inputs/technodata.rst
index 768bacc5..86c15d2a 100644
--- a/docs/inputs/technodata.rst
+++ b/docs/inputs/technodata.rst
@@ -81,12 +81,13 @@ var_par, var_exp
 
    ProductionRef is the production of a reference capacity (CapRef) for the cost estimate decided by the modeller before filling the input data files.
 
-Growith constraints (optional)
+Growth constraints (optional)
    MaxCapacityAddition
       represents the maximum addition of installed capacity per technology, per year in a period, per region.
 
    MaxCapacityGrowth
       represents the fraction growth per year based on the available stock in a year, per region and technology.
+      To allow growth to be initiated, a seed value must be specified (see GrowthSeed below).
 
    TotalCapacityLimit
       represents the total capacity limit per technology, region and year.
@@ -96,19 +97,27 @@ Growith constraints (optional)
 
       resBoilerElectric, region1, 10,	0.2,	100
 
-   In this example, MaxCapacityAddition,	MaxCapacityGrowth, and TotalCapacityLimit equal to 10 PJ, 0.2 (corresponding to 20 \%), and 100 PJ.
-   Assuming a 5-year time step, the *MaxCapacityAddition* introduces a constraint on the maximum capacity which can be added in the investment year:
-   it constrains the new capacity which can be installed in a modelled period as being equal to *10 * 5 = 50 PJ*.
-   The *MaxCapacityGrowth* applies a constraint on the capacity which can be installed in a modelled period, which depends on the
-   decommissioning profile. Assuming that 7.7 PJ of resBoilerElectric is available in the year when the decision is made (investment year), and that 4.9 PJ of
-   resBoilerElectric is available in the year at which capacities invested in, will be online, then the constraint applies as follows *7.7 * ((1 + 0.2) ** 5) - 4.9 = 14.3 PJ*.
-   The *TotalCapacityLimit* applies a constraint on the maximum capacity of a technology in the investment year; it depends on the decommissioning profile and equals *100 - 4.9 = 95.1 PJ*.
+   In this example, MaxCapacityAddition, MaxCapacityGrowth and TotalCapacityLimit equal to 10 PJ, 0.2 (corresponding to 20 \%), and 100 PJ.
+   Assuming a 5-year time step:
+
+   * *MaxCapacityAddition* restricts new capacity which can be installed over the investment period to 10 * 5 = 50 PJ.
+   * *MaxCapacityGrowth* restricts capacity growth to 20 \% per year (:math:`\approx` 149 \% over 5 years).
+     The investment limit will depend on the existing capacity and the decommissioning profile. Assuming that 7.7 PJ of resBoilerElectric is available in the current year, and that 4.9 PJ of
+     resBoilerElectric is already commissioned for the investment year, then the constraint applies as follows: 7.7 * (1 + 0.2)\ :sup:`5` - 4.9 = 14.3 PJ.
+     Also see the GrowthSeed parameter below.
+   * *TotalCapacityLimit* will restrict new addition to 100 - 4.9 = 95.1 PJ (so that total capacity in the investment year will not exceed 100 PJ).
+   * Overall, the most restrictive constraint will apply, which in this case is 14.3 PJ.
 
    Growth constraints are applied for each single agent in a multi-agent simulation. When only one agent is present, the growth constraints
    apply individually to the "New" and "Retrofit" agent, when present.
 
    If any of the three parameters are not provided in the technodata file, that particular constraint is not applied.
 
+GrowthSeed (optional, default = 1)
+    applies a lower-bound on the initial capacity value used in the MaxCapacityGrowth calculation, allowing growth to initiate when capacity is low/zero.
+
+    Taking the above example, if the GrowthSeed is set to 10 PJ (higher than the existing capacity of 7.7 PJ), the MaxCapacityGrowth constraint will be applied as follows:
+    10 x (1 + 0.2)\ :sup:`5` - 4.9 = 19.9 PJ.
 
 TechnicalLife
    represents the number of years that a technology operates before it is decommissioned.
diff --git a/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv b/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv
index d3f0aeb8..b37838e0 100644
--- a/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/add-agent/1-single-objective/Results/MCACapacity.csv
@@ -6,115 +6,117 @@ A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
 A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
 A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
-A1,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2025
+A1,1.90630000000,R1,2025,R1,residential,gasboiler,newcapa,2025
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2025
 A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
 A2,9.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2025
 A1,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
-A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2025
+A1,1.18750000000,R1,2025,R1,power,gasCCGT,newcapa,2025
 A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
-A2,3.62500000000,R1,2025,R1,power,windturbine,newcapa,2025
+A2,2.67190000000,R1,2025,R1,power,windturbine,newcapa,2025
 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
-A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2025
+A1,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2025
 A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
-A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2025
-A1,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A2,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2025
+A1,1.90630000000,R1,2025,R1,residential,gasboiler,newcapa,2030
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2030
 A1,5.50000000000,R1,2030,R1,residential,heatpump,newcapa,2030
 A2,9.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2030
 A2,5.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2030
-A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,1.18750000000,R1,2025,R1,power,gasCCGT,newcapa,2030
 A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2030
-A2,3.62500000000,R1,2025,R1,power,windturbine,newcapa,2030
+A2,2.67190000000,R1,2025,R1,power,windturbine,newcapa,2030
 A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2030
 A1,3.75000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
-A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2030
 A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2030
 A2,3.75000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
-A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A2,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2030
 A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2030
 A1,5.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035
 A1,12.50000000000,R1,2035,R1,residential,heatpump,newcapa,2035
 A2,5.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2035
 A2,12.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2035
-A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,1.18750000000,R1,2025,R1,power,gasCCGT,newcapa,2035
 A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2035
-A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2035
-A2,3.62500000000,R1,2025,R1,power,windturbine,newcapa,2035
+A1,2.45310000000,R1,2035,R1,power,windturbine,newcapa,2035
+A2,2.67190000000,R1,2025,R1,power,windturbine,newcapa,2035
 A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2035
-A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2035
-A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A2,2.45310000000,R1,2035,R1,power,windturbine,newcapa,2035
+A1,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2035
 A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2035
-A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2035
-A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,4.45490000000,R1,2035,R1,gas,gassupply1,newcapa,2035
+A2,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2035
 A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2035
-A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2035
+A2,4.45490000000,R1,2035,R1,gas,gassupply1,newcapa,2035
 A1,12.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040
 A1,8.50000000000,R1,2040,R1,residential,heatpump,newcapa,2040
 A2,12.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2040
 A2,8.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2040
-A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,1.18750000000,R1,2025,R1,power,gasCCGT,newcapa,2040
 A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2040
-A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,2.45310000000,R1,2035,R1,power,windturbine,newcapa,2040
 A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2040
-A2,3.62500000000,R1,2025,R1,power,windturbine,newcapa,2040
+A2,2.67190000000,R1,2025,R1,power,windturbine,newcapa,2040
 A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2040
-A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2040
+A2,2.45310000000,R1,2035,R1,power,windturbine,newcapa,2040
 A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2040
-A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2040
 A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2040
-A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2040
+A1,4.45490000000,R1,2035,R1,gas,gassupply1,newcapa,2040
 A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2040
-A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A2,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2040
 A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2040
-A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2040
+A2,4.45490000000,R1,2035,R1,gas,gassupply1,newcapa,2040
 A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2040
 A1,8.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045
 A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2045
 A2,8.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2045
 A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2045
-A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,1.18750000000,R1,2025,R1,power,gasCCGT,newcapa,2045
 A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2045
-A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,2.45310000000,R1,2035,R1,power,windturbine,newcapa,2045
 A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045
 A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2045
-A2,3.62500000000,R1,2025,R1,power,windturbine,newcapa,2045
+A2,2.67190000000,R1,2025,R1,power,windturbine,newcapa,2045
 A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2045
-A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A2,2.45310000000,R1,2035,R1,power,windturbine,newcapa,2045
 A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045
 A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2045
-A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2045
 A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045
-A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045
+A1,4.45490000000,R1,2035,R1,gas,gassupply1,newcapa,2045
 A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045
 A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045
-A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A2,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2045
 A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045
-A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045
+A2,4.45490000000,R1,2035,R1,gas,gassupply1,newcapa,2045
 A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045
 A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045
 A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
 A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050
 A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050
 A2,11.50000000000,R1,2050,R1,residential,gasboiler,newcapa,2050
-A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,1.18750000000,R1,2025,R1,power,gasCCGT,newcapa,2050
 A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050
-A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,2.45310000000,R1,2035,R1,power,windturbine,newcapa,2050
 A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
 A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
 A1,1.50000000000,R1,2050,R1,power,windturbine,newcapa,2050
 A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050
-A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A2,2.45310000000,R1,2035,R1,power,windturbine,newcapa,2050
 A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
 A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
-A2,3.31250000000,R1,2050,R1,power,windturbine,newcapa,2050
-A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A2,2.83590000000,R1,2050,R1,power,windturbine,newcapa,2050
+A1,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2050
 A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050
-A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050
+A1,4.45490000000,R1,2035,R1,gas,gassupply1,newcapa,2050
 A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
 A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050
 A1,1.93330000000,R1,2050,R1,gas,gassupply1,newcapa,2050
-A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A2,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2050
 A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050
-A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050
+A2,4.45490000000,R1,2035,R1,gas,gassupply1,newcapa,2050
 A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
 A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050
 A2,1.93330000000,R1,2050,R1,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv
index 94c5c057..fb9bc9d0 100644
--- a/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/add-agent/1-single-objective/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
-electricity,all-week,night,all-year,19.35880000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,19.42410000000,R1,0,MUS$2010/PJ,2025
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,11.24720000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,11.37460000000,R1,0,MUS$2010/PJ,2025
 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
-electricity,all-week,morning,all-year,19.35880000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,19.42410000000,R1,1,MUS$2010/PJ,2025
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,11.24720000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,11.37460000000,R1,1,MUS$2010/PJ,2025
 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
-electricity,all-week,afternoon,all-year,19.35880000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,19.42410000000,R1,2,MUS$2010/PJ,2025
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,11.24720000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,11.37460000000,R1,2,MUS$2010/PJ,2025
 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
-electricity,all-week,early-peak,all-year,19.35880000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,19.42410000000,R1,3,MUS$2010/PJ,2025
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,11.24720000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,11.37460000000,R1,3,MUS$2010/PJ,2025
 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
-electricity,all-week,late-peak,all-year,19.35880000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,19.42410000000,R1,4,MUS$2010/PJ,2025
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,11.24720000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,11.37460000000,R1,4,MUS$2010/PJ,2025
 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
-electricity,all-week,evening,all-year,19.35880000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,19.42410000000,R1,5,MUS$2010/PJ,2025
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,11.24720000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,11.37460000000,R1,5,MUS$2010/PJ,2025
 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
-electricity,all-week,night,all-year,19.34890000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,19.13900000000,R1,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,12.28380000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,12.49450000000,R1,0,MUS$2010/PJ,2030
 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
-electricity,all-week,morning,all-year,19.34890000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,19.13900000000,R1,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,12.28380000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,12.49450000000,R1,1,MUS$2010/PJ,2030
 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
-electricity,all-week,afternoon,all-year,19.34890000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,afternoon,all-year,19.13900000000,R1,2,MUS$2010/PJ,2030
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,12.28380000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,12.49450000000,R1,2,MUS$2010/PJ,2030
 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
-electricity,all-week,early-peak,all-year,19.34890000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,19.13900000000,R1,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,12.28380000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,12.49450000000,R1,3,MUS$2010/PJ,2030
 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
-electricity,all-week,late-peak,all-year,19.34890000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,19.13900000000,R1,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,12.28380000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,12.49450000000,R1,4,MUS$2010/PJ,2030
 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
-electricity,all-week,evening,all-year,19.34890000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,19.13900000000,R1,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,12.28380000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,12.49450000000,R1,5,MUS$2010/PJ,2030
 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
-electricity,all-week,night,all-year,20.19260000000,R1,0,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,19.61600000000,R1,0,MUS$2010/PJ,2035
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035
-heat,all-week,night,all-year,14.32520000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,14.20990000000,R1,0,MUS$2010/PJ,2035
 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
-electricity,all-week,morning,all-year,20.19260000000,R1,1,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,19.61600000000,R1,1,MUS$2010/PJ,2035
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035
-heat,all-week,morning,all-year,14.32520000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,14.20990000000,R1,1,MUS$2010/PJ,2035
 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
-electricity,all-week,afternoon,all-year,20.19260000000,R1,2,MUS$2010/PJ,2035
+electricity,all-week,afternoon,all-year,19.61600000000,R1,2,MUS$2010/PJ,2035
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035
-heat,all-week,afternoon,all-year,14.32520000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,14.20990000000,R1,2,MUS$2010/PJ,2035
 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
-electricity,all-week,early-peak,all-year,20.19260000000,R1,3,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,19.61600000000,R1,3,MUS$2010/PJ,2035
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035
-heat,all-week,early-peak,all-year,14.32520000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,14.20990000000,R1,3,MUS$2010/PJ,2035
 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
-electricity,all-week,late-peak,all-year,20.19260000000,R1,4,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,19.61600000000,R1,4,MUS$2010/PJ,2035
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035
-heat,all-week,late-peak,all-year,14.32520000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,14.20990000000,R1,4,MUS$2010/PJ,2035
 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
-electricity,all-week,evening,all-year,20.19260000000,R1,5,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,19.61600000000,R1,5,MUS$2010/PJ,2035
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035
-heat,all-week,evening,all-year,14.32520000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,14.20990000000,R1,5,MUS$2010/PJ,2035
 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
-electricity,all-week,night,all-year,20.79520000000,R1,0,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,20.06020000000,R1,0,MUS$2010/PJ,2040
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040
-heat,all-week,night,all-year,16.31840000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,16.17140000000,R1,0,MUS$2010/PJ,2040
 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
-electricity,all-week,morning,all-year,20.79520000000,R1,1,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,20.06020000000,R1,1,MUS$2010/PJ,2040
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040
-heat,all-week,morning,all-year,16.31840000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,16.17140000000,R1,1,MUS$2010/PJ,2040
 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
-electricity,all-week,afternoon,all-year,20.79520000000,R1,2,MUS$2010/PJ,2040
+electricity,all-week,afternoon,all-year,20.06020000000,R1,2,MUS$2010/PJ,2040
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040
-heat,all-week,afternoon,all-year,16.31840000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,16.17140000000,R1,2,MUS$2010/PJ,2040
 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
-electricity,all-week,early-peak,all-year,20.79520000000,R1,3,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,20.06020000000,R1,3,MUS$2010/PJ,2040
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040
-heat,all-week,early-peak,all-year,16.31840000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,16.17140000000,R1,3,MUS$2010/PJ,2040
 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
-electricity,all-week,late-peak,all-year,20.79520000000,R1,4,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,20.06020000000,R1,4,MUS$2010/PJ,2040
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040
-heat,all-week,late-peak,all-year,16.31840000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,16.17140000000,R1,4,MUS$2010/PJ,2040
 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
-electricity,all-week,evening,all-year,20.79520000000,R1,5,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,20.06020000000,R1,5,MUS$2010/PJ,2040
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040
-heat,all-week,evening,all-year,16.31840000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,16.17140000000,R1,5,MUS$2010/PJ,2040
 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
-electricity,all-week,night,all-year,21.57000000000,R1,0,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,20.63130000000,R1,0,MUS$2010/PJ,2045
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045
-heat,all-week,night,all-year,19.10030000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,18.91250000000,R1,0,MUS$2010/PJ,2045
 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
-electricity,all-week,morning,all-year,21.57000000000,R1,1,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,20.63130000000,R1,1,MUS$2010/PJ,2045
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045
-heat,all-week,morning,all-year,19.10030000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,18.91250000000,R1,1,MUS$2010/PJ,2045
 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
-electricity,all-week,afternoon,all-year,21.57000000000,R1,2,MUS$2010/PJ,2045
+electricity,all-week,afternoon,all-year,20.63130000000,R1,2,MUS$2010/PJ,2045
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045
-heat,all-week,afternoon,all-year,19.10030000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,18.91250000000,R1,2,MUS$2010/PJ,2045
 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
-electricity,all-week,early-peak,all-year,21.57000000000,R1,3,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,20.63130000000,R1,3,MUS$2010/PJ,2045
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045
-heat,all-week,early-peak,all-year,19.10030000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,18.91250000000,R1,3,MUS$2010/PJ,2045
 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
-electricity,all-week,late-peak,all-year,21.57000000000,R1,4,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,20.63130000000,R1,4,MUS$2010/PJ,2045
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045
-heat,all-week,late-peak,all-year,19.10030000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,18.91250000000,R1,4,MUS$2010/PJ,2045
 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
-electricity,all-week,evening,all-year,21.57000000000,R1,5,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,20.63130000000,R1,5,MUS$2010/PJ,2045
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
-heat,all-week,evening,all-year,19.10030000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,18.91250000000,R1,5,MUS$2010/PJ,2045
 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
-electricity,all-week,night,all-year,21.69980000000,R1,0,MUS$2010/PJ,2050
+electricity,all-week,night,all-year,20.65050000000,R1,0,MUS$2010/PJ,2050
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
-heat,all-week,night,all-year,21.75320000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,21.54330000000,R1,0,MUS$2010/PJ,2050
 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
-electricity,all-week,morning,all-year,21.69980000000,R1,1,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,20.65050000000,R1,1,MUS$2010/PJ,2050
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
-heat,all-week,morning,all-year,21.75320000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,21.54330000000,R1,1,MUS$2010/PJ,2050
 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
-electricity,all-week,afternoon,all-year,21.69980000000,R1,2,MUS$2010/PJ,2050
+electricity,all-week,afternoon,all-year,20.65050000000,R1,2,MUS$2010/PJ,2050
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
-heat,all-week,afternoon,all-year,21.75320000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,21.54330000000,R1,2,MUS$2010/PJ,2050
 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
-electricity,all-week,early-peak,all-year,21.69980000000,R1,3,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,20.65050000000,R1,3,MUS$2010/PJ,2050
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
-heat,all-week,early-peak,all-year,21.75320000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,21.54330000000,R1,3,MUS$2010/PJ,2050
 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
-electricity,all-week,late-peak,all-year,21.69980000000,R1,4,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,20.65050000000,R1,4,MUS$2010/PJ,2050
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
-heat,all-week,late-peak,all-year,21.75320000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,21.54330000000,R1,4,MUS$2010/PJ,2050
 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
-electricity,all-week,evening,all-year,21.69980000000,R1,5,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,20.65050000000,R1,5,MUS$2010/PJ,2050
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
-heat,all-week,evening,all-year,21.75320000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,21.54330000000,R1,5,MUS$2010/PJ,2050
 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv
index 08471d84..a708467e 100644
--- a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv
+++ b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCACapacity.csv
@@ -6,113 +6,113 @@ A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
 A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
 A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
-A1,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2025
+A1,1.90630000000,R1,2025,R1,residential,gasboiler,newcapa,2025
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2025
 A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
 A2,9.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2025
 A1,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
-A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2025
+A1,1.18750000000,R1,2025,R1,power,gasCCGT,newcapa,2025
 A2,0.50000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
-A2,3.62500000000,R1,2025,R1,power,windturbine,newcapa,2025
+A2,2.67190000000,R1,2025,R1,power,windturbine,newcapa,2025
 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
-A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2025
+A1,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2025
 A2,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
-A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2025
-A1,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A2,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2025
+A1,1.90630000000,R1,2025,R1,residential,gasboiler,newcapa,2030
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2030
 A1,5.50000000000,R1,2030,R1,residential,heatpump,newcapa,2030
 A2,9.50000000000,R1,2025,R1,residential,gasboiler,newcapa,2030
 A2,5.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2030
-A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,1.18750000000,R1,2025,R1,power,gasCCGT,newcapa,2030
 A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2030
-A2,3.62500000000,R1,2025,R1,power,windturbine,newcapa,2030
+A2,2.67190000000,R1,2025,R1,power,windturbine,newcapa,2030
 A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2030
 A1,3.75000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
-A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2030
 A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2030
 A2,3.75000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
-A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A2,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2030
 A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2030
 A1,5.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035
 A1,12.50000000000,R1,2035,R1,residential,heatpump,newcapa,2035
 A2,5.50000000000,R1,2030,R1,residential,gasboiler,newcapa,2035
 A2,12.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2035
-A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,1.18750000000,R1,2025,R1,power,gasCCGT,newcapa,2035
 A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2035
-A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2035
-A2,3.62500000000,R1,2025,R1,power,windturbine,newcapa,2035
+A1,2.45310000000,R1,2035,R1,power,windturbine,newcapa,2035
+A2,2.67190000000,R1,2025,R1,power,windturbine,newcapa,2035
 A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2035
-A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2035
-A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A2,2.45310000000,R1,2035,R1,power,windturbine,newcapa,2035
+A1,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2035
 A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2035
-A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2035
-A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,4.45490000000,R1,2035,R1,gas,gassupply1,newcapa,2035
+A2,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2035
 A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2035
-A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2035
+A2,4.45490000000,R1,2035,R1,gas,gassupply1,newcapa,2035
 A1,12.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040
 A1,8.50000000000,R1,2040,R1,residential,heatpump,newcapa,2040
 A2,12.50000000000,R1,2035,R1,residential,gasboiler,newcapa,2040
 A2,8.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2040
-A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,1.18750000000,R1,2025,R1,power,gasCCGT,newcapa,2040
 A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2040
-A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,2.45310000000,R1,2035,R1,power,windturbine,newcapa,2040
 A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2040
-A2,3.62500000000,R1,2025,R1,power,windturbine,newcapa,2040
+A2,2.67190000000,R1,2025,R1,power,windturbine,newcapa,2040
 A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2040
-A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2040
+A2,2.45310000000,R1,2035,R1,power,windturbine,newcapa,2040
 A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2040
-A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2040
 A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2040
-A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2040
+A1,4.45490000000,R1,2035,R1,gas,gassupply1,newcapa,2040
 A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2040
-A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A2,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2040
 A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2040
-A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2040
+A2,4.45490000000,R1,2035,R1,gas,gassupply1,newcapa,2040
 A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2040
 A1,8.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045
 A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2045
 A2,8.50000000000,R1,2040,R1,residential,gasboiler,newcapa,2045
-A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2045
-A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A2,7.90630000000,R1,2045,R1,residential,gasboiler,newcapa,2045
+A2,7.59380000000,R1,2045,R1,residential,heatpump,newcapa,2045
+A1,1.18750000000,R1,2025,R1,power,gasCCGT,newcapa,2045
 A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2045
-A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,2.45310000000,R1,2035,R1,power,windturbine,newcapa,2045
 A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045
-A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2045
-A2,3.62500000000,R1,2025,R1,power,windturbine,newcapa,2045
+A1,5.29690000000,R1,2045,R1,power,windturbine,newcapa,2045
+A2,2.67190000000,R1,2025,R1,power,windturbine,newcapa,2045
 A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2045
-A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A2,2.45310000000,R1,2035,R1,power,windturbine,newcapa,2045
 A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2045
-A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2045
-A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A2,5.29690000000,R1,2045,R1,power,windturbine,newcapa,2045
+A1,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2045
 A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045
-A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045
+A1,4.45490000000,R1,2035,R1,gas,gassupply1,newcapa,2045
 A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045
-A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045
-A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A2,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2045
 A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2045
-A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2045
+A2,4.45490000000,R1,2035,R1,gas,gassupply1,newcapa,2045
 A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2045
-A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2045
 A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
 A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050
-A2,15.50000000000,R1,2045,R1,residential,gasboiler,newcapa,2050
+A2,7.90630000000,R1,2045,R1,residential,gasboiler,newcapa,2050
+A2,7.59380000000,R1,2045,R1,residential,heatpump,newcapa,2050
 A2,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050
-A1,1.61110000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,1.18750000000,R1,2025,R1,power,gasCCGT,newcapa,2050
 A1,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050
-A1,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,2.45310000000,R1,2035,R1,power,windturbine,newcapa,2050
 A1,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
-A1,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,5.29690000000,R1,2045,R1,power,windturbine,newcapa,2050
 A1,7.25000000000,R1,2050,R1,power,windturbine,newcapa,2050
 A2,3.87500000000,R1,2030,R1,power,windturbine,newcapa,2050
-A2,1.50000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A2,2.45310000000,R1,2035,R1,power,windturbine,newcapa,2050
 A2,1.50000000000,R1,2040,R1,power,windturbine,newcapa,2050
-A2,1.50000000000,R1,2045,R1,power,windturbine,newcapa,2050
-A2,9.06250000000,R1,2050,R1,power,windturbine,newcapa,2050
-A1,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A2,5.29690000000,R1,2045,R1,power,windturbine,newcapa,2050
+A2,8.58590000000,R1,2050,R1,power,windturbine,newcapa,2050
+A1,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2050
 A1,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050
-A1,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050
+A1,4.45490000000,R1,2035,R1,gas,gassupply1,newcapa,2050
 A1,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
-A1,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050
-A2,4.02470000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A2,4.89950000000,R1,2025,R1,gas,gassupply1,newcapa,2050
 A2,3.23720000000,R1,2030,R1,gas,gassupply1,newcapa,2050
-A2,5.68330000000,R1,2035,R1,gas,gassupply1,newcapa,2050
+A2,4.45490000000,R1,2035,R1,gas,gassupply1,newcapa,2050
 A2,1.93330000000,R1,2040,R1,gas,gassupply1,newcapa,2050
-A2,1.93330000000,R1,2045,R1,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv
index ba2ac271..1762b677 100644
--- a/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv
+++ b/docs/tutorial-code/add-agent/2-multiple-objective/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
-electricity,all-week,night,all-year,19.35880000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,19.42410000000,R1,0,MUS$2010/PJ,2025
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,11.24720000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,11.37460000000,R1,0,MUS$2010/PJ,2025
 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
-electricity,all-week,morning,all-year,19.35880000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,19.42410000000,R1,1,MUS$2010/PJ,2025
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,11.24720000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,11.37460000000,R1,1,MUS$2010/PJ,2025
 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
-electricity,all-week,afternoon,all-year,19.35880000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,19.42410000000,R1,2,MUS$2010/PJ,2025
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,11.24720000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,11.37460000000,R1,2,MUS$2010/PJ,2025
 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
-electricity,all-week,early-peak,all-year,19.35880000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,19.42410000000,R1,3,MUS$2010/PJ,2025
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,11.24720000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,11.37460000000,R1,3,MUS$2010/PJ,2025
 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
-electricity,all-week,late-peak,all-year,19.35880000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,19.42410000000,R1,4,MUS$2010/PJ,2025
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,11.24720000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,11.37460000000,R1,4,MUS$2010/PJ,2025
 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
-electricity,all-week,evening,all-year,19.35880000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,19.42410000000,R1,5,MUS$2010/PJ,2025
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,11.24720000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,11.37460000000,R1,5,MUS$2010/PJ,2025
 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
-electricity,all-week,night,all-year,19.34890000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,19.13900000000,R1,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,12.28380000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,12.49450000000,R1,0,MUS$2010/PJ,2030
 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
-electricity,all-week,morning,all-year,19.34890000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,19.13900000000,R1,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,12.28380000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,12.49450000000,R1,1,MUS$2010/PJ,2030
 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
-electricity,all-week,afternoon,all-year,19.34890000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,afternoon,all-year,19.13900000000,R1,2,MUS$2010/PJ,2030
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,12.28380000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,12.49450000000,R1,2,MUS$2010/PJ,2030
 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
-electricity,all-week,early-peak,all-year,19.34890000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,19.13900000000,R1,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,12.28380000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,12.49450000000,R1,3,MUS$2010/PJ,2030
 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
-electricity,all-week,late-peak,all-year,19.34890000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,19.13900000000,R1,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,12.28380000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,12.49450000000,R1,4,MUS$2010/PJ,2030
 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
-electricity,all-week,evening,all-year,19.34890000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,19.13900000000,R1,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,12.28380000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,12.49450000000,R1,5,MUS$2010/PJ,2030
 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
-electricity,all-week,night,all-year,20.19260000000,R1,0,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,19.61600000000,R1,0,MUS$2010/PJ,2035
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035
-heat,all-week,night,all-year,14.32520000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,14.20990000000,R1,0,MUS$2010/PJ,2035
 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
-electricity,all-week,morning,all-year,20.19260000000,R1,1,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,19.61600000000,R1,1,MUS$2010/PJ,2035
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035
-heat,all-week,morning,all-year,14.32520000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,14.20990000000,R1,1,MUS$2010/PJ,2035
 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
-electricity,all-week,afternoon,all-year,20.19260000000,R1,2,MUS$2010/PJ,2035
+electricity,all-week,afternoon,all-year,19.61600000000,R1,2,MUS$2010/PJ,2035
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035
-heat,all-week,afternoon,all-year,14.32520000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,14.20990000000,R1,2,MUS$2010/PJ,2035
 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
-electricity,all-week,early-peak,all-year,20.19260000000,R1,3,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,19.61600000000,R1,3,MUS$2010/PJ,2035
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035
-heat,all-week,early-peak,all-year,14.32520000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,14.20990000000,R1,3,MUS$2010/PJ,2035
 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
-electricity,all-week,late-peak,all-year,20.19260000000,R1,4,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,19.61600000000,R1,4,MUS$2010/PJ,2035
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035
-heat,all-week,late-peak,all-year,14.32520000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,14.20990000000,R1,4,MUS$2010/PJ,2035
 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
-electricity,all-week,evening,all-year,20.19260000000,R1,5,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,19.61600000000,R1,5,MUS$2010/PJ,2035
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035
-heat,all-week,evening,all-year,14.32520000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,14.20990000000,R1,5,MUS$2010/PJ,2035
 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
-electricity,all-week,night,all-year,20.79520000000,R1,0,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,20.06020000000,R1,0,MUS$2010/PJ,2040
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040
-heat,all-week,night,all-year,16.31840000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,16.17140000000,R1,0,MUS$2010/PJ,2040
 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
-electricity,all-week,morning,all-year,20.79520000000,R1,1,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,20.06020000000,R1,1,MUS$2010/PJ,2040
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040
-heat,all-week,morning,all-year,16.31840000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,16.17140000000,R1,1,MUS$2010/PJ,2040
 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
-electricity,all-week,afternoon,all-year,20.79520000000,R1,2,MUS$2010/PJ,2040
+electricity,all-week,afternoon,all-year,20.06020000000,R1,2,MUS$2010/PJ,2040
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040
-heat,all-week,afternoon,all-year,16.31840000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,16.17140000000,R1,2,MUS$2010/PJ,2040
 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
-electricity,all-week,early-peak,all-year,20.79520000000,R1,3,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,20.06020000000,R1,3,MUS$2010/PJ,2040
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040
-heat,all-week,early-peak,all-year,16.31840000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,16.17140000000,R1,3,MUS$2010/PJ,2040
 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
-electricity,all-week,late-peak,all-year,20.79520000000,R1,4,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,20.06020000000,R1,4,MUS$2010/PJ,2040
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040
-heat,all-week,late-peak,all-year,16.31840000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,16.17140000000,R1,4,MUS$2010/PJ,2040
 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
-electricity,all-week,evening,all-year,20.79520000000,R1,5,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,20.06020000000,R1,5,MUS$2010/PJ,2040
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040
-heat,all-week,evening,all-year,16.31840000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,16.17140000000,R1,5,MUS$2010/PJ,2040
 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
-electricity,all-week,night,all-year,21.57000000000,R1,0,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,19.99880000000,R1,0,MUS$2010/PJ,2045
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045
-heat,all-week,night,all-year,19.10030000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,16.19500000000,R1,0,MUS$2010/PJ,2045
 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
-electricity,all-week,morning,all-year,21.57000000000,R1,1,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,19.99880000000,R1,1,MUS$2010/PJ,2045
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045
-heat,all-week,morning,all-year,19.10030000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,16.19500000000,R1,1,MUS$2010/PJ,2045
 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
-electricity,all-week,afternoon,all-year,21.57000000000,R1,2,MUS$2010/PJ,2045
+electricity,all-week,afternoon,all-year,19.99880000000,R1,2,MUS$2010/PJ,2045
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045
-heat,all-week,afternoon,all-year,19.10030000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,16.19500000000,R1,2,MUS$2010/PJ,2045
 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
-electricity,all-week,early-peak,all-year,21.57000000000,R1,3,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,19.99880000000,R1,3,MUS$2010/PJ,2045
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045
-heat,all-week,early-peak,all-year,19.10030000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,16.19500000000,R1,3,MUS$2010/PJ,2045
 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
-electricity,all-week,late-peak,all-year,21.57000000000,R1,4,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,19.99880000000,R1,4,MUS$2010/PJ,2045
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045
-heat,all-week,late-peak,all-year,19.10030000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,16.19500000000,R1,4,MUS$2010/PJ,2045
 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
-electricity,all-week,evening,all-year,21.57000000000,R1,5,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,19.99880000000,R1,5,MUS$2010/PJ,2045
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
-heat,all-week,evening,all-year,19.10030000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,16.19500000000,R1,5,MUS$2010/PJ,2045
 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
-electricity,all-week,night,all-year,20.51220000000,R1,0,MUS$2010/PJ,2050
+electricity,all-week,night,all-year,19.50270000000,R1,0,MUS$2010/PJ,2050
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
-heat,all-week,night,all-year,16.95260000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,13.59480000000,R1,0,MUS$2010/PJ,2050
 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
-electricity,all-week,morning,all-year,20.51220000000,R1,1,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,19.50270000000,R1,1,MUS$2010/PJ,2050
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
-heat,all-week,morning,all-year,16.95260000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,13.59480000000,R1,1,MUS$2010/PJ,2050
 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
-electricity,all-week,afternoon,all-year,20.51220000000,R1,2,MUS$2010/PJ,2050
+electricity,all-week,afternoon,all-year,19.50270000000,R1,2,MUS$2010/PJ,2050
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
-heat,all-week,afternoon,all-year,16.95260000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,13.59480000000,R1,2,MUS$2010/PJ,2050
 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
-electricity,all-week,early-peak,all-year,20.51220000000,R1,3,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,19.50270000000,R1,3,MUS$2010/PJ,2050
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
-heat,all-week,early-peak,all-year,16.95260000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,13.59480000000,R1,3,MUS$2010/PJ,2050
 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
-electricity,all-week,late-peak,all-year,20.51220000000,R1,4,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,19.50270000000,R1,4,MUS$2010/PJ,2050
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
-heat,all-week,late-peak,all-year,16.95260000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,13.59480000000,R1,4,MUS$2010/PJ,2050
 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
-electricity,all-week,evening,all-year,20.51220000000,R1,5,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,19.50270000000,R1,5,MUS$2010/PJ,2050
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
-heat,all-week,evening,all-year,16.95260000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,13.59480000000,R1,5,MUS$2010/PJ,2050
 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv
index 0c2b73d2..4ee3bcd5 100644
--- a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv
+++ b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCACapacity.csv
@@ -3,48 +3,55 @@ A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
-A1,11.86320000000,R1,2025,R1,residential,heatpump,newcapa,2025
+A1,4.26950000000,R1,2025,R1,residential,gasboiler,newcapa,2025
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2025
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
-A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2025
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2025
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
-A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2025
-A1,11.86320000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,2.58360000000,R1,2025,R1,gas,gassupply1,newcapa,2025
+A1,4.26950000000,R1,2025,R1,residential,gasboiler,newcapa,2030
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2030
 A1,5.66060000000,R1,2030,R1,residential,heatpump,newcapa,2030
-A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2030
-A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2030
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,0.14080000000,R1,2030,R1,power,gasCCGT,newcapa,2030
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2030
 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
-A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,2.58360000000,R1,2025,R1,gas,gassupply1,newcapa,2030
 A1,5.66060000000,R1,2030,R1,residential,heatpump,newcapa,2035
 A1,12.35690000000,R1,2035,R1,residential,heatpump,newcapa,2035
-A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2035
-A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2035
-A1,0.49370000000,R1,2035,R1,power,windturbine,newcapa,2035
-A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2035
-A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2035
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,0.14080000000,R1,2030,R1,power,gasCCGT,newcapa,2035
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2035
+A1,4.76310000000,R1,2035,R1,power,windturbine,newcapa,2035
+A1,2.58360000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,1.61790000000,R1,2035,R1,gas,gassupply1,newcapa,2035
 A1,12.35690000000,R1,2035,R1,residential,heatpump,newcapa,2040
 A1,6.15260000000,R1,2040,R1,residential,heatpump,newcapa,2040
-A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2040
-A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2040
-A1,0.49370000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,0.14080000000,R1,2030,R1,power,gasCCGT,newcapa,2040
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2040
+A1,4.76310000000,R1,2035,R1,power,windturbine,newcapa,2040
 A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2040
-A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2040
-A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2040
+A1,2.58360000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,1.61790000000,R1,2035,R1,gas,gassupply1,newcapa,2040
 A1,6.15260000000,R1,2040,R1,residential,heatpump,newcapa,2045
 A1,12.67390000000,R1,2045,R1,residential,heatpump,newcapa,2045
-A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2045
-A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2045
-A1,0.49370000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,0.14080000000,R1,2030,R1,power,gasCCGT,newcapa,2045
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2045
+A1,4.76310000000,R1,2035,R1,power,windturbine,newcapa,2045
 A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2045
 A1,0.31700000000,R1,2045,R1,power,windturbine,newcapa,2045
-A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2045
-A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2045
+A1,2.58360000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,1.61790000000,R1,2035,R1,gas,gassupply1,newcapa,2045
 A1,12.67390000000,R1,2045,R1,residential,heatpump,newcapa,2050
 A1,6.46840000000,R1,2050,R1,residential,heatpump,newcapa,2050
-A1,4.27250000000,R1,2025,R1,power,gasCCGT,newcapa,2050
-A1,7.91060000000,R1,2030,R1,power,windturbine,newcapa,2050
-A1,0.49370000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,0.14080000000,R1,2030,R1,power,gasCCGT,newcapa,2050
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,4.76310000000,R1,2035,R1,power,windturbine,newcapa,2050
 A1,0.49190000000,R1,2040,R1,power,windturbine,newcapa,2050
 A1,0.31700000000,R1,2045,R1,power,windturbine,newcapa,2050
 A1,0.31590000000,R1,2050,R1,power,windturbine,newcapa,2050
-A1,0.24960000000,R1,2025,R1,gas,gassupply1,newcapa,2050
-A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2050
+A1,2.58360000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,1.61790000000,R1,2035,R1,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv
index f806474f..c6fe8af2 100644
--- a/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv
+++ b/docs/tutorial-code/add-correlation-demand/1-correlation/Results/MCAPrices.csv
@@ -25,145 +25,145 @@ heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
 electricity,all-week,night,all-year,20.19960000000,R1,0,MUS$2010/PJ,2025
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,11.02330000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,11.31770000000,R1,0,MUS$2010/PJ,2025
 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
 electricity,all-week,morning,all-year,20.19960000000,R1,1,MUS$2010/PJ,2025
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,11.02330000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,11.31770000000,R1,1,MUS$2010/PJ,2025
 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
 electricity,all-week,afternoon,all-year,20.19960000000,R1,2,MUS$2010/PJ,2025
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,11.02330000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,11.31770000000,R1,2,MUS$2010/PJ,2025
 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
 electricity,all-week,early-peak,all-year,20.19960000000,R1,3,MUS$2010/PJ,2025
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,11.02330000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,11.31770000000,R1,3,MUS$2010/PJ,2025
 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
 electricity,all-week,late-peak,all-year,20.19960000000,R1,4,MUS$2010/PJ,2025
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,11.02330000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,11.31770000000,R1,4,MUS$2010/PJ,2025
 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
 electricity,all-week,evening,all-year,20.19960000000,R1,5,MUS$2010/PJ,2025
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,11.02330000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,11.31770000000,R1,5,MUS$2010/PJ,2025
 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
-electricity,all-week,night,all-year,21.06740000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,20.38980000000,R1,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,11.02560000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,11.60160000000,R1,0,MUS$2010/PJ,2030
 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
-electricity,all-week,morning,all-year,21.06740000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,20.38980000000,R1,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,11.02560000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,11.60160000000,R1,1,MUS$2010/PJ,2030
 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
-electricity,all-week,afternoon,all-year,21.06740000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,afternoon,all-year,20.38980000000,R1,2,MUS$2010/PJ,2030
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,11.02560000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,11.60160000000,R1,2,MUS$2010/PJ,2030
 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
-electricity,all-week,early-peak,all-year,21.06740000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,20.38980000000,R1,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,11.02560000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,11.60160000000,R1,3,MUS$2010/PJ,2030
 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
-electricity,all-week,late-peak,all-year,21.06740000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,20.38980000000,R1,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,11.02560000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,11.60160000000,R1,4,MUS$2010/PJ,2030
 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
-electricity,all-week,evening,all-year,21.06740000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,20.38980000000,R1,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,11.02560000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,11.60160000000,R1,5,MUS$2010/PJ,2030
 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
-electricity,all-week,night,all-year,23.81450000000,R1,0,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,21.42720000000,R1,0,MUS$2010/PJ,2035
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035
-heat,all-week,night,all-year,12.12440000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,11.16950000000,R1,0,MUS$2010/PJ,2035
 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
-electricity,all-week,morning,all-year,23.81450000000,R1,1,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,21.42720000000,R1,1,MUS$2010/PJ,2035
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035
-heat,all-week,morning,all-year,12.12440000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,11.16950000000,R1,1,MUS$2010/PJ,2035
 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
-electricity,all-week,afternoon,all-year,23.81450000000,R1,2,MUS$2010/PJ,2035
+electricity,all-week,afternoon,all-year,21.42720000000,R1,2,MUS$2010/PJ,2035
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035
-heat,all-week,afternoon,all-year,12.12440000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,11.16950000000,R1,2,MUS$2010/PJ,2035
 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
-electricity,all-week,early-peak,all-year,23.81450000000,R1,3,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,21.42720000000,R1,3,MUS$2010/PJ,2035
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035
-heat,all-week,early-peak,all-year,12.12440000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,11.16950000000,R1,3,MUS$2010/PJ,2035
 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
-electricity,all-week,late-peak,all-year,23.81450000000,R1,4,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,21.42720000000,R1,4,MUS$2010/PJ,2035
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035
-heat,all-week,late-peak,all-year,12.12440000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,11.16950000000,R1,4,MUS$2010/PJ,2035
 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
-electricity,all-week,evening,all-year,23.81450000000,R1,5,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,21.42720000000,R1,5,MUS$2010/PJ,2035
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035
-heat,all-week,evening,all-year,12.12440000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,11.16950000000,R1,5,MUS$2010/PJ,2035
 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
-electricity,all-week,night,all-year,26.41580000000,R1,0,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,22.95890000000,R1,0,MUS$2010/PJ,2040
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040
-heat,all-week,night,all-year,13.16500000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,11.78220000000,R1,0,MUS$2010/PJ,2040
 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
-electricity,all-week,morning,all-year,26.41580000000,R1,1,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,22.95890000000,R1,1,MUS$2010/PJ,2040
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040
-heat,all-week,morning,all-year,13.16500000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,11.78220000000,R1,1,MUS$2010/PJ,2040
 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
-electricity,all-week,afternoon,all-year,26.41580000000,R1,2,MUS$2010/PJ,2040
+electricity,all-week,afternoon,all-year,22.95890000000,R1,2,MUS$2010/PJ,2040
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040
-heat,all-week,afternoon,all-year,13.16500000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,11.78220000000,R1,2,MUS$2010/PJ,2040
 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
-electricity,all-week,early-peak,all-year,26.41580000000,R1,3,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,22.95890000000,R1,3,MUS$2010/PJ,2040
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040
-heat,all-week,early-peak,all-year,13.16500000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,11.78220000000,R1,3,MUS$2010/PJ,2040
 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
-electricity,all-week,late-peak,all-year,26.41580000000,R1,4,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,22.95890000000,R1,4,MUS$2010/PJ,2040
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040
-heat,all-week,late-peak,all-year,13.16500000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,11.78220000000,R1,4,MUS$2010/PJ,2040
 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
-electricity,all-week,evening,all-year,26.41580000000,R1,5,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,22.95890000000,R1,5,MUS$2010/PJ,2040
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040
-heat,all-week,evening,all-year,13.16500000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,11.78220000000,R1,5,MUS$2010/PJ,2040
 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
-electricity,all-week,night,all-year,30.07470000000,R1,0,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,25.11340000000,R1,0,MUS$2010/PJ,2045
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045
-heat,all-week,night,all-year,14.62850000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,12.64400000000,R1,0,MUS$2010/PJ,2045
 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
-electricity,all-week,morning,all-year,30.07470000000,R1,1,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,25.11340000000,R1,1,MUS$2010/PJ,2045
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045
-heat,all-week,morning,all-year,14.62850000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,12.64400000000,R1,1,MUS$2010/PJ,2045
 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
-electricity,all-week,afternoon,all-year,30.07470000000,R1,2,MUS$2010/PJ,2045
+electricity,all-week,afternoon,all-year,25.11340000000,R1,2,MUS$2010/PJ,2045
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045
-heat,all-week,afternoon,all-year,14.62850000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,12.64400000000,R1,2,MUS$2010/PJ,2045
 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
-electricity,all-week,early-peak,all-year,30.07470000000,R1,3,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,25.11340000000,R1,3,MUS$2010/PJ,2045
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045
-heat,all-week,early-peak,all-year,14.62850000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,12.64400000000,R1,3,MUS$2010/PJ,2045
 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
-electricity,all-week,late-peak,all-year,30.07470000000,R1,4,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,25.11340000000,R1,4,MUS$2010/PJ,2045
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045
-heat,all-week,late-peak,all-year,14.62850000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,12.64400000000,R1,4,MUS$2010/PJ,2045
 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
-electricity,all-week,evening,all-year,30.07470000000,R1,5,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,25.11340000000,R1,5,MUS$2010/PJ,2045
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
-heat,all-week,evening,all-year,14.62850000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,12.64400000000,R1,5,MUS$2010/PJ,2045
 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
-electricity,all-week,night,all-year,33.61330000000,R1,0,MUS$2010/PJ,2050
+electricity,all-week,night,all-year,27.19710000000,R1,0,MUS$2010/PJ,2050
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
-heat,all-week,night,all-year,16.04400000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,13.47750000000,R1,0,MUS$2010/PJ,2050
 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
-electricity,all-week,morning,all-year,33.61330000000,R1,1,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,27.19710000000,R1,1,MUS$2010/PJ,2050
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
-heat,all-week,morning,all-year,16.04400000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,13.47750000000,R1,1,MUS$2010/PJ,2050
 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
-electricity,all-week,afternoon,all-year,33.61330000000,R1,2,MUS$2010/PJ,2050
+electricity,all-week,afternoon,all-year,27.19710000000,R1,2,MUS$2010/PJ,2050
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
-heat,all-week,afternoon,all-year,16.04400000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,13.47750000000,R1,2,MUS$2010/PJ,2050
 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
-electricity,all-week,early-peak,all-year,33.61330000000,R1,3,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,27.19710000000,R1,3,MUS$2010/PJ,2050
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
-heat,all-week,early-peak,all-year,16.04400000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,13.47750000000,R1,3,MUS$2010/PJ,2050
 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
-electricity,all-week,late-peak,all-year,33.61330000000,R1,4,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,27.19710000000,R1,4,MUS$2010/PJ,2050
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
-heat,all-week,late-peak,all-year,16.04400000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,13.47750000000,R1,4,MUS$2010/PJ,2050
 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
-electricity,all-week,evening,all-year,33.61330000000,R1,5,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,27.19710000000,R1,5,MUS$2010/PJ,2050
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
-heat,all-week,evening,all-year,16.04400000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,13.47750000000,R1,5,MUS$2010/PJ,2050
 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv
index d0767bf6..02db2453 100644
--- a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv
+++ b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCACapacity.csv
@@ -3,37 +3,45 @@ A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
-A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025
+A1,11.40630000000,R1,2025,R1,residential,gasboiler,newcapa,2025
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2025
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
-A1,16.75000000000,R1,2025,R1,power,solarPV,newcapa,2025
+A1,5.34370000000,R1,2025,R1,power,solarPV,newcapa,2025
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
-A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,7.81580000000,R1,2025,R1,gas,gassupply1,newcapa,2025
+A1,11.40630000000,R1,2025,R1,residential,gasboiler,newcapa,2030
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2030
 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030
-A1,16.75000000000,R1,2025,R1,power,solarPV,newcapa,2030
+A1,5.34370000000,R1,2025,R1,power,solarPV,newcapa,2030
 A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2030
 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,7.81580000000,R1,2025,R1,gas,gassupply1,newcapa,2030
 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035
-A1,16.75000000000,R1,2025,R1,power,solarPV,newcapa,2035
+A1,5.34370000000,R1,2025,R1,power,solarPV,newcapa,2035
 A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2035
-A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2035
+A1,17.40630000000,R1,2035,R1,power,solarPV,newcapa,2035
+A1,7.81580000000,R1,2025,R1,gas,gassupply1,newcapa,2035
 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040
-A1,16.75000000000,R1,2025,R1,power,solarPV,newcapa,2040
+A1,5.34370000000,R1,2025,R1,power,solarPV,newcapa,2040
 A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2040
-A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040
+A1,17.40630000000,R1,2035,R1,power,solarPV,newcapa,2040
 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2040
+A1,7.81580000000,R1,2025,R1,gas,gassupply1,newcapa,2040
 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045
-A1,16.75000000000,R1,2025,R1,power,solarPV,newcapa,2045
+A1,5.34370000000,R1,2025,R1,power,solarPV,newcapa,2045
 A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2045
-A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045
+A1,17.40630000000,R1,2035,R1,power,solarPV,newcapa,2045
 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045
 A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045
+A1,7.81580000000,R1,2025,R1,gas,gassupply1,newcapa,2045
 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
 A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050
 A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2050
-A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A1,17.40630000000,R1,2035,R1,power,solarPV,newcapa,2050
 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
 A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
-A1,22.75000000000,R1,2050,R1,power,solarPV,newcapa,2050
+A1,11.34380000000,R1,2050,R1,power,solarPV,newcapa,2050
+A1,7.81580000000,R1,2025,R1,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv
index 46b6e12b..23fe76b5 100644
--- a/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv
+++ b/docs/tutorial-code/add-new-technology/1-introduction/Results/MCAPrices.csv
@@ -23,53 +23,53 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
-electricity,all-week,night,all-year,15.50320000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,16.45030000000,R1,0,MUS$2010/PJ,2025
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,9.78050000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,11.34620000000,R1,0,MUS$2010/PJ,2025
 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
-electricity,all-week,morning,all-year,15.50320000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,16.45030000000,R1,1,MUS$2010/PJ,2025
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,9.78050000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,11.34620000000,R1,1,MUS$2010/PJ,2025
 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
-electricity,all-week,afternoon,all-year,15.50320000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,16.45030000000,R1,2,MUS$2010/PJ,2025
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,9.78050000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,11.34620000000,R1,2,MUS$2010/PJ,2025
 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
-electricity,all-week,early-peak,all-year,15.50320000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,16.45030000000,R1,3,MUS$2010/PJ,2025
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,9.78050000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,11.34620000000,R1,3,MUS$2010/PJ,2025
 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
-electricity,all-week,late-peak,all-year,15.50320000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,16.45030000000,R1,4,MUS$2010/PJ,2025
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,9.78050000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,11.34620000000,R1,4,MUS$2010/PJ,2025
 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
-electricity,all-week,evening,all-year,15.50320000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,16.45030000000,R1,5,MUS$2010/PJ,2025
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,9.78050000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,11.34620000000,R1,5,MUS$2010/PJ,2025
 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
 electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,8.79870000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,10.70760000000,R1,0,MUS$2010/PJ,2030
 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
 electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,8.79870000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,10.70760000000,R1,1,MUS$2010/PJ,2030
 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
 electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2030
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,8.79870000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,10.70760000000,R1,2,MUS$2010/PJ,2030
 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
 electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,8.79870000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,10.70760000000,R1,3,MUS$2010/PJ,2030
 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
 electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,8.79870000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,10.70760000000,R1,4,MUS$2010/PJ,2030
 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
 electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,8.79870000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,10.70760000000,R1,5,MUS$2010/PJ,2030
 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
 electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2035
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035
diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv
index 1d0a0311..6f02f6ec 100644
--- a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv
+++ b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCACapacity.csv
@@ -3,53 +3,51 @@ A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
-A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025
+A1,11.40630000000,R1,2025,R1,residential,gasboiler,newcapa,2025
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2025
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2025
-A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2025
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2025
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2025
-A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,11.78210000000,R1,2025,R1,gas,gassupply1,newcapa,2025
+A1,11.40630000000,R1,2025,R1,residential,gasboiler,newcapa,2030
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2030
 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2030
-A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2030
-A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2030
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,7.59380000000,R1,2030,R1,power,solarPV,newcapa,2030
+A1,5.65620000000,R1,2030,R1,power,windturbine,newcapa,2030
 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,11.78210000000,R1,2025,R1,gas,gassupply1,newcapa,2030
 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2035
-A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2035
-A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2035
-A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2035
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2035
-A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2035
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,7.59380000000,R1,2030,R1,power,solarPV,newcapa,2035
+A1,17.40620000000,R1,2035,R1,power,solarPV,newcapa,2035
+A1,5.65620000000,R1,2030,R1,power,windturbine,newcapa,2035
+A1,11.78210000000,R1,2025,R1,gas,gassupply1,newcapa,2035
 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2040
-A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2040
-A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,7.59380000000,R1,2030,R1,power,solarPV,newcapa,2040
+A1,17.40620000000,R1,2035,R1,power,solarPV,newcapa,2040
 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2040
-A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2040
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2040
-A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2040
+A1,5.65620000000,R1,2030,R1,power,windturbine,newcapa,2040
+A1,11.78210000000,R1,2025,R1,gas,gassupply1,newcapa,2040
 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2045
-A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2045
-A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,7.59380000000,R1,2030,R1,power,solarPV,newcapa,2045
+A1,17.40620000000,R1,2035,R1,power,solarPV,newcapa,2045
 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045
 A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045
-A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2045
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045
-A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2045
+A1,5.65620000000,R1,2030,R1,power,windturbine,newcapa,2045
+A1,11.78210000000,R1,2025,R1,gas,gassupply1,newcapa,2045
 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
 A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050
-A1,13.25000000000,R1,2030,R1,power,solarPV,newcapa,2050
-A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,7.59380000000,R1,2030,R1,power,solarPV,newcapa,2050
+A1,17.40620000000,R1,2035,R1,power,solarPV,newcapa,2050
 A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
 A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
-A1,7.91410000000,R1,2050,R1,power,solarPV,newcapa,2050
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050
-A1,6.88560000000,R1,2035,R1,gas,gassupply1,newcapa,2050
+A1,6.00000000000,R1,2050,R1,power,solarPV,newcapa,2050
+A1,5.65620000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,11.78210000000,R1,2025,R1,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv
index 5147a8c9..6ea6a452 100644
--- a/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv
+++ b/docs/tutorial-code/add-new-technology/2-scenario/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
-electricity,all-week,night,all-year,19.97590000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,20.19730000000,R1,0,MUS$2010/PJ,2025
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,10.84880000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,11.47240000000,R1,0,MUS$2010/PJ,2025
 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
-electricity,all-week,morning,all-year,19.97590000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,20.19730000000,R1,1,MUS$2010/PJ,2025
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,10.84880000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,11.47240000000,R1,1,MUS$2010/PJ,2025
 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
-electricity,all-week,afternoon,all-year,19.97590000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,20.19730000000,R1,2,MUS$2010/PJ,2025
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,10.84880000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,11.47240000000,R1,2,MUS$2010/PJ,2025
 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
-electricity,all-week,early-peak,all-year,19.97590000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,20.19730000000,R1,3,MUS$2010/PJ,2025
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,10.84880000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,11.47240000000,R1,3,MUS$2010/PJ,2025
 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
-electricity,all-week,late-peak,all-year,19.97590000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,20.19730000000,R1,4,MUS$2010/PJ,2025
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,10.84880000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,11.47240000000,R1,4,MUS$2010/PJ,2025
 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
-electricity,all-week,evening,all-year,19.97590000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,20.19730000000,R1,5,MUS$2010/PJ,2025
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,10.84880000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,11.47240000000,R1,5,MUS$2010/PJ,2025
 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
-electricity,all-week,night,all-year,20.47430000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,19.33950000000,R1,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,10.78710000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,11.81500000000,R1,0,MUS$2010/PJ,2030
 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
-electricity,all-week,morning,all-year,20.47430000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,19.33950000000,R1,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,10.78710000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,11.81500000000,R1,1,MUS$2010/PJ,2030
 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
-electricity,all-week,afternoon,all-year,20.47430000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,afternoon,all-year,19.33950000000,R1,2,MUS$2010/PJ,2030
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,10.78710000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,11.81500000000,R1,2,MUS$2010/PJ,2030
 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
-electricity,all-week,early-peak,all-year,20.47430000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,19.33950000000,R1,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,10.78710000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,11.81500000000,R1,3,MUS$2010/PJ,2030
 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
-electricity,all-week,late-peak,all-year,20.47430000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,19.33950000000,R1,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,10.78710000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,11.81500000000,R1,4,MUS$2010/PJ,2030
 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
-electricity,all-week,evening,all-year,20.47430000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,19.33950000000,R1,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,10.78710000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,11.81500000000,R1,5,MUS$2010/PJ,2030
 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
-electricity,all-week,night,all-year,21.93380000000,R1,0,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,18.56660000000,R1,0,MUS$2010/PJ,2035
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035
-heat,all-week,night,all-year,11.37090000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,10.02400000000,R1,0,MUS$2010/PJ,2035
 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
-electricity,all-week,morning,all-year,21.93380000000,R1,1,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,18.56660000000,R1,1,MUS$2010/PJ,2035
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035
-heat,all-week,morning,all-year,11.37090000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,10.02400000000,R1,1,MUS$2010/PJ,2035
 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
-electricity,all-week,afternoon,all-year,21.93380000000,R1,2,MUS$2010/PJ,2035
+electricity,all-week,afternoon,all-year,18.56660000000,R1,2,MUS$2010/PJ,2035
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035
-heat,all-week,afternoon,all-year,11.37090000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,10.02400000000,R1,2,MUS$2010/PJ,2035
 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
-electricity,all-week,early-peak,all-year,21.93380000000,R1,3,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,18.56660000000,R1,3,MUS$2010/PJ,2035
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035
-heat,all-week,early-peak,all-year,11.37090000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,10.02400000000,R1,3,MUS$2010/PJ,2035
 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
-electricity,all-week,late-peak,all-year,21.93380000000,R1,4,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,18.56660000000,R1,4,MUS$2010/PJ,2035
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035
-heat,all-week,late-peak,all-year,11.37090000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,10.02400000000,R1,4,MUS$2010/PJ,2035
 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
-electricity,all-week,evening,all-year,21.93380000000,R1,5,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,18.56660000000,R1,5,MUS$2010/PJ,2035
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035
-heat,all-week,evening,all-year,11.37090000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,10.02400000000,R1,5,MUS$2010/PJ,2035
 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
-electricity,all-week,night,all-year,22.79930000000,R1,0,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,18.71390000000,R1,0,MUS$2010/PJ,2040
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040
-heat,all-week,night,all-year,11.71710000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,10.08300000000,R1,0,MUS$2010/PJ,2040
 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
-electricity,all-week,morning,all-year,22.79930000000,R1,1,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,18.71390000000,R1,1,MUS$2010/PJ,2040
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040
-heat,all-week,morning,all-year,11.71710000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,10.08300000000,R1,1,MUS$2010/PJ,2040
 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
-electricity,all-week,afternoon,all-year,22.79930000000,R1,2,MUS$2010/PJ,2040
+electricity,all-week,afternoon,all-year,18.71390000000,R1,2,MUS$2010/PJ,2040
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040
-heat,all-week,afternoon,all-year,11.71710000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,10.08300000000,R1,2,MUS$2010/PJ,2040
 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
-electricity,all-week,early-peak,all-year,22.79930000000,R1,3,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,18.71390000000,R1,3,MUS$2010/PJ,2040
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040
-heat,all-week,early-peak,all-year,11.71710000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,10.08300000000,R1,3,MUS$2010/PJ,2040
 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
-electricity,all-week,late-peak,all-year,22.79930000000,R1,4,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,18.71390000000,R1,4,MUS$2010/PJ,2040
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040
-heat,all-week,late-peak,all-year,11.71710000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,10.08300000000,R1,4,MUS$2010/PJ,2040
 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
-electricity,all-week,evening,all-year,22.79930000000,R1,5,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,18.71390000000,R1,5,MUS$2010/PJ,2040
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040
-heat,all-week,evening,all-year,11.71710000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,10.08300000000,R1,5,MUS$2010/PJ,2040
 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
-electricity,all-week,night,all-year,24.10890000000,R1,0,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,19.06240000000,R1,0,MUS$2010/PJ,2045
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045
-heat,all-week,night,all-year,12.24100000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,10.22240000000,R1,0,MUS$2010/PJ,2045
 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
-electricity,all-week,morning,all-year,24.10890000000,R1,1,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,19.06240000000,R1,1,MUS$2010/PJ,2045
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045
-heat,all-week,morning,all-year,12.24100000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,10.22240000000,R1,1,MUS$2010/PJ,2045
 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
-electricity,all-week,afternoon,all-year,24.10890000000,R1,2,MUS$2010/PJ,2045
+electricity,all-week,afternoon,all-year,19.06240000000,R1,2,MUS$2010/PJ,2045
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045
-heat,all-week,afternoon,all-year,12.24100000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,10.22240000000,R1,2,MUS$2010/PJ,2045
 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
-electricity,all-week,early-peak,all-year,24.10890000000,R1,3,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,19.06240000000,R1,3,MUS$2010/PJ,2045
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045
-heat,all-week,early-peak,all-year,12.24100000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,10.22240000000,R1,3,MUS$2010/PJ,2045
 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
-electricity,all-week,late-peak,all-year,24.10890000000,R1,4,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,19.06240000000,R1,4,MUS$2010/PJ,2045
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045
-heat,all-week,late-peak,all-year,12.24100000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,10.22240000000,R1,4,MUS$2010/PJ,2045
 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
-electricity,all-week,evening,all-year,24.10890000000,R1,5,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,19.06240000000,R1,5,MUS$2010/PJ,2045
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
-heat,all-week,evening,all-year,12.24100000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,10.22240000000,R1,5,MUS$2010/PJ,2045
 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
-electricity,all-week,night,all-year,25.01660000000,R1,0,MUS$2010/PJ,2050
+electricity,all-week,night,all-year,19.33340000000,R1,0,MUS$2010/PJ,2050
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
-heat,all-week,night,all-year,12.60410000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,10.33080000000,R1,0,MUS$2010/PJ,2050
 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
-electricity,all-week,morning,all-year,25.01660000000,R1,1,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,19.33340000000,R1,1,MUS$2010/PJ,2050
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
-heat,all-week,morning,all-year,12.60410000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,10.33080000000,R1,1,MUS$2010/PJ,2050
 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
-electricity,all-week,afternoon,all-year,25.01660000000,R1,2,MUS$2010/PJ,2050
+electricity,all-week,afternoon,all-year,19.33340000000,R1,2,MUS$2010/PJ,2050
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
-heat,all-week,afternoon,all-year,12.60410000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,10.33080000000,R1,2,MUS$2010/PJ,2050
 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
-electricity,all-week,early-peak,all-year,25.01660000000,R1,3,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,19.33340000000,R1,3,MUS$2010/PJ,2050
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
-heat,all-week,early-peak,all-year,12.60410000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,10.33080000000,R1,3,MUS$2010/PJ,2050
 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
-electricity,all-week,late-peak,all-year,25.01660000000,R1,4,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,19.33340000000,R1,4,MUS$2010/PJ,2050
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
-heat,all-week,late-peak,all-year,12.60410000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,10.33080000000,R1,4,MUS$2010/PJ,2050
 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
-electricity,all-week,evening,all-year,25.01660000000,R1,5,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,19.33340000000,R1,5,MUS$2010/PJ,2050
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
-heat,all-week,evening,all-year,12.60410000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,10.33080000000,R1,5,MUS$2010/PJ,2050
 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv
index 960a2435..5419beec 100644
--- a/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv
+++ b/docs/tutorial-code/add-region/1-new-region/Results/MCACapacity.csv
@@ -6,120 +6,121 @@ A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2020
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
 A1,15.00000000000,R2,2020,R2,gas,gassupply1,newcapa,2020
 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
-A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025
+A1,11.40630000000,R1,2025,R1,residential,gasboiler,newcapa,2025
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2025
 A1,5.00000000000,R2,2020,R2,residential,gasboiler,newcapa,2025
-A1,19.00000000000,R2,2025,R2,residential,heatpump,newcapa,2025
+A1,11.40630000000,R2,2025,R2,residential,gasboiler,newcapa,2025
+A1,7.59380000000,R2,2025,R2,residential,heatpump,newcapa,2025
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2025
-A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2025
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2025
 A1,1.00000000000,R2,2020,R2,power,gasCCGT,newcapa,2025
-A1,6.59380000000,R2,2025,R2,power,gasCCGT,newcapa,2025
-A1,1.91410000000,R2,2025,R2,power,windturbine,newcapa,2025
+A1,2.37500000000,R2,2025,R2,power,gasCCGT,newcapa,2025
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2025
+A1,11.78210000000,R1,2025,R1,gas,gassupply1,newcapa,2025
 A1,15.00000000000,R2,2020,R2,gas,gassupply1,newcapa,2025
-A1,4.12600000000,R2,2025,R2,gas,gassupply1,newcapa,2025
-A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,11.78210000000,R2,2025,R2,gas,gassupply1,newcapa,2025
+A1,11.40630000000,R1,2025,R1,residential,gasboiler,newcapa,2030
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2030
 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030
-A1,10.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2030
-A1,19.00000000000,R2,2025,R2,residential,heatpump,newcapa,2030
-A1,1.00000000000,R2,2030,R2,residential,heatpump,newcapa,2030
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2030
-A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2030
-A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2030
-A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2030
-A1,6.59380000000,R2,2025,R2,power,gasCCGT,newcapa,2030
-A1,1.91410000000,R2,2025,R2,power,windturbine,newcapa,2030
-A1,3.25000000000,R2,2030,R2,power,windturbine,newcapa,2030
+A1,11.40630000000,R2,2025,R2,residential,gasboiler,newcapa,2030
+A1,7.59380000000,R2,2025,R2,residential,heatpump,newcapa,2030
+A1,11.00000000000,R2,2030,R2,residential,heatpump,newcapa,2030
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,2.51390000000,R1,2030,R1,power,gasCCGT,newcapa,2030
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2030
+A1,2.37500000000,R2,2025,R2,power,gasCCGT,newcapa,2030
+A1,2.51390000000,R2,2030,R2,power,gasCCGT,newcapa,2030
+A1,7.59380000000,R2,2030,R2,power,windturbine,newcapa,2030
 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,11.78210000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,3.58380000000,R1,2030,R1,gas,gassupply1,newcapa,2030
 A1,7.50000000000,R2,2020,R2,gas,gassupply1,newcapa,2030
-A1,4.12600000000,R2,2025,R2,gas,gassupply1,newcapa,2030
-A1,12.27440000000,R2,2030,R2,gas,gassupply1,newcapa,2030
+A1,11.78210000000,R2,2025,R2,gas,gassupply1,newcapa,2030
+A1,3.58380000000,R2,2030,R2,gas,gassupply1,newcapa,2030
 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035
-A1,10.00000000000,R2,2030,R2,residential,gasboiler,newcapa,2035
-A1,6.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2035
-A1,1.00000000000,R2,2030,R2,residential,heatpump,newcapa,2035
-A1,19.00000000000,R2,2035,R2,residential,heatpump,newcapa,2035
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2035
-A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2035
-A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2035
-A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2035
-A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2035
-A1,6.59380000000,R2,2025,R2,power,gasCCGT,newcapa,2035
-A1,1.91410000000,R2,2025,R2,power,windturbine,newcapa,2035
-A1,3.25000000000,R2,2030,R2,power,windturbine,newcapa,2035
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2035
-A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2035
-A1,4.12600000000,R2,2025,R2,gas,gassupply1,newcapa,2035
-A1,12.27440000000,R2,2030,R2,gas,gassupply1,newcapa,2035
-A1,15.23330000000,R2,2035,R2,gas,gassupply1,newcapa,2035
+A1,16.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2035
+A1,11.00000000000,R2,2030,R2,residential,heatpump,newcapa,2035
+A1,9.00000000000,R2,2035,R2,residential,heatpump,newcapa,2035
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,2.51390000000,R1,2030,R1,power,gasCCGT,newcapa,2035
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2035
+A1,17.40630000000,R1,2035,R1,power,windturbine,newcapa,2035
+A1,2.37500000000,R2,2025,R2,power,gasCCGT,newcapa,2035
+A1,2.51390000000,R2,2030,R2,power,gasCCGT,newcapa,2035
+A1,7.59380000000,R2,2030,R2,power,windturbine,newcapa,2035
+A1,1.40620000000,R2,2035,R2,power,windturbine,newcapa,2035
+A1,11.78210000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,3.58380000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,11.78210000000,R2,2025,R2,gas,gassupply1,newcapa,2035
+A1,3.58380000000,R2,2030,R2,gas,gassupply1,newcapa,2035
+A1,13.42080000000,R2,2035,R2,gas,gassupply1,newcapa,2035
 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040
-A1,6.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2040
-A1,16.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2040
-A1,19.00000000000,R2,2035,R2,residential,heatpump,newcapa,2040
-A1,1.00000000000,R2,2040,R2,residential,heatpump,newcapa,2040
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2040
-A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2040
-A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2040
-A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2040
-A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,16.00000000000,R2,2035,R2,residential,gasboiler,newcapa,2040
+A1,6.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2040
+A1,9.00000000000,R2,2035,R2,residential,heatpump,newcapa,2040
+A1,11.00000000000,R2,2040,R2,residential,heatpump,newcapa,2040
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,2.51390000000,R1,2030,R1,power,gasCCGT,newcapa,2040
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2040
+A1,17.40630000000,R1,2035,R1,power,windturbine,newcapa,2040
 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2040
-A1,6.59380000000,R2,2025,R2,power,gasCCGT,newcapa,2040
-A1,1.91410000000,R2,2025,R2,power,windturbine,newcapa,2040
-A1,3.25000000000,R2,2030,R2,power,windturbine,newcapa,2040
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2040
-A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2040
-A1,4.12600000000,R2,2025,R2,gas,gassupply1,newcapa,2040
-A1,12.27440000000,R2,2030,R2,gas,gassupply1,newcapa,2040
-A1,15.23330000000,R2,2035,R2,gas,gassupply1,newcapa,2040
+A1,2.37500000000,R2,2025,R2,power,gasCCGT,newcapa,2040
+A1,2.51390000000,R2,2030,R2,power,gasCCGT,newcapa,2040
+A1,7.59380000000,R2,2030,R2,power,windturbine,newcapa,2040
+A1,1.40620000000,R2,2035,R2,power,windturbine,newcapa,2040
+A1,11.78210000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,3.58380000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,11.78210000000,R2,2025,R2,gas,gassupply1,newcapa,2040
+A1,3.58380000000,R2,2030,R2,gas,gassupply1,newcapa,2040
+A1,13.42080000000,R2,2035,R2,gas,gassupply1,newcapa,2040
 A1,7.73330000000,R2,2040,R2,gas,gassupply1,newcapa,2040
 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045
-A1,16.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2045
-A1,12.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2045
-A1,1.00000000000,R2,2040,R2,residential,heatpump,newcapa,2045
-A1,19.00000000000,R2,2045,R2,residential,heatpump,newcapa,2045
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2045
-A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2045
-A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2045
-A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2045
-A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,6.00000000000,R2,2040,R2,residential,gasboiler,newcapa,2045
+A1,22.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2045
+A1,11.00000000000,R2,2040,R2,residential,heatpump,newcapa,2045
+A1,9.00000000000,R2,2045,R2,residential,heatpump,newcapa,2045
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,2.51390000000,R1,2030,R1,power,gasCCGT,newcapa,2045
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2045
+A1,17.40630000000,R1,2035,R1,power,windturbine,newcapa,2045
 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045
 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045
-A1,6.59380000000,R2,2025,R2,power,gasCCGT,newcapa,2045
-A1,1.91410000000,R2,2025,R2,power,windturbine,newcapa,2045
-A1,3.25000000000,R2,2030,R2,power,windturbine,newcapa,2045
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045
-A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2045
-A1,4.12600000000,R2,2025,R2,gas,gassupply1,newcapa,2045
-A1,12.27440000000,R2,2030,R2,gas,gassupply1,newcapa,2045
-A1,15.23330000000,R2,2035,R2,gas,gassupply1,newcapa,2045
+A1,2.37500000000,R2,2025,R2,power,gasCCGT,newcapa,2045
+A1,2.51390000000,R2,2030,R2,power,gasCCGT,newcapa,2045
+A1,7.59380000000,R2,2030,R2,power,windturbine,newcapa,2045
+A1,1.40620000000,R2,2035,R2,power,windturbine,newcapa,2045
+A1,11.78210000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,3.58380000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,11.78210000000,R2,2025,R2,gas,gassupply1,newcapa,2045
+A1,3.58380000000,R2,2030,R2,gas,gassupply1,newcapa,2045
+A1,13.42080000000,R2,2035,R2,gas,gassupply1,newcapa,2045
 A1,7.73330000000,R2,2040,R2,gas,gassupply1,newcapa,2045
 A1,7.73330000000,R2,2045,R2,gas,gassupply1,newcapa,2045
 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
 A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050
-A1,12.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2050
-A1,22.00000000000,R2,2050,R2,residential,gasboiler,newcapa,2050
-A1,19.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050
-A1,1.00000000000,R2,2050,R2,residential,heatpump,newcapa,2050
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050
-A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2050
-A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2050
-A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,22.00000000000,R2,2045,R2,residential,gasboiler,newcapa,2050
+A1,12.00000000000,R2,2050,R2,residential,gasboiler,newcapa,2050
+A1,9.00000000000,R2,2045,R2,residential,heatpump,newcapa,2050
+A1,11.00000000000,R2,2050,R2,residential,heatpump,newcapa,2050
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,2.51390000000,R1,2030,R1,power,gasCCGT,newcapa,2050
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,17.40630000000,R1,2035,R1,power,windturbine,newcapa,2050
 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050
 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
-A1,7.91410000000,R1,2050,R1,power,windturbine,newcapa,2050
-A1,6.59380000000,R2,2025,R2,power,gasCCGT,newcapa,2050
-A1,3.25000000000,R2,2030,R2,power,windturbine,newcapa,2050
-A1,1.91410000000,R2,2050,R2,power,windturbine,newcapa,2050
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050
-A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2050
-A1,4.12600000000,R2,2025,R2,gas,gassupply1,newcapa,2050
-A1,12.27440000000,R2,2030,R2,gas,gassupply1,newcapa,2050
-A1,15.23330000000,R2,2035,R2,gas,gassupply1,newcapa,2050
+A1,6.00000000000,R1,2050,R1,power,windturbine,newcapa,2050
+A1,2.37500000000,R2,2025,R2,power,gasCCGT,newcapa,2050
+A1,2.51390000000,R2,2030,R2,power,gasCCGT,newcapa,2050
+A1,7.59380000000,R2,2030,R2,power,windturbine,newcapa,2050
+A1,1.40620000000,R2,2035,R2,power,windturbine,newcapa,2050
+A1,11.78210000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,3.58380000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,11.78210000000,R2,2025,R2,gas,gassupply1,newcapa,2050
+A1,3.58380000000,R2,2030,R2,gas,gassupply1,newcapa,2050
+A1,13.42080000000,R2,2035,R2,gas,gassupply1,newcapa,2050
 A1,7.73330000000,R2,2040,R2,gas,gassupply1,newcapa,2050
 A1,7.73330000000,R2,2045,R2,gas,gassupply1,newcapa,2050
 A1,7.73330000000,R2,2050,R2,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv b/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv
index b9ced2d0..92219751 100644
--- a/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv
+++ b/docs/tutorial-code/add-region/1-new-region/Results/MCAPrices.csv
@@ -47,291 +47,291 @@ heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
 heat,all-week,evening,all-year,100.00000000000,R2,5,MUS$2010/PJ,2020
 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
 CO2f,all-week,evening,all-year,0.08310000000,R2,5,MUS$2010/kt,2020
-electricity,all-week,night,all-year,19.97590000000,R1,0,MUS$2010/PJ,2025
-electricity,all-week,night,all-year,19.97590000000,R2,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,20.19730000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,20.19730000000,R2,0,MUS$2010/PJ,2025
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025
 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,10.84880000000,R1,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,10.84880000000,R2,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,11.47240000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,11.47240000000,R2,0,MUS$2010/PJ,2025
 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
 CO2f,all-week,night,all-year,0.12010000000,R2,0,MUS$2010/kt,2025
-electricity,all-week,morning,all-year,19.97590000000,R1,1,MUS$2010/PJ,2025
-electricity,all-week,morning,all-year,19.97590000000,R2,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,20.19730000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,20.19730000000,R2,1,MUS$2010/PJ,2025
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025
 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,10.84880000000,R1,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,10.84880000000,R2,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,11.47240000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,11.47240000000,R2,1,MUS$2010/PJ,2025
 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
 CO2f,all-week,morning,all-year,0.12010000000,R2,1,MUS$2010/kt,2025
-electricity,all-week,afternoon,all-year,19.97590000000,R1,2,MUS$2010/PJ,2025
-electricity,all-week,afternoon,all-year,19.97590000000,R2,2,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,20.19730000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,20.19730000000,R2,2,MUS$2010/PJ,2025
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025
 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,10.84880000000,R1,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,10.84880000000,R2,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,11.47240000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,11.47240000000,R2,2,MUS$2010/PJ,2025
 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
 CO2f,all-week,afternoon,all-year,0.12010000000,R2,2,MUS$2010/kt,2025
-electricity,all-week,early-peak,all-year,19.97590000000,R1,3,MUS$2010/PJ,2025
-electricity,all-week,early-peak,all-year,19.97590000000,R2,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,20.19730000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,20.19730000000,R2,3,MUS$2010/PJ,2025
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025
 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,10.84880000000,R1,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,10.84880000000,R2,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,11.47240000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,11.47240000000,R2,3,MUS$2010/PJ,2025
 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
 CO2f,all-week,early-peak,all-year,0.12010000000,R2,3,MUS$2010/kt,2025
-electricity,all-week,late-peak,all-year,19.97590000000,R1,4,MUS$2010/PJ,2025
-electricity,all-week,late-peak,all-year,19.97590000000,R2,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,20.19730000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,20.19730000000,R2,4,MUS$2010/PJ,2025
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025
 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,10.84880000000,R1,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,10.84880000000,R2,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,11.47240000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,11.47240000000,R2,4,MUS$2010/PJ,2025
 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
 CO2f,all-week,late-peak,all-year,0.12010000000,R2,4,MUS$2010/kt,2025
-electricity,all-week,evening,all-year,19.97590000000,R1,5,MUS$2010/PJ,2025
-electricity,all-week,evening,all-year,19.97590000000,R2,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,20.19730000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,20.19730000000,R2,5,MUS$2010/PJ,2025
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025
 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,10.84880000000,R1,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,10.84880000000,R2,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,11.47240000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,11.47240000000,R2,5,MUS$2010/PJ,2025
 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
 CO2f,all-week,evening,all-year,0.12010000000,R2,5,MUS$2010/kt,2025
-electricity,all-week,night,all-year,20.87770000000,R1,0,MUS$2010/PJ,2030
-electricity,all-week,night,all-year,22.14100000000,R2,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,21.30250000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,21.30250000000,R2,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,10.94850000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,12.37940000000,R2,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,12.30170000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,12.30170000000,R2,0,MUS$2010/PJ,2030
 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
 CO2f,all-week,night,all-year,0.15700000000,R2,0,MUS$2010/kt,2030
-electricity,all-week,morning,all-year,20.87770000000,R1,1,MUS$2010/PJ,2030
-electricity,all-week,morning,all-year,22.14100000000,R2,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,21.30250000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,21.30250000000,R2,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,10.94850000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,12.37940000000,R2,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,12.30170000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,12.30170000000,R2,1,MUS$2010/PJ,2030
 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
 CO2f,all-week,morning,all-year,0.15700000000,R2,1,MUS$2010/kt,2030
-electricity,all-week,afternoon,all-year,20.87770000000,R1,2,MUS$2010/PJ,2030
-electricity,all-week,afternoon,all-year,22.14100000000,R2,2,MUS$2010/PJ,2030
+electricity,all-week,afternoon,all-year,21.30250000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,afternoon,all-year,21.30250000000,R2,2,MUS$2010/PJ,2030
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030
 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,10.94850000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,12.37940000000,R2,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,12.30170000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,12.30170000000,R2,2,MUS$2010/PJ,2030
 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
 CO2f,all-week,afternoon,all-year,0.15700000000,R2,2,MUS$2010/kt,2030
-electricity,all-week,early-peak,all-year,20.87770000000,R1,3,MUS$2010/PJ,2030
-electricity,all-week,early-peak,all-year,22.14100000000,R2,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,21.30250000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,21.30250000000,R2,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,10.94850000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,12.37940000000,R2,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,12.30170000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,12.30170000000,R2,3,MUS$2010/PJ,2030
 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
 CO2f,all-week,early-peak,all-year,0.15700000000,R2,3,MUS$2010/kt,2030
-electricity,all-week,late-peak,all-year,20.87770000000,R1,4,MUS$2010/PJ,2030
-electricity,all-week,late-peak,all-year,22.14100000000,R2,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,21.30250000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,21.30250000000,R2,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,10.94850000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,12.37940000000,R2,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,12.30170000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,12.30170000000,R2,4,MUS$2010/PJ,2030
 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
 CO2f,all-week,late-peak,all-year,0.15700000000,R2,4,MUS$2010/kt,2030
-electricity,all-week,evening,all-year,20.87770000000,R1,5,MUS$2010/PJ,2030
-electricity,all-week,evening,all-year,22.14100000000,R2,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,21.30250000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,21.30250000000,R2,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,10.94850000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,12.37940000000,R2,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,12.30170000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,12.30170000000,R2,5,MUS$2010/PJ,2030
 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
 CO2f,all-week,evening,all-year,0.15700000000,R2,5,MUS$2010/kt,2030
-electricity,all-week,night,all-year,22.67730000000,R1,0,MUS$2010/PJ,2035
-electricity,all-week,night,all-year,26.07680000000,R2,0,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,21.32680000000,R1,0,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,23.98850000000,R2,0,MUS$2010/PJ,2035
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035
 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2035
-heat,all-week,night,all-year,11.66830000000,R1,0,MUS$2010/PJ,2035
-heat,all-week,night,all-year,15.22720000000,R2,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,11.12810000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,14.76310000000,R2,0,MUS$2010/PJ,2035
 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
 CO2f,all-week,night,all-year,0.21490000000,R2,0,MUS$2010/kt,2035
-electricity,all-week,morning,all-year,22.67730000000,R1,1,MUS$2010/PJ,2035
-electricity,all-week,morning,all-year,26.07680000000,R2,1,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,21.32680000000,R1,1,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,23.98850000000,R2,1,MUS$2010/PJ,2035
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035
 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2035
-heat,all-week,morning,all-year,11.66830000000,R1,1,MUS$2010/PJ,2035
-heat,all-week,morning,all-year,15.22720000000,R2,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,11.12810000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,14.76310000000,R2,1,MUS$2010/PJ,2035
 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
 CO2f,all-week,morning,all-year,0.21490000000,R2,1,MUS$2010/kt,2035
-electricity,all-week,afternoon,all-year,22.67730000000,R1,2,MUS$2010/PJ,2035
-electricity,all-week,afternoon,all-year,26.07680000000,R2,2,MUS$2010/PJ,2035
+electricity,all-week,afternoon,all-year,21.32680000000,R1,2,MUS$2010/PJ,2035
+electricity,all-week,afternoon,all-year,23.98850000000,R2,2,MUS$2010/PJ,2035
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035
 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2035
-heat,all-week,afternoon,all-year,11.66830000000,R1,2,MUS$2010/PJ,2035
-heat,all-week,afternoon,all-year,15.22720000000,R2,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,11.12810000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,14.76310000000,R2,2,MUS$2010/PJ,2035
 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
 CO2f,all-week,afternoon,all-year,0.21490000000,R2,2,MUS$2010/kt,2035
-electricity,all-week,early-peak,all-year,22.67730000000,R1,3,MUS$2010/PJ,2035
-electricity,all-week,early-peak,all-year,26.07680000000,R2,3,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,21.32680000000,R1,3,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,23.98850000000,R2,3,MUS$2010/PJ,2035
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035
 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2035
-heat,all-week,early-peak,all-year,11.66830000000,R1,3,MUS$2010/PJ,2035
-heat,all-week,early-peak,all-year,15.22720000000,R2,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,11.12810000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,14.76310000000,R2,3,MUS$2010/PJ,2035
 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
 CO2f,all-week,early-peak,all-year,0.21490000000,R2,3,MUS$2010/kt,2035
-electricity,all-week,late-peak,all-year,22.67730000000,R1,4,MUS$2010/PJ,2035
-electricity,all-week,late-peak,all-year,26.07680000000,R2,4,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,21.32680000000,R1,4,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,23.98850000000,R2,4,MUS$2010/PJ,2035
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035
 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2035
-heat,all-week,late-peak,all-year,11.66830000000,R1,4,MUS$2010/PJ,2035
-heat,all-week,late-peak,all-year,15.22720000000,R2,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,11.12810000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,14.76310000000,R2,4,MUS$2010/PJ,2035
 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
 CO2f,all-week,late-peak,all-year,0.21490000000,R2,4,MUS$2010/kt,2035
-electricity,all-week,evening,all-year,22.67730000000,R1,5,MUS$2010/PJ,2035
-electricity,all-week,evening,all-year,26.07680000000,R2,5,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,21.32680000000,R1,5,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,23.98850000000,R2,5,MUS$2010/PJ,2035
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035
 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2035
-heat,all-week,evening,all-year,11.66830000000,R1,5,MUS$2010/PJ,2035
-heat,all-week,evening,all-year,15.22720000000,R2,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,11.12810000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,14.76310000000,R2,5,MUS$2010/PJ,2035
 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
 CO2f,all-week,evening,all-year,0.21490000000,R2,5,MUS$2010/kt,2035
-electricity,all-week,night,all-year,23.96280000000,R1,0,MUS$2010/PJ,2040
-electricity,all-week,night,all-year,30.01270000000,R2,0,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,22.24110000000,R1,0,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,26.90660000000,R2,0,MUS$2010/PJ,2040
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040
 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2040
-heat,all-week,night,all-year,12.18250000000,R1,0,MUS$2010/PJ,2040
-heat,all-week,night,all-year,18.33140000000,R2,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,11.49390000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,17.73970000000,R2,0,MUS$2010/PJ,2040
 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
 CO2f,all-week,night,all-year,0.27280000000,R2,0,MUS$2010/kt,2040
-electricity,all-week,morning,all-year,23.96280000000,R1,1,MUS$2010/PJ,2040
-electricity,all-week,morning,all-year,30.01270000000,R2,1,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,22.24110000000,R1,1,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,26.90660000000,R2,1,MUS$2010/PJ,2040
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040
 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2040
-heat,all-week,morning,all-year,12.18250000000,R1,1,MUS$2010/PJ,2040
-heat,all-week,morning,all-year,18.33140000000,R2,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,11.49390000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,17.73970000000,R2,1,MUS$2010/PJ,2040
 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
 CO2f,all-week,morning,all-year,0.27280000000,R2,1,MUS$2010/kt,2040
-electricity,all-week,afternoon,all-year,23.96280000000,R1,2,MUS$2010/PJ,2040
-electricity,all-week,afternoon,all-year,30.01270000000,R2,2,MUS$2010/PJ,2040
+electricity,all-week,afternoon,all-year,22.24110000000,R1,2,MUS$2010/PJ,2040
+electricity,all-week,afternoon,all-year,26.90660000000,R2,2,MUS$2010/PJ,2040
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040
 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2040
-heat,all-week,afternoon,all-year,12.18250000000,R1,2,MUS$2010/PJ,2040
-heat,all-week,afternoon,all-year,18.33140000000,R2,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,11.49390000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,17.73970000000,R2,2,MUS$2010/PJ,2040
 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
 CO2f,all-week,afternoon,all-year,0.27280000000,R2,2,MUS$2010/kt,2040
-electricity,all-week,early-peak,all-year,23.96280000000,R1,3,MUS$2010/PJ,2040
-electricity,all-week,early-peak,all-year,30.01270000000,R2,3,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,22.24110000000,R1,3,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,26.90660000000,R2,3,MUS$2010/PJ,2040
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040
 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2040
-heat,all-week,early-peak,all-year,12.18250000000,R1,3,MUS$2010/PJ,2040
-heat,all-week,early-peak,all-year,18.33140000000,R2,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,11.49390000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,17.73970000000,R2,3,MUS$2010/PJ,2040
 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
 CO2f,all-week,early-peak,all-year,0.27280000000,R2,3,MUS$2010/kt,2040
-electricity,all-week,late-peak,all-year,23.96280000000,R1,4,MUS$2010/PJ,2040
-electricity,all-week,late-peak,all-year,30.01270000000,R2,4,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,22.24110000000,R1,4,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,26.90660000000,R2,4,MUS$2010/PJ,2040
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040
 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2040
-heat,all-week,late-peak,all-year,12.18250000000,R1,4,MUS$2010/PJ,2040
-heat,all-week,late-peak,all-year,18.33140000000,R2,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,11.49390000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,17.73970000000,R2,4,MUS$2010/PJ,2040
 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
 CO2f,all-week,late-peak,all-year,0.27280000000,R2,4,MUS$2010/kt,2040
-electricity,all-week,evening,all-year,23.96280000000,R1,5,MUS$2010/PJ,2040
-electricity,all-week,evening,all-year,30.01270000000,R2,5,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,22.24110000000,R1,5,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,26.90660000000,R2,5,MUS$2010/PJ,2040
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040
 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2040
-heat,all-week,evening,all-year,12.18250000000,R1,5,MUS$2010/PJ,2040
-heat,all-week,evening,all-year,18.33140000000,R2,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,11.49390000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,17.73970000000,R2,5,MUS$2010/PJ,2040
 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
 CO2f,all-week,evening,all-year,0.27280000000,R2,5,MUS$2010/kt,2040
-electricity,all-week,night,all-year,25.61540000000,R1,0,MUS$2010/PJ,2045
-electricity,all-week,night,all-year,35.53370000000,R2,0,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,23.41660000000,R1,0,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,31.00020000000,R2,0,MUS$2010/PJ,2045
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045
 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2045
-heat,all-week,night,all-year,12.84360000000,R1,0,MUS$2010/PJ,2045
-heat,all-week,night,all-year,22.74000000000,R2,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,11.96410000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,21.98450000000,R2,0,MUS$2010/PJ,2045
 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
 CO2f,all-week,night,all-year,0.35390000000,R2,0,MUS$2010/kt,2045
-electricity,all-week,morning,all-year,25.61540000000,R1,1,MUS$2010/PJ,2045
-electricity,all-week,morning,all-year,35.53370000000,R2,1,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,23.41660000000,R1,1,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,31.00020000000,R2,1,MUS$2010/PJ,2045
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045
 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2045
-heat,all-week,morning,all-year,12.84360000000,R1,1,MUS$2010/PJ,2045
-heat,all-week,morning,all-year,22.74000000000,R2,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,11.96410000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,21.98450000000,R2,1,MUS$2010/PJ,2045
 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
 CO2f,all-week,morning,all-year,0.35390000000,R2,1,MUS$2010/kt,2045
-electricity,all-week,afternoon,all-year,25.61540000000,R1,2,MUS$2010/PJ,2045
-electricity,all-week,afternoon,all-year,35.53370000000,R2,2,MUS$2010/PJ,2045
+electricity,all-week,afternoon,all-year,23.41660000000,R1,2,MUS$2010/PJ,2045
+electricity,all-week,afternoon,all-year,31.00020000000,R2,2,MUS$2010/PJ,2045
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045
 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2045
-heat,all-week,afternoon,all-year,12.84360000000,R1,2,MUS$2010/PJ,2045
-heat,all-week,afternoon,all-year,22.74000000000,R2,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,11.96410000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,21.98450000000,R2,2,MUS$2010/PJ,2045
 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
 CO2f,all-week,afternoon,all-year,0.35390000000,R2,2,MUS$2010/kt,2045
-electricity,all-week,early-peak,all-year,25.61540000000,R1,3,MUS$2010/PJ,2045
-electricity,all-week,early-peak,all-year,35.53370000000,R2,3,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,23.41660000000,R1,3,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,31.00020000000,R2,3,MUS$2010/PJ,2045
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045
 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2045
-heat,all-week,early-peak,all-year,12.84360000000,R1,3,MUS$2010/PJ,2045
-heat,all-week,early-peak,all-year,22.74000000000,R2,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,11.96410000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,21.98450000000,R2,3,MUS$2010/PJ,2045
 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
 CO2f,all-week,early-peak,all-year,0.35390000000,R2,3,MUS$2010/kt,2045
-electricity,all-week,late-peak,all-year,25.61540000000,R1,4,MUS$2010/PJ,2045
-electricity,all-week,late-peak,all-year,35.53370000000,R2,4,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,23.41660000000,R1,4,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,31.00020000000,R2,4,MUS$2010/PJ,2045
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045
 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2045
-heat,all-week,late-peak,all-year,12.84360000000,R1,4,MUS$2010/PJ,2045
-heat,all-week,late-peak,all-year,22.74000000000,R2,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,11.96410000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,21.98450000000,R2,4,MUS$2010/PJ,2045
 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
 CO2f,all-week,late-peak,all-year,0.35390000000,R2,4,MUS$2010/kt,2045
-electricity,all-week,evening,all-year,25.61540000000,R1,5,MUS$2010/PJ,2045
-electricity,all-week,evening,all-year,35.53370000000,R2,5,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,23.41660000000,R1,5,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,31.00020000000,R2,5,MUS$2010/PJ,2045
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2045
-heat,all-week,evening,all-year,12.84360000000,R1,5,MUS$2010/PJ,2045
-heat,all-week,evening,all-year,22.74000000000,R2,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,11.96410000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,21.98450000000,R2,5,MUS$2010/PJ,2045
 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
 CO2f,all-week,evening,all-year,0.35390000000,R2,5,MUS$2010/kt,2045
-electricity,all-week,night,all-year,26.90080000000,R1,0,MUS$2010/PJ,2050
-electricity,all-week,night,all-year,41.05480000000,R2,0,MUS$2010/PJ,2050
+electricity,all-week,night,all-year,24.33090000000,R1,0,MUS$2010/PJ,2050
+electricity,all-week,night,all-year,35.09370000000,R2,0,MUS$2010/PJ,2050
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
 gas,all-week,night,all-year,2.55000000000,R2,0,MUS$2010/PJ,2050
-heat,all-week,night,all-year,13.35770000000,R1,0,MUS$2010/PJ,2050
-heat,all-week,night,all-year,27.33660000000,R2,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,12.32980000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,26.45340000000,R2,0,MUS$2010/PJ,2050
 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
 CO2f,all-week,night,all-year,0.43510000000,R2,0,MUS$2010/kt,2050
-electricity,all-week,morning,all-year,26.90080000000,R1,1,MUS$2010/PJ,2050
-electricity,all-week,morning,all-year,41.05480000000,R2,1,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,24.33090000000,R1,1,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,35.09370000000,R2,1,MUS$2010/PJ,2050
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
 gas,all-week,morning,all-year,2.55000000000,R2,1,MUS$2010/PJ,2050
-heat,all-week,morning,all-year,13.35770000000,R1,1,MUS$2010/PJ,2050
-heat,all-week,morning,all-year,27.33660000000,R2,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,12.32980000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,26.45340000000,R2,1,MUS$2010/PJ,2050
 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
 CO2f,all-week,morning,all-year,0.43510000000,R2,1,MUS$2010/kt,2050
-electricity,all-week,afternoon,all-year,26.90080000000,R1,2,MUS$2010/PJ,2050
-electricity,all-week,afternoon,all-year,41.05480000000,R2,2,MUS$2010/PJ,2050
+electricity,all-week,afternoon,all-year,24.33090000000,R1,2,MUS$2010/PJ,2050
+electricity,all-week,afternoon,all-year,35.09370000000,R2,2,MUS$2010/PJ,2050
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
 gas,all-week,afternoon,all-year,2.55000000000,R2,2,MUS$2010/PJ,2050
-heat,all-week,afternoon,all-year,13.35770000000,R1,2,MUS$2010/PJ,2050
-heat,all-week,afternoon,all-year,27.33660000000,R2,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,12.32980000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,26.45340000000,R2,2,MUS$2010/PJ,2050
 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
 CO2f,all-week,afternoon,all-year,0.43510000000,R2,2,MUS$2010/kt,2050
-electricity,all-week,early-peak,all-year,26.90080000000,R1,3,MUS$2010/PJ,2050
-electricity,all-week,early-peak,all-year,41.05480000000,R2,3,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,24.33090000000,R1,3,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,35.09370000000,R2,3,MUS$2010/PJ,2050
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
 gas,all-week,early-peak,all-year,2.55000000000,R2,3,MUS$2010/PJ,2050
-heat,all-week,early-peak,all-year,13.35770000000,R1,3,MUS$2010/PJ,2050
-heat,all-week,early-peak,all-year,27.33660000000,R2,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,12.32980000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,26.45340000000,R2,3,MUS$2010/PJ,2050
 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
 CO2f,all-week,early-peak,all-year,0.43510000000,R2,3,MUS$2010/kt,2050
-electricity,all-week,late-peak,all-year,26.90080000000,R1,4,MUS$2010/PJ,2050
-electricity,all-week,late-peak,all-year,41.05480000000,R2,4,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,24.33090000000,R1,4,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,35.09370000000,R2,4,MUS$2010/PJ,2050
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
 gas,all-week,late-peak,all-year,2.55000000000,R2,4,MUS$2010/PJ,2050
-heat,all-week,late-peak,all-year,13.35770000000,R1,4,MUS$2010/PJ,2050
-heat,all-week,late-peak,all-year,27.33660000000,R2,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,12.32980000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,26.45340000000,R2,4,MUS$2010/PJ,2050
 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
 CO2f,all-week,late-peak,all-year,0.43510000000,R2,4,MUS$2010/kt,2050
-electricity,all-week,evening,all-year,26.90080000000,R1,5,MUS$2010/PJ,2050
-electricity,all-week,evening,all-year,41.05480000000,R2,5,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,24.33090000000,R1,5,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,35.09370000000,R2,5,MUS$2010/PJ,2050
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
 gas,all-week,evening,all-year,2.55000000000,R2,5,MUS$2010/PJ,2050
-heat,all-week,evening,all-year,13.35770000000,R1,5,MUS$2010/PJ,2050
-heat,all-week,evening,all-year,27.33660000000,R2,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,12.32980000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,26.45340000000,R2,5,MUS$2010/PJ,2050
 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
 CO2f,all-week,evening,all-year,0.43510000000,R2,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
index 5012430c..690394f0 100644
--- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
+++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCACapacity.csv
@@ -3,66 +3,71 @@ A1,10.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2020
 A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
-A1,19.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2025
+A1,7.59380000000,R1,2025,R1,residential,electric_stove,newcapa,2025
 A1,5.00000000000,R1,2020,R1,residential,gas_stove,newcapa,2025
+A1,11.40630000000,R1,2025,R1,residential,gas_stove,newcapa,2025
 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
-A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025
+A1,11.40630000000,R1,2025,R1,residential,gasboiler,newcapa,2025
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2025
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2025
-A1,20.91410000000,R1,2025,R1,power,windturbine,newcapa,2025
+A1,5.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2025
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
-A1,10.57050000000,R1,2025,R1,gas,gassupply1,newcapa,2025
-A1,19.00000000000,R1,2025,R1,residential,electric_stove,newcapa,2030
+A1,38.56420000000,R1,2025,R1,gas,gassupply1,newcapa,2025
+A1,7.59380000000,R1,2025,R1,residential,electric_stove,newcapa,2030
 A1,11.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2030
-A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,11.40630000000,R1,2025,R1,residential,gas_stove,newcapa,2030
+A1,11.40630000000,R1,2025,R1,residential,gasboiler,newcapa,2030
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2030
 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2030
-A1,20.91410000000,R1,2025,R1,power,windturbine,newcapa,2030
-A1,24.25000000000,R1,2030,R1,power,windturbine,newcapa,2030
+A1,5.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,7.40280000000,R1,2030,R1,power,gasCCGT,newcapa,2030
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2030
 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
-A1,10.57050000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,38.56420000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,5.30370000000,R1,2030,R1,gas,gassupply1,newcapa,2030
 A1,11.00000000000,R1,2030,R1,residential,electric_stove,newcapa,2035
 A1,25.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2035
 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2035
-A1,20.91410000000,R1,2025,R1,power,windturbine,newcapa,2035
-A1,24.25000000000,R1,2030,R1,power,windturbine,newcapa,2035
-A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2035
-A1,10.57050000000,R1,2025,R1,gas,gassupply1,newcapa,2035
-A1,0.44110000000,R1,2035,R1,gas,gassupply1,newcapa,2035
+A1,5.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,7.40280000000,R1,2030,R1,power,gasCCGT,newcapa,2035
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2035
+A1,34.81250000000,R1,2035,R1,power,windturbine,newcapa,2035
+A1,38.56420000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,5.30370000000,R1,2030,R1,gas,gassupply1,newcapa,2035
 A1,25.00000000000,R1,2035,R1,residential,electric_stove,newcapa,2040
 A1,17.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2040
 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2040
-A1,20.91410000000,R1,2025,R1,power,windturbine,newcapa,2040
-A1,24.25000000000,R1,2030,R1,power,windturbine,newcapa,2040
-A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,5.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,7.40280000000,R1,2030,R1,power,gasCCGT,newcapa,2040
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2040
+A1,34.81250000000,R1,2035,R1,power,windturbine,newcapa,2040
 A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2040
-A1,10.57050000000,R1,2025,R1,gas,gassupply1,newcapa,2040
-A1,0.44110000000,R1,2035,R1,gas,gassupply1,newcapa,2040
+A1,38.56420000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,5.30370000000,R1,2030,R1,gas,gassupply1,newcapa,2040
 A1,17.00000000000,R1,2040,R1,residential,electric_stove,newcapa,2045
 A1,31.00000000000,R1,2045,R1,residential,electric_stove,newcapa,2045
 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2045
-A1,20.91410000000,R1,2025,R1,power,windturbine,newcapa,2045
-A1,24.25000000000,R1,2030,R1,power,windturbine,newcapa,2045
-A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,5.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,7.40280000000,R1,2030,R1,power,gasCCGT,newcapa,2045
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2045
+A1,34.81250000000,R1,2035,R1,power,windturbine,newcapa,2045
 A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2045
 A1,12.00000000000,R1,2045,R1,power,windturbine,newcapa,2045
-A1,10.57050000000,R1,2025,R1,gas,gassupply1,newcapa,2045
-A1,0.44110000000,R1,2035,R1,gas,gassupply1,newcapa,2045
+A1,38.56420000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,5.30370000000,R1,2030,R1,gas,gassupply1,newcapa,2045
 A1,31.00000000000,R1,2045,R1,residential,electric_stove,newcapa,2050
 A1,23.00000000000,R1,2050,R1,residential,electric_stove,newcapa,2050
 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
 A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050
-A1,24.25000000000,R1,2030,R1,power,windturbine,newcapa,2050
-A1,12.00000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,5.75000000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,7.40280000000,R1,2030,R1,power,gasCCGT,newcapa,2050
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,34.81250000000,R1,2035,R1,power,windturbine,newcapa,2050
 A1,12.00000000000,R1,2040,R1,power,windturbine,newcapa,2050
 A1,12.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
-A1,32.91410000000,R1,2050,R1,power,windturbine,newcapa,2050
-A1,10.57050000000,R1,2025,R1,gas,gassupply1,newcapa,2050
-A1,0.44110000000,R1,2035,R1,gas,gassupply1,newcapa,2050
+A1,12.00000000000,R1,2050,R1,power,windturbine,newcapa,2050
+A1,38.56420000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,5.30370000000,R1,2030,R1,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
index bf7c1af9..1b8d1322 100644
--- a/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
+++ b/docs/tutorial-code/add-service-demand/1-exogenous-demand/Results/MCAPrices.csv
@@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
 cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
-electricity,all-week,night,all-year,18.98780000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,20.19730000000,R1,0,MUS$2010/PJ,2025
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,10.53590000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,11.47240000000,R1,0,MUS$2010/PJ,2025
 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
-cook,all-week,night,all-year,10.16800000000,R1,0,MUS$2010/PJ,2025
-electricity,all-week,morning,all-year,18.98780000000,R1,1,MUS$2010/PJ,2025
+cook,all-week,night,all-year,10.26500000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,20.19730000000,R1,1,MUS$2010/PJ,2025
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,10.53590000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,11.47240000000,R1,1,MUS$2010/PJ,2025
 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
-cook,all-week,morning,all-year,10.16800000000,R1,1,MUS$2010/PJ,2025
-electricity,all-week,afternoon,all-year,18.98780000000,R1,2,MUS$2010/PJ,2025
+cook,all-week,morning,all-year,10.26500000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,20.19730000000,R1,2,MUS$2010/PJ,2025
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,10.53590000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,11.47240000000,R1,2,MUS$2010/PJ,2025
 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
-cook,all-week,afternoon,all-year,10.16800000000,R1,2,MUS$2010/PJ,2025
-electricity,all-week,early-peak,all-year,18.98780000000,R1,3,MUS$2010/PJ,2025
+cook,all-week,afternoon,all-year,10.26500000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,20.19730000000,R1,3,MUS$2010/PJ,2025
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,10.53590000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,11.47240000000,R1,3,MUS$2010/PJ,2025
 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
-cook,all-week,early-peak,all-year,10.16800000000,R1,3,MUS$2010/PJ,2025
-electricity,all-week,late-peak,all-year,18.98780000000,R1,4,MUS$2010/PJ,2025
+cook,all-week,early-peak,all-year,10.26500000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,20.19730000000,R1,4,MUS$2010/PJ,2025
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,10.53600000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,11.47240000000,R1,4,MUS$2010/PJ,2025
 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
-cook,all-week,late-peak,all-year,10.16800000000,R1,4,MUS$2010/PJ,2025
-electricity,all-week,evening,all-year,18.98780000000,R1,5,MUS$2010/PJ,2025
+cook,all-week,late-peak,all-year,10.26500000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,20.19730000000,R1,5,MUS$2010/PJ,2025
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,10.53590000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,11.47240000000,R1,5,MUS$2010/PJ,2025
 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
-cook,all-week,evening,all-year,10.16800000000,R1,5,MUS$2010/PJ,2025
-electricity,all-week,night,all-year,19.38020000000,R1,0,MUS$2010/PJ,2030
+cook,all-week,evening,all-year,10.26500000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,22.44250000000,R1,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,10.34950000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,12.58430000000,R1,0,MUS$2010/PJ,2030
 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
-cook,all-week,night,all-year,10.34950000000,R1,0,MUS$2010/PJ,2030
-electricity,all-week,morning,all-year,19.38020000000,R1,1,MUS$2010/PJ,2030
+cook,all-week,night,all-year,11.70620000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,22.44250000000,R1,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,10.34950000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,12.58430000000,R1,1,MUS$2010/PJ,2030
 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
-cook,all-week,morning,all-year,10.34950000000,R1,1,MUS$2010/PJ,2030
-electricity,all-week,afternoon,all-year,19.38020000000,R1,2,MUS$2010/PJ,2030
+cook,all-week,morning,all-year,11.70620000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,afternoon,all-year,22.44250000000,R1,2,MUS$2010/PJ,2030
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,10.34950000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,12.58430000000,R1,2,MUS$2010/PJ,2030
 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
-cook,all-week,afternoon,all-year,10.34950000000,R1,2,MUS$2010/PJ,2030
-electricity,all-week,early-peak,all-year,19.38020000000,R1,3,MUS$2010/PJ,2030
+cook,all-week,afternoon,all-year,11.70620000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,22.44250000000,R1,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,10.34950000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,12.58430000000,R1,3,MUS$2010/PJ,2030
 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
-cook,all-week,early-peak,all-year,10.34950000000,R1,3,MUS$2010/PJ,2030
-electricity,all-week,late-peak,all-year,19.38020000000,R1,4,MUS$2010/PJ,2030
+cook,all-week,early-peak,all-year,11.70620000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,22.44250000000,R1,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,10.34950000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,12.58430000000,R1,4,MUS$2010/PJ,2030
 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
-cook,all-week,late-peak,all-year,10.34950000000,R1,4,MUS$2010/PJ,2030
-electricity,all-week,evening,all-year,19.38020000000,R1,5,MUS$2010/PJ,2030
+cook,all-week,late-peak,all-year,11.70620000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,22.44250000000,R1,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,10.34950000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,12.58430000000,R1,5,MUS$2010/PJ,2030
 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
-cook,all-week,evening,all-year,10.34950000000,R1,5,MUS$2010/PJ,2030
-electricity,all-week,night,all-year,20.24340000000,R1,0,MUS$2010/PJ,2035
+cook,all-week,evening,all-year,11.70620000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,22.47520000000,R1,0,MUS$2010/PJ,2035
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035
-heat,all-week,night,all-year,10.69480000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,11.58750000000,R1,0,MUS$2010/PJ,2035
 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
-cook,all-week,night,all-year,10.69480000000,R1,0,MUS$2010/PJ,2035
-electricity,all-week,morning,all-year,20.24340000000,R1,1,MUS$2010/PJ,2035
+cook,all-week,night,all-year,11.58750000000,R1,0,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,22.47520000000,R1,1,MUS$2010/PJ,2035
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035
-heat,all-week,morning,all-year,10.69480000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,11.58750000000,R1,1,MUS$2010/PJ,2035
 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
-cook,all-week,morning,all-year,10.69480000000,R1,1,MUS$2010/PJ,2035
-electricity,all-week,afternoon,all-year,20.24340000000,R1,2,MUS$2010/PJ,2035
+cook,all-week,morning,all-year,11.58750000000,R1,1,MUS$2010/PJ,2035
+electricity,all-week,afternoon,all-year,22.47520000000,R1,2,MUS$2010/PJ,2035
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035
-heat,all-week,afternoon,all-year,10.69480000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,11.58750000000,R1,2,MUS$2010/PJ,2035
 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
-cook,all-week,afternoon,all-year,10.69480000000,R1,2,MUS$2010/PJ,2035
-electricity,all-week,early-peak,all-year,20.24340000000,R1,3,MUS$2010/PJ,2035
+cook,all-week,afternoon,all-year,11.58750000000,R1,2,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,22.47520000000,R1,3,MUS$2010/PJ,2035
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035
-heat,all-week,early-peak,all-year,10.69480000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,11.58750000000,R1,3,MUS$2010/PJ,2035
 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
-cook,all-week,early-peak,all-year,10.69480000000,R1,3,MUS$2010/PJ,2035
-electricity,all-week,late-peak,all-year,20.24340000000,R1,4,MUS$2010/PJ,2035
+cook,all-week,early-peak,all-year,11.58750000000,R1,3,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,22.47520000000,R1,4,MUS$2010/PJ,2035
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035
-heat,all-week,late-peak,all-year,10.69480000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,11.58750000000,R1,4,MUS$2010/PJ,2035
 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
-cook,all-week,late-peak,all-year,10.69480000000,R1,4,MUS$2010/PJ,2035
-electricity,all-week,evening,all-year,20.24340000000,R1,5,MUS$2010/PJ,2035
+cook,all-week,late-peak,all-year,11.58750000000,R1,4,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,22.47520000000,R1,5,MUS$2010/PJ,2035
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035
-heat,all-week,evening,all-year,10.69480000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,11.58750000000,R1,5,MUS$2010/PJ,2035
 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
-cook,all-week,evening,all-year,10.69480000000,R1,5,MUS$2010/PJ,2035
-electricity,all-week,night,all-year,20.86000000000,R1,0,MUS$2010/PJ,2040
+cook,all-week,evening,all-year,11.58750000000,R1,5,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,23.70510000000,R1,0,MUS$2010/PJ,2040
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040
-heat,all-week,night,all-year,10.94140000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,12.07950000000,R1,0,MUS$2010/PJ,2040
 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
-cook,all-week,night,all-year,10.94140000000,R1,0,MUS$2010/PJ,2040
-electricity,all-week,morning,all-year,20.86000000000,R1,1,MUS$2010/PJ,2040
+cook,all-week,night,all-year,12.07950000000,R1,0,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,23.70510000000,R1,1,MUS$2010/PJ,2040
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040
-heat,all-week,morning,all-year,10.94140000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,12.07950000000,R1,1,MUS$2010/PJ,2040
 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
-cook,all-week,morning,all-year,10.94140000000,R1,1,MUS$2010/PJ,2040
-electricity,all-week,afternoon,all-year,20.86000000000,R1,2,MUS$2010/PJ,2040
+cook,all-week,morning,all-year,12.07950000000,R1,1,MUS$2010/PJ,2040
+electricity,all-week,afternoon,all-year,23.70510000000,R1,2,MUS$2010/PJ,2040
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040
-heat,all-week,afternoon,all-year,10.94140000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,12.07950000000,R1,2,MUS$2010/PJ,2040
 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
-cook,all-week,afternoon,all-year,10.94140000000,R1,2,MUS$2010/PJ,2040
-electricity,all-week,early-peak,all-year,20.86000000000,R1,3,MUS$2010/PJ,2040
+cook,all-week,afternoon,all-year,12.07950000000,R1,2,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,23.70510000000,R1,3,MUS$2010/PJ,2040
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040
-heat,all-week,early-peak,all-year,10.94140000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,12.07950000000,R1,3,MUS$2010/PJ,2040
 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
-cook,all-week,early-peak,all-year,10.94140000000,R1,3,MUS$2010/PJ,2040
-electricity,all-week,late-peak,all-year,20.86000000000,R1,4,MUS$2010/PJ,2040
+cook,all-week,early-peak,all-year,12.07950000000,R1,3,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,23.70510000000,R1,4,MUS$2010/PJ,2040
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040
-heat,all-week,late-peak,all-year,10.94140000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,12.07950000000,R1,4,MUS$2010/PJ,2040
 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
-cook,all-week,late-peak,all-year,10.94140000000,R1,4,MUS$2010/PJ,2040
-electricity,all-week,evening,all-year,20.86000000000,R1,5,MUS$2010/PJ,2040
+cook,all-week,late-peak,all-year,12.07950000000,R1,4,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,23.70510000000,R1,5,MUS$2010/PJ,2040
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040
-heat,all-week,evening,all-year,10.94140000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,12.07950000000,R1,5,MUS$2010/PJ,2040
 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
-cook,all-week,evening,all-year,10.94140000000,R1,5,MUS$2010/PJ,2040
-electricity,all-week,night,all-year,21.65270000000,R1,0,MUS$2010/PJ,2045
+cook,all-week,evening,all-year,12.07950000000,R1,5,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,25.28630000000,R1,0,MUS$2010/PJ,2045
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045
-heat,all-week,night,all-year,11.25850000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,12.71190000000,R1,0,MUS$2010/PJ,2045
 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
-cook,all-week,night,all-year,11.25850000000,R1,0,MUS$2010/PJ,2045
-electricity,all-week,morning,all-year,21.65270000000,R1,1,MUS$2010/PJ,2045
+cook,all-week,night,all-year,12.71190000000,R1,0,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,25.28630000000,R1,1,MUS$2010/PJ,2045
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045
-heat,all-week,morning,all-year,11.25850000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,12.71190000000,R1,1,MUS$2010/PJ,2045
 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
-cook,all-week,morning,all-year,11.25850000000,R1,1,MUS$2010/PJ,2045
-electricity,all-week,afternoon,all-year,21.65270000000,R1,2,MUS$2010/PJ,2045
+cook,all-week,morning,all-year,12.71190000000,R1,1,MUS$2010/PJ,2045
+electricity,all-week,afternoon,all-year,25.28630000000,R1,2,MUS$2010/PJ,2045
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045
-heat,all-week,afternoon,all-year,11.25850000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,12.71190000000,R1,2,MUS$2010/PJ,2045
 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
-cook,all-week,afternoon,all-year,11.25850000000,R1,2,MUS$2010/PJ,2045
-electricity,all-week,early-peak,all-year,21.65270000000,R1,3,MUS$2010/PJ,2045
+cook,all-week,afternoon,all-year,12.71190000000,R1,2,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,25.28630000000,R1,3,MUS$2010/PJ,2045
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045
-heat,all-week,early-peak,all-year,11.25850000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,12.71190000000,R1,3,MUS$2010/PJ,2045
 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
-cook,all-week,early-peak,all-year,11.25850000000,R1,3,MUS$2010/PJ,2045
-electricity,all-week,late-peak,all-year,21.65270000000,R1,4,MUS$2010/PJ,2045
+cook,all-week,early-peak,all-year,12.71190000000,R1,3,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,25.28630000000,R1,4,MUS$2010/PJ,2045
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045
-heat,all-week,late-peak,all-year,11.25850000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,12.71200000000,R1,4,MUS$2010/PJ,2045
 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
-cook,all-week,late-peak,all-year,11.25850000000,R1,4,MUS$2010/PJ,2045
-electricity,all-week,evening,all-year,21.65270000000,R1,5,MUS$2010/PJ,2045
+cook,all-week,late-peak,all-year,12.71200000000,R1,4,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,25.28630000000,R1,5,MUS$2010/PJ,2045
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
-heat,all-week,evening,all-year,11.25850000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,12.71200000000,R1,5,MUS$2010/PJ,2045
 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
-cook,all-week,evening,all-year,11.25850000000,R1,5,MUS$2010/PJ,2045
-electricity,all-week,night,all-year,22.26920000000,R1,0,MUS$2010/PJ,2050
+cook,all-week,evening,all-year,12.71200000000,R1,5,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,26.51620000000,R1,0,MUS$2010/PJ,2050
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
-heat,all-week,night,all-year,11.50510000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,13.20390000000,R1,0,MUS$2010/PJ,2050
 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
-cook,all-week,night,all-year,11.50510000000,R1,0,MUS$2010/PJ,2050
-electricity,all-week,morning,all-year,22.26920000000,R1,1,MUS$2010/PJ,2050
+cook,all-week,night,all-year,13.20390000000,R1,0,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,26.51620000000,R1,1,MUS$2010/PJ,2050
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
-heat,all-week,morning,all-year,11.50510000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,13.20390000000,R1,1,MUS$2010/PJ,2050
 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
-cook,all-week,morning,all-year,11.50510000000,R1,1,MUS$2010/PJ,2050
-electricity,all-week,afternoon,all-year,22.26920000000,R1,2,MUS$2010/PJ,2050
+cook,all-week,morning,all-year,13.20390000000,R1,1,MUS$2010/PJ,2050
+electricity,all-week,afternoon,all-year,26.51620000000,R1,2,MUS$2010/PJ,2050
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
-heat,all-week,afternoon,all-year,11.50510000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,13.20390000000,R1,2,MUS$2010/PJ,2050
 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
-cook,all-week,afternoon,all-year,11.50510000000,R1,2,MUS$2010/PJ,2050
-electricity,all-week,early-peak,all-year,22.26920000000,R1,3,MUS$2010/PJ,2050
+cook,all-week,afternoon,all-year,13.20390000000,R1,2,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,26.51620000000,R1,3,MUS$2010/PJ,2050
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
-heat,all-week,early-peak,all-year,11.50510000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,13.20390000000,R1,3,MUS$2010/PJ,2050
 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
-cook,all-week,early-peak,all-year,11.50510000000,R1,3,MUS$2010/PJ,2050
-electricity,all-week,late-peak,all-year,22.26920000000,R1,4,MUS$2010/PJ,2050
+cook,all-week,early-peak,all-year,13.20390000000,R1,3,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,26.51620000000,R1,4,MUS$2010/PJ,2050
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
-heat,all-week,late-peak,all-year,11.50510000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,13.20390000000,R1,4,MUS$2010/PJ,2050
 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
-cook,all-week,late-peak,all-year,11.50510000000,R1,4,MUS$2010/PJ,2050
-electricity,all-week,evening,all-year,22.26920000000,R1,5,MUS$2010/PJ,2050
+cook,all-week,late-peak,all-year,13.20390000000,R1,4,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,26.51620000000,R1,5,MUS$2010/PJ,2050
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
-heat,all-week,evening,all-year,11.50510000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,13.20390000000,R1,5,MUS$2010/PJ,2050
 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
-cook,all-week,evening,all-year,11.50510000000,R1,5,MUS$2010/PJ,2050
+cook,all-week,evening,all-year,13.20390000000,R1,5,MUS$2010/PJ,2050
diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv
index c0aced73..d0003b59 100644
--- a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv
+++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCACapacity.csv
@@ -3,20 +3,24 @@ A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
-A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025
+A1,11.40630000000,R1,2025,R1,residential,gasboiler,newcapa,2025
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2025
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
-A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2025
+A1,5.34370000000,R1,2025,R1,power,windturbine,newcapa,2025
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
-A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,7.81580000000,R1,2025,R1,gas,gassupply1,newcapa,2025
+A1,11.40630000000,R1,2025,R1,residential,gasboiler,newcapa,2030
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2030
 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030
-A1,5.88890000000,R1,2030,R1,power,gasCCGT,newcapa,2030
-A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2030
+A1,5.34370000000,R1,2025,R1,power,windturbine,newcapa,2030
+A1,13.25000000000,R1,2030,R1,power,windturbine,newcapa,2030
 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
-A1,2.33440000000,R1,2030,R1,gas,gassupply1,newcapa,2030
+A1,7.81580000000,R1,2025,R1,gas,gassupply1,newcapa,2030
 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035
-A1,5.88890000000,R1,2030,R1,power,gasCCGT,newcapa,2035
-A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2035
-A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2035
-A1,2.33440000000,R1,2030,R1,gas,gassupply1,newcapa,2035
-A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2035
+A1,7.59380000000,R1,2035,R1,power,gasCCGT,newcapa,2035
+A1,5.34370000000,R1,2025,R1,power,windturbine,newcapa,2035
+A1,13.25000000000,R1,2030,R1,power,windturbine,newcapa,2035
+A1,0.32030000000,R1,2035,R1,power,windturbine,newcapa,2035
+A1,7.81580000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,4.86570000000,R1,2035,R1,gas,gassupply1,newcapa,2035
diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv
index c5d5c205..79aaf1e5 100644
--- a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv
+++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCAPrices.csv
@@ -23,75 +23,75 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
-electricity,all-week,night,all-year,18.58490000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,20.55030000000,R1,0,MUS$2010/PJ,2025
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,11.15980000000,R1,0,MUS$2010/PJ,2025
-CO2f,all-week,night,all-year,0.15000000000,R1,0,MUS$2010/kt,2025
-electricity,all-week,morning,all-year,18.58490000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,night,all-year,14.95850000000,R1,0,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,0.19000000000,R1,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,20.55030000000,R1,1,MUS$2010/PJ,2025
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,11.15980000000,R1,1,MUS$2010/PJ,2025
-CO2f,all-week,morning,all-year,0.15000000000,R1,1,MUS$2010/kt,2025
-electricity,all-week,afternoon,all-year,18.58490000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,14.95850000000,R1,1,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,0.19000000000,R1,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,20.55030000000,R1,2,MUS$2010/PJ,2025
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,11.15980000000,R1,2,MUS$2010/PJ,2025
-CO2f,all-week,afternoon,all-year,0.15000000000,R1,2,MUS$2010/kt,2025
-electricity,all-week,early-peak,all-year,18.58490000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,14.95850000000,R1,2,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,0.19000000000,R1,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,20.55030000000,R1,3,MUS$2010/PJ,2025
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,11.15980000000,R1,3,MUS$2010/PJ,2025
-CO2f,all-week,early-peak,all-year,0.15000000000,R1,3,MUS$2010/kt,2025
-electricity,all-week,late-peak,all-year,18.58490000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,14.95850000000,R1,3,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,0.19000000000,R1,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,20.55030000000,R1,4,MUS$2010/PJ,2025
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,11.15980000000,R1,4,MUS$2010/PJ,2025
-CO2f,all-week,late-peak,all-year,0.15000000000,R1,4,MUS$2010/kt,2025
-electricity,all-week,evening,all-year,18.58490000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,14.95850000000,R1,4,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,0.19000000000,R1,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,20.55030000000,R1,5,MUS$2010/PJ,2025
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,11.15980000000,R1,5,MUS$2010/PJ,2025
-CO2f,all-week,evening,all-year,0.15000000000,R1,5,MUS$2010/kt,2025
-electricity,all-week,night,all-year,18.96750000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,14.95850000000,R1,5,MUS$2010/PJ,2025
+CO2f,all-week,evening,all-year,0.19000000000,R1,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,17.99980000000,R1,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,10.18440000000,R1,0,MUS$2010/PJ,2030
-CO2f,all-week,night,all-year,0.12000000000,R1,0,MUS$2010/kt,2030
-electricity,all-week,morning,all-year,18.96750000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,night,all-year,15.24720000000,R1,0,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,0.31000000000,R1,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,17.99980000000,R1,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,10.18440000000,R1,1,MUS$2010/PJ,2030
-CO2f,all-week,morning,all-year,0.12000000000,R1,1,MUS$2010/kt,2030
-electricity,all-week,afternoon,all-year,18.96750000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,15.24720000000,R1,1,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,0.31000000000,R1,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,17.99980000000,R1,2,MUS$2010/PJ,2030
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,10.18440000000,R1,2,MUS$2010/PJ,2030
-CO2f,all-week,afternoon,all-year,0.12000000000,R1,2,MUS$2010/kt,2030
-electricity,all-week,early-peak,all-year,18.96750000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,15.24720000000,R1,2,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,0.31000000000,R1,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,17.99980000000,R1,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,10.18440000000,R1,3,MUS$2010/PJ,2030
-CO2f,all-week,early-peak,all-year,0.12000000000,R1,3,MUS$2010/kt,2030
-electricity,all-week,late-peak,all-year,18.96750000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,15.24720000000,R1,3,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,0.31000000000,R1,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,17.99980000000,R1,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,10.18440000000,R1,4,MUS$2010/PJ,2030
-CO2f,all-week,late-peak,all-year,0.12000000000,R1,4,MUS$2010/kt,2030
-electricity,all-week,evening,all-year,18.96750000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,15.24720000000,R1,4,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,0.31000000000,R1,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,17.99980000000,R1,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,10.18440000000,R1,5,MUS$2010/PJ,2030
-CO2f,all-week,evening,all-year,0.12000000000,R1,5,MUS$2010/kt,2030
-electricity,all-week,night,all-year,21.16800000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,15.24720000000,R1,5,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,0.31000000000,R1,5,MUS$2010/kt,2030
+electricity,all-week,night,all-year,19.03970000000,R1,0,MUS$2010/PJ,2035
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035
-heat,all-week,night,all-year,11.06460000000,R1,0,MUS$2010/PJ,2035
-CO2f,all-week,night,all-year,0.19000000000,R1,0,MUS$2010/kt,2035
-electricity,all-week,morning,all-year,21.16800000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,night,all-year,10.21330000000,R1,0,MUS$2010/PJ,2035
+CO2f,all-week,night,all-year,0.12000000000,R1,0,MUS$2010/kt,2035
+electricity,all-week,morning,all-year,19.03970000000,R1,1,MUS$2010/PJ,2035
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035
-heat,all-week,morning,all-year,11.06460000000,R1,1,MUS$2010/PJ,2035
-CO2f,all-week,morning,all-year,0.19000000000,R1,1,MUS$2010/kt,2035
-electricity,all-week,afternoon,all-year,21.16800000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,10.21330000000,R1,1,MUS$2010/PJ,2035
+CO2f,all-week,morning,all-year,0.12000000000,R1,1,MUS$2010/kt,2035
+electricity,all-week,afternoon,all-year,19.03970000000,R1,2,MUS$2010/PJ,2035
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035
-heat,all-week,afternoon,all-year,11.06460000000,R1,2,MUS$2010/PJ,2035
-CO2f,all-week,afternoon,all-year,0.19000000000,R1,2,MUS$2010/kt,2035
-electricity,all-week,early-peak,all-year,21.16800000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,10.21330000000,R1,2,MUS$2010/PJ,2035
+CO2f,all-week,afternoon,all-year,0.12000000000,R1,2,MUS$2010/kt,2035
+electricity,all-week,early-peak,all-year,19.03970000000,R1,3,MUS$2010/PJ,2035
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035
-heat,all-week,early-peak,all-year,11.06460000000,R1,3,MUS$2010/PJ,2035
-CO2f,all-week,early-peak,all-year,0.19000000000,R1,3,MUS$2010/kt,2035
-electricity,all-week,late-peak,all-year,21.16800000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,10.21330000000,R1,3,MUS$2010/PJ,2035
+CO2f,all-week,early-peak,all-year,0.12000000000,R1,3,MUS$2010/kt,2035
+electricity,all-week,late-peak,all-year,19.03970000000,R1,4,MUS$2010/PJ,2035
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035
-heat,all-week,late-peak,all-year,11.06460000000,R1,4,MUS$2010/PJ,2035
-CO2f,all-week,late-peak,all-year,0.19000000000,R1,4,MUS$2010/kt,2035
-electricity,all-week,evening,all-year,21.16800000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,10.21330000000,R1,4,MUS$2010/PJ,2035
+CO2f,all-week,late-peak,all-year,0.12000000000,R1,4,MUS$2010/kt,2035
+electricity,all-week,evening,all-year,19.03970000000,R1,5,MUS$2010/PJ,2035
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035
-heat,all-week,evening,all-year,11.06460000000,R1,5,MUS$2010/PJ,2035
-CO2f,all-week,evening,all-year,0.19000000000,R1,5,MUS$2010/kt,2035
+heat,all-week,evening,all-year,10.21330000000,R1,5,MUS$2010/PJ,2035
+CO2f,all-week,evening,all-year,0.12000000000,R1,5,MUS$2010/kt,2035
diff --git a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv
index f1a5fe68..638455bd 100644
--- a/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv
+++ b/docs/tutorial-code/carbon-budget/1-carbon-budget/Results/MCASupply.csv
@@ -17,75 +17,75 @@ CO2f,all-week,late-peak,all-year,R1,107.85000000000,4,MUS$2010/kt,2020
 gas,all-week,evening,all-year,R1,1.93330000000,5,MUS$2010/PJ,2020
 heat,all-week,evening,all-year,R1,1.66670000000,5,MUS$2010/PJ,2020
 CO2f,all-week,evening,all-year,R1,107.85000000000,5,MUS$2010/kt,2020
-electricity,all-week,night,all-year,R1,0.42220000000,0,MUS$2010/PJ,2025
-gas,all-week,night,all-year,R1,0.40570000000,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,R1,0.16880000000,0,MUS$2010/PJ,2025
+gas,all-week,night,all-year,R1,1.14080000000,0,MUS$2010/PJ,2025
 heat,all-week,night,all-year,R1,1.33330000000,0,MUS$2010/PJ,2025
-CO2f,all-week,night,all-year,R1,22.55850000000,0,MUS$2010/kt,2025
-electricity,all-week,morning,all-year,R1,0.63330000000,1,MUS$2010/PJ,2025
-gas,all-week,morning,all-year,R1,0.60860000000,1,MUS$2010/PJ,2025
+CO2f,all-week,night,all-year,R1,63.56400000000,0,MUS$2010/kt,2025
+electricity,all-week,morning,all-year,R1,0.25310000000,1,MUS$2010/PJ,2025
+gas,all-week,morning,all-year,R1,1.71120000000,1,MUS$2010/PJ,2025
 heat,all-week,morning,all-year,R1,2.00000000000,1,MUS$2010/PJ,2025
-CO2f,all-week,morning,all-year,R1,33.83770000000,1,MUS$2010/kt,2025
-electricity,all-week,afternoon,all-year,R1,0.42220000000,2,MUS$2010/PJ,2025
-gas,all-week,afternoon,all-year,R1,0.40570000000,2,MUS$2010/PJ,2025
+CO2f,all-week,morning,all-year,R1,95.34600000000,1,MUS$2010/kt,2025
+electricity,all-week,afternoon,all-year,R1,0.16880000000,2,MUS$2010/PJ,2025
+gas,all-week,afternoon,all-year,R1,1.14080000000,2,MUS$2010/PJ,2025
 heat,all-week,afternoon,all-year,R1,1.33330000000,2,MUS$2010/PJ,2025
-CO2f,all-week,afternoon,all-year,R1,22.55850000000,2,MUS$2010/kt,2025
-electricity,all-week,early-peak,all-year,R1,0.63330000000,3,MUS$2010/PJ,2025
-gas,all-week,early-peak,all-year,R1,0.60860000000,3,MUS$2010/PJ,2025
+CO2f,all-week,afternoon,all-year,R1,63.56400000000,2,MUS$2010/kt,2025
+electricity,all-week,early-peak,all-year,R1,0.25310000000,3,MUS$2010/PJ,2025
+gas,all-week,early-peak,all-year,R1,1.71120000000,3,MUS$2010/PJ,2025
 heat,all-week,early-peak,all-year,R1,2.00000000000,3,MUS$2010/PJ,2025
-CO2f,all-week,early-peak,all-year,R1,33.83770000000,3,MUS$2010/kt,2025
-electricity,all-week,late-peak,all-year,R1,1.26670000000,4,MUS$2010/PJ,2025
-gas,all-week,late-peak,all-year,R1,1.21720000000,4,MUS$2010/PJ,2025
+CO2f,all-week,early-peak,all-year,R1,95.34600000000,3,MUS$2010/kt,2025
+electricity,all-week,late-peak,all-year,R1,0.50620000000,4,MUS$2010/PJ,2025
+gas,all-week,late-peak,all-year,R1,3.42240000000,4,MUS$2010/PJ,2025
 heat,all-week,late-peak,all-year,R1,4.00000000000,4,MUS$2010/PJ,2025
-CO2f,all-week,late-peak,all-year,R1,67.67550000000,4,MUS$2010/kt,2025
-electricity,all-week,evening,all-year,R1,0.84440000000,5,MUS$2010/PJ,2025
-gas,all-week,evening,all-year,R1,0.81140000000,5,MUS$2010/PJ,2025
+CO2f,all-week,late-peak,all-year,R1,190.69190000000,4,MUS$2010/kt,2025
+electricity,all-week,evening,all-year,R1,0.33750000000,5,MUS$2010/PJ,2025
+gas,all-week,evening,all-year,R1,2.28160000000,5,MUS$2010/PJ,2025
 heat,all-week,evening,all-year,R1,2.66670000000,5,MUS$2010/PJ,2025
-CO2f,all-week,evening,all-year,R1,45.11700000000,5,MUS$2010/kt,2025
-electricity,all-week,night,all-year,R1,0.66670000000,0,MUS$2010/PJ,2030
-gas,all-week,night,all-year,R1,0.49170000000,0,MUS$2010/PJ,2030
+CO2f,all-week,evening,all-year,R1,127.12790000000,5,MUS$2010/kt,2025
+electricity,all-week,night,all-year,R1,0.41320000000,0,MUS$2010/PJ,2030
+gas,all-week,night,all-year,R1,0.73510000000,0,MUS$2010/PJ,2030
 heat,all-week,night,all-year,R1,1.66670000000,0,MUS$2010/PJ,2030
-CO2f,all-week,night,all-year,R1,26.99170000000,0,MUS$2010/kt,2030
-electricity,all-week,morning,all-year,R1,1.00000000000,1,MUS$2010/PJ,2030
-gas,all-week,morning,all-year,R1,0.73760000000,1,MUS$2010/PJ,2030
+CO2f,all-week,night,all-year,R1,41.00550000000,0,MUS$2010/kt,2030
+electricity,all-week,morning,all-year,R1,0.61980000000,1,MUS$2010/PJ,2030
+gas,all-week,morning,all-year,R1,1.10260000000,1,MUS$2010/PJ,2030
 heat,all-week,morning,all-year,R1,2.50000000000,1,MUS$2010/PJ,2030
-CO2f,all-week,morning,all-year,R1,40.48760000000,1,MUS$2010/kt,2030
-electricity,all-week,afternoon,all-year,R1,0.66670000000,2,MUS$2010/PJ,2030
-gas,all-week,afternoon,all-year,R1,0.49170000000,2,MUS$2010/PJ,2030
+CO2f,all-week,morning,all-year,R1,61.50820000000,1,MUS$2010/kt,2030
+electricity,all-week,afternoon,all-year,R1,0.41320000000,2,MUS$2010/PJ,2030
+gas,all-week,afternoon,all-year,R1,0.73510000000,2,MUS$2010/PJ,2030
 heat,all-week,afternoon,all-year,R1,1.66670000000,2,MUS$2010/PJ,2030
-CO2f,all-week,afternoon,all-year,R1,26.99170000000,2,MUS$2010/kt,2030
-electricity,all-week,early-peak,all-year,R1,1.00000000000,3,MUS$2010/PJ,2030
-gas,all-week,early-peak,all-year,R1,0.73760000000,3,MUS$2010/PJ,2030
+CO2f,all-week,afternoon,all-year,R1,41.00550000000,2,MUS$2010/kt,2030
+electricity,all-week,early-peak,all-year,R1,0.61980000000,3,MUS$2010/PJ,2030
+gas,all-week,early-peak,all-year,R1,1.10260000000,3,MUS$2010/PJ,2030
 heat,all-week,early-peak,all-year,R1,2.50000000000,3,MUS$2010/PJ,2030
-CO2f,all-week,early-peak,all-year,R1,40.48760000000,3,MUS$2010/kt,2030
-electricity,all-week,late-peak,all-year,R1,2.00000000000,4,MUS$2010/PJ,2030
-gas,all-week,late-peak,all-year,R1,1.47520000000,4,MUS$2010/PJ,2030
+CO2f,all-week,early-peak,all-year,R1,61.50820000000,3,MUS$2010/kt,2030
+electricity,all-week,late-peak,all-year,R1,1.23960000000,4,MUS$2010/PJ,2030
+gas,all-week,late-peak,all-year,R1,2.20520000000,4,MUS$2010/PJ,2030
 heat,all-week,late-peak,all-year,R1,5.00000000000,4,MUS$2010/PJ,2030
-CO2f,all-week,late-peak,all-year,R1,80.97520000000,4,MUS$2010/kt,2030
-electricity,all-week,evening,all-year,R1,1.33330000000,5,MUS$2010/PJ,2030
-gas,all-week,evening,all-year,R1,0.98340000000,5,MUS$2010/PJ,2030
+CO2f,all-week,late-peak,all-year,R1,123.01640000000,4,MUS$2010/kt,2030
+electricity,all-week,evening,all-year,R1,0.82640000000,5,MUS$2010/PJ,2030
+gas,all-week,evening,all-year,R1,1.47010000000,5,MUS$2010/PJ,2030
 heat,all-week,evening,all-year,R1,3.33330000000,5,MUS$2010/PJ,2030
-CO2f,all-week,evening,all-year,R1,53.98340000000,5,MUS$2010/kt,2030
+CO2f,all-week,evening,all-year,R1,82.01090000000,5,MUS$2010/kt,2030
 electricity,all-week,night,all-year,R1,0.80000000000,0,MUS$2010/PJ,2035
-gas,all-week,night,all-year,R1,0.49170000000,0,MUS$2010/PJ,2035
+gas,all-week,night,all-year,R1,0.63410000000,0,MUS$2010/PJ,2035
 heat,all-week,night,all-year,R1,2.00000000000,0,MUS$2010/PJ,2035
-CO2f,all-week,night,all-year,R1,26.99170000000,0,MUS$2010/kt,2035
+CO2f,all-week,night,all-year,R1,34.80600000000,0,MUS$2010/kt,2035
 electricity,all-week,morning,all-year,R1,1.20000000000,1,MUS$2010/PJ,2035
-gas,all-week,morning,all-year,R1,0.73760000000,1,MUS$2010/PJ,2035
+gas,all-week,morning,all-year,R1,0.95110000000,1,MUS$2010/PJ,2035
 heat,all-week,morning,all-year,R1,3.00000000000,1,MUS$2010/PJ,2035
-CO2f,all-week,morning,all-year,R1,40.48760000000,1,MUS$2010/kt,2035
+CO2f,all-week,morning,all-year,R1,52.20890000000,1,MUS$2010/kt,2035
 electricity,all-week,afternoon,all-year,R1,0.80000000000,2,MUS$2010/PJ,2035
-gas,all-week,afternoon,all-year,R1,0.49170000000,2,MUS$2010/PJ,2035
+gas,all-week,afternoon,all-year,R1,0.63410000000,2,MUS$2010/PJ,2035
 heat,all-week,afternoon,all-year,R1,2.00000000000,2,MUS$2010/PJ,2035
-CO2f,all-week,afternoon,all-year,R1,26.99170000000,2,MUS$2010/kt,2035
+CO2f,all-week,afternoon,all-year,R1,34.80600000000,2,MUS$2010/kt,2035
 electricity,all-week,early-peak,all-year,R1,1.20000000000,3,MUS$2010/PJ,2035
-gas,all-week,early-peak,all-year,R1,0.73760000000,3,MUS$2010/PJ,2035
+gas,all-week,early-peak,all-year,R1,0.95110000000,3,MUS$2010/PJ,2035
 heat,all-week,early-peak,all-year,R1,3.00000000000,3,MUS$2010/PJ,2035
-CO2f,all-week,early-peak,all-year,R1,40.48760000000,3,MUS$2010/kt,2035
+CO2f,all-week,early-peak,all-year,R1,52.20890000000,3,MUS$2010/kt,2035
 electricity,all-week,late-peak,all-year,R1,2.40000000000,4,MUS$2010/PJ,2035
-gas,all-week,late-peak,all-year,R1,1.47520000000,4,MUS$2010/PJ,2035
+gas,all-week,late-peak,all-year,R1,1.90220000000,4,MUS$2010/PJ,2035
 heat,all-week,late-peak,all-year,R1,6.00000000000,4,MUS$2010/PJ,2035
-CO2f,all-week,late-peak,all-year,R1,80.97520000000,4,MUS$2010/kt,2035
+CO2f,all-week,late-peak,all-year,R1,104.41790000000,4,MUS$2010/kt,2035
 electricity,all-week,evening,all-year,R1,1.60000000000,5,MUS$2010/PJ,2035
-gas,all-week,evening,all-year,R1,0.98340000000,5,MUS$2010/PJ,2035
+gas,all-week,evening,all-year,R1,1.26820000000,5,MUS$2010/PJ,2035
 heat,all-week,evening,all-year,R1,4.00000000000,5,MUS$2010/PJ,2035
-CO2f,all-week,evening,all-year,R1,53.98340000000,5,MUS$2010/kt,2035
+CO2f,all-week,evening,all-year,R1,69.61190000000,5,MUS$2010/kt,2035
diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv
index fb43c23d..77ecf362 100644
--- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv
+++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCACapacity.csv
@@ -3,37 +3,45 @@ A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
-A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025
+A1,11.40630000000,R1,2025,R1,residential,gasboiler,newcapa,2025
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2025
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
-A1,6.60000000000,R1,2025,R1,power,windturbine,newcapa,2025
+A1,2.03750000000,R1,2025,R1,power,windturbine,newcapa,2025
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
-A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,8.00140000000,R1,2025,R1,gas,gassupply1,newcapa,2025
+A1,11.40630000000,R1,2025,R1,residential,gasboiler,newcapa,2030
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2030
 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030
-A1,6.60000000000,R1,2025,R1,power,windturbine,newcapa,2030
+A1,2.03750000000,R1,2025,R1,power,windturbine,newcapa,2030
 A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2030
 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,8.00140000000,R1,2025,R1,gas,gassupply1,newcapa,2030
 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035
-A1,6.60000000000,R1,2025,R1,power,windturbine,newcapa,2035
+A1,2.03750000000,R1,2025,R1,power,windturbine,newcapa,2035
 A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2035
-A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2035
+A1,6.96250000000,R1,2035,R1,power,windturbine,newcapa,2035
+A1,8.00140000000,R1,2025,R1,gas,gassupply1,newcapa,2035
 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040
-A1,6.60000000000,R1,2025,R1,power,windturbine,newcapa,2040
+A1,2.03750000000,R1,2025,R1,power,windturbine,newcapa,2040
 A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2040
-A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,6.96250000000,R1,2035,R1,power,windturbine,newcapa,2040
 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2040
+A1,8.00140000000,R1,2025,R1,gas,gassupply1,newcapa,2040
 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045
-A1,6.60000000000,R1,2025,R1,power,windturbine,newcapa,2045
+A1,2.03750000000,R1,2025,R1,power,windturbine,newcapa,2045
 A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2045
-A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,6.96250000000,R1,2035,R1,power,windturbine,newcapa,2045
 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2045
 A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2045
+A1,8.00140000000,R1,2025,R1,gas,gassupply1,newcapa,2045
 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
 A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050
 A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2050
-A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,6.96250000000,R1,2035,R1,power,windturbine,newcapa,2050
 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2050
 A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2050
-A1,9.00000000000,R1,2050,R1,power,windturbine,newcapa,2050
+A1,4.43750000000,R1,2050,R1,power,windturbine,newcapa,2050
+A1,8.00140000000,R1,2025,R1,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
index c3a1eb9c..e9c4da6a 100644
--- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
+++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/MCAPrices.csv
@@ -23,53 +23,53 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
-electricity,all-week,night,all-year,8.75610000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,11.09360000000,R1,0,MUS$2010/PJ,2025
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,7.68250000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,10.70690000000,R1,0,MUS$2010/PJ,2025
 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
-electricity,all-week,morning,all-year,8.75610000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,11.09360000000,R1,1,MUS$2010/PJ,2025
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,7.68250000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,10.70690000000,R1,1,MUS$2010/PJ,2025
 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
-electricity,all-week,afternoon,all-year,9.73430000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,12.74750000000,R1,2,MUS$2010/PJ,2025
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,8.23530000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,11.08040000000,R1,2,MUS$2010/PJ,2025
 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
-electricity,all-week,early-peak,all-year,8.75610000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,11.09360000000,R1,3,MUS$2010/PJ,2025
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,7.68250000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,10.70690000000,R1,3,MUS$2010/PJ,2025
 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
-electricity,all-week,late-peak,all-year,8.75610000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,11.09360000000,R1,4,MUS$2010/PJ,2025
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,7.68250000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,10.70690000000,R1,4,MUS$2010/PJ,2025
 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
-electricity,all-week,evening,all-year,9.39010000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,12.21490000000,R1,5,MUS$2010/PJ,2025
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,8.04080000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,10.96010000000,R1,5,MUS$2010/PJ,2025
 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
 electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,6.09990000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,8.80540000000,R1,0,MUS$2010/PJ,2030
 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
 electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,6.09990000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,8.80540000000,R1,1,MUS$2010/PJ,2030
 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
 electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2030
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,6.49110000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,8.80540000000,R1,2,MUS$2010/PJ,2030
 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
 electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,6.09990000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,8.80540000000,R1,3,MUS$2010/PJ,2030
 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
 electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,6.09990000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,8.80540000000,R1,4,MUS$2010/PJ,2030
 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
 electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,6.35350000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,8.80540000000,R1,5,MUS$2010/PJ,2030
 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
 electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2035
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035
diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv
index 282fa0e4..ba932ef4 100644
--- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv
+++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/Results/Power_Supply.csv
@@ -1,145 +1,145 @@
 asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2020,all-year,R1,0.03330000000,gasCCGT,0,MUS$2010/PJ,2020
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,night,2020,all-year,R1,3.05570000000,gasCCGT,0,MUS$2010/kt,2020
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2020,all-year,R1,0.06670000000,gasCCGT,1,MUS$2010/PJ,2020
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,morning,2020,all-year,R1,6.11130000000,gasCCGT,1,MUS$2010/kt,2020
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2020
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2020
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2020,all-year,R1,0.06670000000,gasCCGT,3,MUS$2010/PJ,2020
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,early-peak,2020,all-year,R1,6.11130000000,gasCCGT,3,MUS$2010/kt,2020
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2020,all-year,R1,0.13330000000,gasCCGT,4,MUS$2010/PJ,2020
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,late-peak,2020,all-year,R1,12.22270000000,gasCCGT,4,MUS$2010/kt,2020
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,MUS$2010/PJ,2020
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,MUS$2010/kt,2020
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2020,all-year,R1,0.05560000000,gasCCGT,0,MUS$2010/PJ,2025
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2025
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,night,2020,all-year,R1,5.09280000000,gasCCGT,0,MUS$2010/kt,2025
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2020,all-year,R1,0.08330000000,gasCCGT,1,MUS$2010/PJ,2025
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2025
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,morning,2020,all-year,R1,7.63920000000,gasCCGT,1,MUS$2010/kt,2025
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2025
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2025
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2025
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2020,all-year,R1,0.08330000000,gasCCGT,3,MUS$2010/PJ,2025
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2025
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,early-peak,2020,all-year,R1,7.63920000000,gasCCGT,3,MUS$2010/kt,2025
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2020,all-year,R1,0.16670000000,gasCCGT,4,MUS$2010/PJ,2025
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2025
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,late-peak,2020,all-year,R1,15.27830000000,gasCCGT,4,MUS$2010/kt,2025
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,MUS$2010/PJ,2025
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2025
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,MUS$2010/kt,2025
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2030
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2030
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2030
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2030
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2030
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2030
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2030
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2030
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2030
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2030
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2030
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2030
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2035
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2035
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2035
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2035
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2035
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2035
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2035
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2035
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2035
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2035
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2035
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2035
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2035
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2035
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2035
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2035
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2035
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2035
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2040
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2040
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2040
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2040
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2040
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2040
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2040
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2040
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2040
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2040
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2040
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2040
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2045
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2045
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2045
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2045
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2045
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2045
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2045
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2045
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2045
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2045
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2045
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2045
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2050
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050
-5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2050,all-year,R1,0.50000000000,windturbine,0,MUS$2010/PJ,2050
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2050
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050
-5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2050,all-year,R1,0.75000000000,windturbine,1,MUS$2010/PJ,2050
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2050
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050
-5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2050,all-year,R1,0.50000000000,windturbine,2,MUS$2010/PJ,2050
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2050
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050
-5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2050,all-year,R1,0.75000000000,windturbine,3,MUS$2010/PJ,2050
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2050
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
-5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2050,all-year,R1,1.50000000000,windturbine,4,MUS$2010/PJ,2050
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2050
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050
-5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2050,all-year,R1,1.00000000000,windturbine,5,MUS$2010/PJ,2050
+0,10,electricity,all-week,night,2020,all-year,R1,0.03330000000,gasCCGT,0,MUS$2010/PJ,2020
+0,6,CO2f,all-week,night,2020,all-year,R1,3.05570000000,gasCCGT,0,MUS$2010/kt,2020
+0,10,electricity,all-week,morning,2020,all-year,R1,0.06670000000,gasCCGT,1,MUS$2010/PJ,2020
+0,6,CO2f,all-week,morning,2020,all-year,R1,6.11130000000,gasCCGT,1,MUS$2010/kt,2020
+0,10,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2020
+0,6,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2020
+0,10,electricity,all-week,early-peak,2020,all-year,R1,0.06670000000,gasCCGT,3,MUS$2010/PJ,2020
+0,6,CO2f,all-week,early-peak,2020,all-year,R1,6.11130000000,gasCCGT,3,MUS$2010/kt,2020
+0,10,electricity,all-week,late-peak,2020,all-year,R1,0.13330000000,gasCCGT,4,MUS$2010/PJ,2020
+0,6,CO2f,all-week,late-peak,2020,all-year,R1,12.22270000000,gasCCGT,4,MUS$2010/kt,2020
+0,10,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,MUS$2010/PJ,2020
+0,6,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,MUS$2010/kt,2020
+0,10,electricity,all-week,night,2020,all-year,R1,0.05560000000,gasCCGT,0,MUS$2010/PJ,2025
+1,10,electricity,all-week,night,2025,all-year,R1,0.11320000000,windturbine,0,MUS$2010/PJ,2025
+0,6,CO2f,all-week,night,2020,all-year,R1,5.09280000000,gasCCGT,0,MUS$2010/kt,2025
+0,10,electricity,all-week,morning,2020,all-year,R1,0.08330000000,gasCCGT,1,MUS$2010/PJ,2025
+1,10,electricity,all-week,morning,2025,all-year,R1,0.16980000000,windturbine,1,MUS$2010/PJ,2025
+0,6,CO2f,all-week,morning,2020,all-year,R1,7.63920000000,gasCCGT,1,MUS$2010/kt,2025
+0,10,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2025
+1,10,electricity,all-week,afternoon,2025,all-year,R1,0.11320000000,windturbine,2,MUS$2010/PJ,2025
+0,6,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2025
+0,10,electricity,all-week,early-peak,2020,all-year,R1,0.08330000000,gasCCGT,3,MUS$2010/PJ,2025
+1,10,electricity,all-week,early-peak,2025,all-year,R1,0.16980000000,windturbine,3,MUS$2010/PJ,2025
+0,6,CO2f,all-week,early-peak,2020,all-year,R1,7.63920000000,gasCCGT,3,MUS$2010/kt,2025
+0,10,electricity,all-week,late-peak,2020,all-year,R1,0.16670000000,gasCCGT,4,MUS$2010/PJ,2025
+1,10,electricity,all-week,late-peak,2025,all-year,R1,0.33960000000,windturbine,4,MUS$2010/PJ,2025
+0,6,CO2f,all-week,late-peak,2020,all-year,R1,15.27830000000,gasCCGT,4,MUS$2010/kt,2025
+0,10,electricity,all-week,evening,2020,all-year,R1,0.16670000000,gasCCGT,5,MUS$2010/PJ,2025
+1,10,electricity,all-week,evening,2025,all-year,R1,0.22640000000,windturbine,5,MUS$2010/PJ,2025
+0,6,CO2f,all-week,evening,2020,all-year,R1,15.27830000000,gasCCGT,5,MUS$2010/kt,2025
+1,10,electricity,all-week,night,2025,all-year,R1,0.11320000000,windturbine,0,MUS$2010/PJ,2030
+2,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2030
+1,10,electricity,all-week,morning,2025,all-year,R1,0.16980000000,windturbine,1,MUS$2010/PJ,2030
+2,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2030
+1,10,electricity,all-week,afternoon,2025,all-year,R1,0.11320000000,windturbine,2,MUS$2010/PJ,2030
+2,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2030
+1,10,electricity,all-week,early-peak,2025,all-year,R1,0.16980000000,windturbine,3,MUS$2010/PJ,2030
+2,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2030
+1,10,electricity,all-week,late-peak,2025,all-year,R1,0.33960000000,windturbine,4,MUS$2010/PJ,2030
+2,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2030
+1,10,electricity,all-week,evening,2025,all-year,R1,0.22640000000,windturbine,5,MUS$2010/PJ,2030
+2,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2030
+0,10,electricity,all-week,night,2025,all-year,R1,0.11320000000,windturbine,0,MUS$2010/PJ,2035
+1,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2035
+2,10,electricity,all-week,night,2035,all-year,R1,0.38680000000,windturbine,0,MUS$2010/PJ,2035
+0,10,electricity,all-week,morning,2025,all-year,R1,0.16980000000,windturbine,1,MUS$2010/PJ,2035
+1,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2035
+2,10,electricity,all-week,morning,2035,all-year,R1,0.58020000000,windturbine,1,MUS$2010/PJ,2035
+0,10,electricity,all-week,afternoon,2025,all-year,R1,0.11320000000,windturbine,2,MUS$2010/PJ,2035
+1,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2035
+2,10,electricity,all-week,afternoon,2035,all-year,R1,0.38680000000,windturbine,2,MUS$2010/PJ,2035
+0,10,electricity,all-week,early-peak,2025,all-year,R1,0.16980000000,windturbine,3,MUS$2010/PJ,2035
+1,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2035
+2,10,electricity,all-week,early-peak,2035,all-year,R1,0.58020000000,windturbine,3,MUS$2010/PJ,2035
+0,10,electricity,all-week,late-peak,2025,all-year,R1,0.33960000000,windturbine,4,MUS$2010/PJ,2035
+1,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2035
+2,10,electricity,all-week,late-peak,2035,all-year,R1,1.16040000000,windturbine,4,MUS$2010/PJ,2035
+0,10,electricity,all-week,evening,2025,all-year,R1,0.22640000000,windturbine,5,MUS$2010/PJ,2035
+1,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2035
+2,10,electricity,all-week,evening,2035,all-year,R1,0.77360000000,windturbine,5,MUS$2010/PJ,2035
+0,10,electricity,all-week,night,2025,all-year,R1,0.11320000000,windturbine,0,MUS$2010/PJ,2040
+1,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2040
+2,10,electricity,all-week,night,2035,all-year,R1,0.38680000000,windturbine,0,MUS$2010/PJ,2040
+3,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040
+0,10,electricity,all-week,morning,2025,all-year,R1,0.16980000000,windturbine,1,MUS$2010/PJ,2040
+1,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2040
+2,10,electricity,all-week,morning,2035,all-year,R1,0.58020000000,windturbine,1,MUS$2010/PJ,2040
+3,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040
+0,10,electricity,all-week,afternoon,2025,all-year,R1,0.11320000000,windturbine,2,MUS$2010/PJ,2040
+1,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2040
+2,10,electricity,all-week,afternoon,2035,all-year,R1,0.38680000000,windturbine,2,MUS$2010/PJ,2040
+3,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040
+0,10,electricity,all-week,early-peak,2025,all-year,R1,0.16980000000,windturbine,3,MUS$2010/PJ,2040
+1,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2040
+2,10,electricity,all-week,early-peak,2035,all-year,R1,0.58020000000,windturbine,3,MUS$2010/PJ,2040
+3,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040
+0,10,electricity,all-week,late-peak,2025,all-year,R1,0.33960000000,windturbine,4,MUS$2010/PJ,2040
+1,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2040
+2,10,electricity,all-week,late-peak,2035,all-year,R1,1.16040000000,windturbine,4,MUS$2010/PJ,2040
+3,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040
+0,10,electricity,all-week,evening,2025,all-year,R1,0.22640000000,windturbine,5,MUS$2010/PJ,2040
+1,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2040
+2,10,electricity,all-week,evening,2035,all-year,R1,0.77360000000,windturbine,5,MUS$2010/PJ,2040
+3,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040
+0,10,electricity,all-week,night,2025,all-year,R1,0.11320000000,windturbine,0,MUS$2010/PJ,2045
+1,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2045
+2,10,electricity,all-week,night,2035,all-year,R1,0.38680000000,windturbine,0,MUS$2010/PJ,2045
+3,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045
+4,10,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045
+0,10,electricity,all-week,morning,2025,all-year,R1,0.16980000000,windturbine,1,MUS$2010/PJ,2045
+1,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2045
+2,10,electricity,all-week,morning,2035,all-year,R1,0.58020000000,windturbine,1,MUS$2010/PJ,2045
+3,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045
+4,10,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045
+0,10,electricity,all-week,afternoon,2025,all-year,R1,0.11320000000,windturbine,2,MUS$2010/PJ,2045
+1,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2045
+2,10,electricity,all-week,afternoon,2035,all-year,R1,0.38680000000,windturbine,2,MUS$2010/PJ,2045
+3,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045
+4,10,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045
+0,10,electricity,all-week,early-peak,2025,all-year,R1,0.16980000000,windturbine,3,MUS$2010/PJ,2045
+1,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2045
+2,10,electricity,all-week,early-peak,2035,all-year,R1,0.58020000000,windturbine,3,MUS$2010/PJ,2045
+3,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045
+4,10,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045
+0,10,electricity,all-week,late-peak,2025,all-year,R1,0.33960000000,windturbine,4,MUS$2010/PJ,2045
+1,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2045
+2,10,electricity,all-week,late-peak,2035,all-year,R1,1.16040000000,windturbine,4,MUS$2010/PJ,2045
+3,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
+4,10,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
+0,10,electricity,all-week,evening,2025,all-year,R1,0.22640000000,windturbine,5,MUS$2010/PJ,2045
+1,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2045
+2,10,electricity,all-week,evening,2035,all-year,R1,0.77360000000,windturbine,5,MUS$2010/PJ,2045
+3,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
+4,10,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
+1,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2050
+2,10,electricity,all-week,night,2035,all-year,R1,0.38680000000,windturbine,0,MUS$2010/PJ,2050
+3,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050
+4,10,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050
+5,10,electricity,all-week,night,2050,all-year,R1,0.24650000000,windturbine,0,MUS$2010/PJ,2050
+1,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2050
+2,10,electricity,all-week,morning,2035,all-year,R1,0.58020000000,windturbine,1,MUS$2010/PJ,2050
+3,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050
+4,10,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050
+5,10,electricity,all-week,morning,2050,all-year,R1,0.36980000000,windturbine,1,MUS$2010/PJ,2050
+1,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2050
+2,10,electricity,all-week,afternoon,2035,all-year,R1,0.38680000000,windturbine,2,MUS$2010/PJ,2050
+3,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050
+4,10,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050
+5,10,electricity,all-week,afternoon,2050,all-year,R1,0.24650000000,windturbine,2,MUS$2010/PJ,2050
+1,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2050
+2,10,electricity,all-week,early-peak,2035,all-year,R1,0.58020000000,windturbine,3,MUS$2010/PJ,2050
+3,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050
+4,10,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050
+5,10,electricity,all-week,early-peak,2050,all-year,R1,0.36980000000,windturbine,3,MUS$2010/PJ,2050
+1,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2050
+2,10,electricity,all-week,late-peak,2035,all-year,R1,1.16040000000,windturbine,4,MUS$2010/PJ,2050
+3,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
+4,10,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
+5,10,electricity,all-week,late-peak,2050,all-year,R1,0.73960000000,windturbine,4,MUS$2010/PJ,2050
+1,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2050
+2,10,electricity,all-week,evening,2035,all-year,R1,0.77360000000,windturbine,5,MUS$2010/PJ,2050
+3,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050
+4,10,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050
+5,10,electricity,all-week,evening,2050,all-year,R1,0.49310000000,windturbine,5,MUS$2010/PJ,2050
diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv
index 7d122ba6..42ea9ffd 100644
--- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv
+++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv
@@ -3,37 +3,50 @@ A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
-A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025
+A1,11.40630000000,R1,2025,R1,residential,gasboiler,newcapa,2025
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2025
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
-A1,7.10000000000,R1,2025,R1,power,windturbine,newcapa,2025
+A1,2.53750000000,R1,2025,R1,power,windturbine,newcapa,2025
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
-A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,7.07360000000,R1,2025,R1,gas,gassupply1,newcapa,2025
+A1,11.40630000000,R1,2025,R1,residential,gasboiler,newcapa,2030
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2030
 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030
-A1,7.10000000000,R1,2025,R1,power,windturbine,newcapa,2030
+A1,2.53750000000,R1,2025,R1,power,windturbine,newcapa,2030
 A1,4.90000000000,R1,2030,R1,power,windturbine,newcapa,2030
 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,7.07360000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,0.12780000000,R1,2030,R1,gas,gassupply1,newcapa,2030
 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035
-A1,7.10000000000,R1,2025,R1,power,windturbine,newcapa,2035
+A1,2.53750000000,R1,2025,R1,power,windturbine,newcapa,2035
 A1,4.90000000000,R1,2030,R1,power,windturbine,newcapa,2035
-A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2035
+A1,6.96250000000,R1,2035,R1,power,windturbine,newcapa,2035
+A1,7.07360000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,0.12780000000,R1,2030,R1,gas,gassupply1,newcapa,2035
 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040
-A1,7.10000000000,R1,2025,R1,power,windturbine,newcapa,2040
+A1,2.53750000000,R1,2025,R1,power,windturbine,newcapa,2040
 A1,4.90000000000,R1,2030,R1,power,windturbine,newcapa,2040
-A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,6.96250000000,R1,2035,R1,power,windturbine,newcapa,2040
 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2040
+A1,7.07360000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,0.12780000000,R1,2030,R1,gas,gassupply1,newcapa,2040
 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045
-A1,7.10000000000,R1,2025,R1,power,windturbine,newcapa,2045
+A1,2.53750000000,R1,2025,R1,power,windturbine,newcapa,2045
 A1,4.90000000000,R1,2030,R1,power,windturbine,newcapa,2045
-A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,6.96250000000,R1,2035,R1,power,windturbine,newcapa,2045
 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2045
 A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2045
+A1,7.07360000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,0.12780000000,R1,2030,R1,gas,gassupply1,newcapa,2045
 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
 A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050
 A1,4.90000000000,R1,2030,R1,power,windturbine,newcapa,2050
-A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,6.96250000000,R1,2035,R1,power,windturbine,newcapa,2050
 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2050
 A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2050
-A1,9.50000000000,R1,2050,R1,power,windturbine,newcapa,2050
+A1,4.93750000000,R1,2050,R1,power,windturbine,newcapa,2050
+A1,7.07360000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,0.12780000000,R1,2030,R1,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
index 6e9e1ba9..13116cdb 100644
--- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
+++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/MCAPrices.csv
@@ -23,53 +23,53 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
-electricity,all-week,night,all-year,9.07710000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,11.49490000000,R1,0,MUS$2010/PJ,2025
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,7.76030000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,10.70300000000,R1,0,MUS$2010/PJ,2025
 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
-electricity,all-week,morning,all-year,9.07710000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,11.49490000000,R1,1,MUS$2010/PJ,2025
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,7.76030000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,10.70300000000,R1,1,MUS$2010/PJ,2025
 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
-electricity,all-week,afternoon,all-year,10.26860000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,13.74470000000,R1,2,MUS$2010/PJ,2025
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,8.39990000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,11.18710000000,R1,2,MUS$2010/PJ,2025
 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
-electricity,all-week,early-peak,all-year,9.07710000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,11.49490000000,R1,3,MUS$2010/PJ,2025
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,7.76030000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,10.70300000000,R1,3,MUS$2010/PJ,2025
 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
-electricity,all-week,late-peak,all-year,8.30740000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,9.92960000000,R1,4,MUS$2010/PJ,2025
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,7.34710000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,10.36620000000,R1,4,MUS$2010/PJ,2025
 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
-electricity,all-week,evening,all-year,8.30740000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,9.92960000000,R1,5,MUS$2010/PJ,2025
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,7.34710000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,10.36620000000,R1,5,MUS$2010/PJ,2025
 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
 electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,6.22830000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,8.80540000000,R1,0,MUS$2010/PJ,2030
 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
 electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,6.22830000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,8.80540000000,R1,1,MUS$2010/PJ,2030
 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
 electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2030
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,6.70490000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,8.80540000000,R1,2,MUS$2010/PJ,2030
 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
 electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,6.22830000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,8.80540000000,R1,3,MUS$2010/PJ,2030
 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
 electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,5.92040000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,8.80540000000,R1,4,MUS$2010/PJ,2030
 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
 electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,5.92040000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,8.80540000000,R1,5,MUS$2010/PJ,2030
 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
 electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2035
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035
diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv
index 5aec7805..97950ed2 100644
--- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv
+++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv
@@ -1,141 +1,141 @@
 asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2020,all-year,R1,0.03330000000,gasCCGT,0,MUS$2010/PJ,2020
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,night,2020,all-year,R1,3.05570000000,gasCCGT,0,MUS$2010/kt,2020
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2020,all-year,R1,0.06670000000,gasCCGT,1,MUS$2010/PJ,2020
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,morning,2020,all-year,R1,6.11130000000,gasCCGT,1,MUS$2010/kt,2020
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2020
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2020
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2020,all-year,R1,0.06670000000,gasCCGT,3,MUS$2010/PJ,2020
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,early-peak,2020,all-year,R1,6.11130000000,gasCCGT,3,MUS$2010/kt,2020
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2020,all-year,R1,0.05210000000,gasCCGT,0,MUS$2010/PJ,2025
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.37010000000,windturbine,0,MUS$2010/PJ,2025
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,night,2020,all-year,R1,4.77840000000,gasCCGT,0,MUS$2010/kt,2025
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2020,all-year,R1,0.07820000000,gasCCGT,1,MUS$2010/PJ,2025
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55510000000,windturbine,1,MUS$2010/PJ,2025
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,morning,2020,all-year,R1,7.16760000000,gasCCGT,1,MUS$2010/kt,2025
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2025
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.37010000000,windturbine,2,MUS$2010/PJ,2025
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2025
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2020,all-year,R1,0.07820000000,gasCCGT,3,MUS$2010/PJ,2025
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55510000000,windturbine,3,MUS$2010/PJ,2025
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,early-peak,2020,all-year,R1,7.16760000000,gasCCGT,3,MUS$2010/kt,2025
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2020,all-year,R1,0.08330000000,gasCCGT,4,MUS$2010/PJ,2025
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2025
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,late-peak,2020,all-year,R1,7.63920000000,gasCCGT,4,MUS$2010/kt,2025
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2020,all-year,R1,0.05560000000,gasCCGT,5,MUS$2010/PJ,2025
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2025
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,evening,2020,all-year,R1,5.09280000000,gasCCGT,5,MUS$2010/kt,2025
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2030
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2030
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2030
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2030
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2030
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2030
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2030
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2030
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2030
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2030
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2030
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2030
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2035
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2035
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2035
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2035
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2035
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2035
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2035
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2035
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2035
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2035
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2035
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2035
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2035
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2035
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2035
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2035
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2035
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2035
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2040
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2040
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2040
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2040
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2040
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2040
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2040
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2040
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2040
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2040
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2040
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2040
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.39440000000,windturbine,0,MUS$2010/PJ,2045
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2045
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.59170000000,windturbine,1,MUS$2010/PJ,2045
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2045
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.39440000000,windturbine,2,MUS$2010/PJ,2045
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2045
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.59170000000,windturbine,3,MUS$2010/PJ,2045
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2045
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.18330000000,windturbine,4,MUS$2010/PJ,2045
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2045
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.78890000000,windturbine,5,MUS$2010/PJ,2045
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2045
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2050
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050
-5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2050,all-year,R1,0.52780000000,windturbine,0,MUS$2010/PJ,2050
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2050
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050
-5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2050,all-year,R1,0.79170000000,windturbine,1,MUS$2010/PJ,2050
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2050
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050
-5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2050,all-year,R1,0.52780000000,windturbine,2,MUS$2010/PJ,2050
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2050
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050
-5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2050,all-year,R1,0.79170000000,windturbine,3,MUS$2010/PJ,2050
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2050
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
-5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2050,all-year,R1,1.58330000000,windturbine,4,MUS$2010/PJ,2050
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2050
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050
-5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2050,all-year,R1,1.05560000000,windturbine,5,MUS$2010/PJ,2050
+0,10,electricity,all-week,night,2020,all-year,R1,0.03330000000,gasCCGT,0,MUS$2010/PJ,2020
+0,6,CO2f,all-week,night,2020,all-year,R1,3.05570000000,gasCCGT,0,MUS$2010/kt,2020
+0,10,electricity,all-week,morning,2020,all-year,R1,0.06670000000,gasCCGT,1,MUS$2010/PJ,2020
+0,6,CO2f,all-week,morning,2020,all-year,R1,6.11130000000,gasCCGT,1,MUS$2010/kt,2020
+0,10,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2020
+0,6,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2020
+0,10,electricity,all-week,early-peak,2020,all-year,R1,0.06670000000,gasCCGT,3,MUS$2010/PJ,2020
+0,6,CO2f,all-week,early-peak,2020,all-year,R1,6.11130000000,gasCCGT,3,MUS$2010/kt,2020
+0,10,electricity,all-week,night,2020,all-year,R1,0.04770000000,gasCCGT,0,MUS$2010/PJ,2025
+1,10,electricity,all-week,night,2025,all-year,R1,0.12100000000,windturbine,0,MUS$2010/PJ,2025
+0,6,CO2f,all-week,night,2020,all-year,R1,4.37300000000,gasCCGT,0,MUS$2010/kt,2025
+0,10,electricity,all-week,morning,2020,all-year,R1,0.07160000000,gasCCGT,1,MUS$2010/PJ,2025
+1,10,electricity,all-week,morning,2025,all-year,R1,0.18160000000,windturbine,1,MUS$2010/PJ,2025
+0,6,CO2f,all-week,morning,2020,all-year,R1,6.55940000000,gasCCGT,1,MUS$2010/kt,2025
+0,10,electricity,all-week,afternoon,2020,all-year,R1,0.10000000000,gasCCGT,2,MUS$2010/PJ,2025
+1,10,electricity,all-week,afternoon,2025,all-year,R1,0.12100000000,windturbine,2,MUS$2010/PJ,2025
+0,6,CO2f,all-week,afternoon,2020,all-year,R1,9.16700000000,gasCCGT,2,MUS$2010/kt,2025
+0,10,electricity,all-week,early-peak,2020,all-year,R1,0.07160000000,gasCCGT,3,MUS$2010/PJ,2025
+1,10,electricity,all-week,early-peak,2025,all-year,R1,0.18160000000,windturbine,3,MUS$2010/PJ,2025
+0,6,CO2f,all-week,early-peak,2020,all-year,R1,6.55940000000,gasCCGT,3,MUS$2010/kt,2025
+0,10,electricity,all-week,late-peak,2020,all-year,R1,0.08330000000,gasCCGT,4,MUS$2010/PJ,2025
+1,10,electricity,all-week,late-peak,2025,all-year,R1,0.42290000000,windturbine,4,MUS$2010/PJ,2025
+0,6,CO2f,all-week,late-peak,2020,all-year,R1,7.63920000000,gasCCGT,4,MUS$2010/kt,2025
+0,10,electricity,all-week,evening,2020,all-year,R1,0.05560000000,gasCCGT,5,MUS$2010/PJ,2025
+1,10,electricity,all-week,evening,2025,all-year,R1,0.28190000000,windturbine,5,MUS$2010/PJ,2025
+0,6,CO2f,all-week,evening,2020,all-year,R1,5.09280000000,gasCCGT,5,MUS$2010/kt,2025
+1,10,electricity,all-week,night,2025,all-year,R1,0.14100000000,windturbine,0,MUS$2010/PJ,2030
+2,10,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2030
+1,10,electricity,all-week,morning,2025,all-year,R1,0.21150000000,windturbine,1,MUS$2010/PJ,2030
+2,10,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2030
+1,10,electricity,all-week,afternoon,2025,all-year,R1,0.14100000000,windturbine,2,MUS$2010/PJ,2030
+2,10,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2030
+1,10,electricity,all-week,early-peak,2025,all-year,R1,0.21150000000,windturbine,3,MUS$2010/PJ,2030
+2,10,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2030
+1,10,electricity,all-week,late-peak,2025,all-year,R1,0.42290000000,windturbine,4,MUS$2010/PJ,2030
+2,10,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2030
+1,10,electricity,all-week,evening,2025,all-year,R1,0.28190000000,windturbine,5,MUS$2010/PJ,2030
+2,10,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2030
+0,10,electricity,all-week,night,2025,all-year,R1,0.14100000000,windturbine,0,MUS$2010/PJ,2035
+1,10,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2035
+2,10,electricity,all-week,night,2035,all-year,R1,0.38680000000,windturbine,0,MUS$2010/PJ,2035
+0,10,electricity,all-week,morning,2025,all-year,R1,0.21150000000,windturbine,1,MUS$2010/PJ,2035
+1,10,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2035
+2,10,electricity,all-week,morning,2035,all-year,R1,0.58020000000,windturbine,1,MUS$2010/PJ,2035
+0,10,electricity,all-week,afternoon,2025,all-year,R1,0.14100000000,windturbine,2,MUS$2010/PJ,2035
+1,10,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2035
+2,10,electricity,all-week,afternoon,2035,all-year,R1,0.38680000000,windturbine,2,MUS$2010/PJ,2035
+0,10,electricity,all-week,early-peak,2025,all-year,R1,0.21150000000,windturbine,3,MUS$2010/PJ,2035
+1,10,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2035
+2,10,electricity,all-week,early-peak,2035,all-year,R1,0.58020000000,windturbine,3,MUS$2010/PJ,2035
+0,10,electricity,all-week,late-peak,2025,all-year,R1,0.42290000000,windturbine,4,MUS$2010/PJ,2035
+1,10,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2035
+2,10,electricity,all-week,late-peak,2035,all-year,R1,1.16040000000,windturbine,4,MUS$2010/PJ,2035
+0,10,electricity,all-week,evening,2025,all-year,R1,0.28190000000,windturbine,5,MUS$2010/PJ,2035
+1,10,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2035
+2,10,electricity,all-week,evening,2035,all-year,R1,0.77360000000,windturbine,5,MUS$2010/PJ,2035
+0,10,electricity,all-week,night,2025,all-year,R1,0.14100000000,windturbine,0,MUS$2010/PJ,2040
+1,10,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2040
+2,10,electricity,all-week,night,2035,all-year,R1,0.38680000000,windturbine,0,MUS$2010/PJ,2040
+3,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040
+0,10,electricity,all-week,morning,2025,all-year,R1,0.21150000000,windturbine,1,MUS$2010/PJ,2040
+1,10,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2040
+2,10,electricity,all-week,morning,2035,all-year,R1,0.58020000000,windturbine,1,MUS$2010/PJ,2040
+3,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040
+0,10,electricity,all-week,afternoon,2025,all-year,R1,0.14100000000,windturbine,2,MUS$2010/PJ,2040
+1,10,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2040
+2,10,electricity,all-week,afternoon,2035,all-year,R1,0.38680000000,windturbine,2,MUS$2010/PJ,2040
+3,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040
+0,10,electricity,all-week,early-peak,2025,all-year,R1,0.21150000000,windturbine,3,MUS$2010/PJ,2040
+1,10,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2040
+2,10,electricity,all-week,early-peak,2035,all-year,R1,0.58020000000,windturbine,3,MUS$2010/PJ,2040
+3,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040
+0,10,electricity,all-week,late-peak,2025,all-year,R1,0.42290000000,windturbine,4,MUS$2010/PJ,2040
+1,10,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2040
+2,10,electricity,all-week,late-peak,2035,all-year,R1,1.16040000000,windturbine,4,MUS$2010/PJ,2040
+3,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040
+0,10,electricity,all-week,evening,2025,all-year,R1,0.28190000000,windturbine,5,MUS$2010/PJ,2040
+1,10,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2040
+2,10,electricity,all-week,evening,2035,all-year,R1,0.77360000000,windturbine,5,MUS$2010/PJ,2040
+3,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040
+0,10,electricity,all-week,night,2025,all-year,R1,0.14100000000,windturbine,0,MUS$2010/PJ,2045
+1,10,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2045
+2,10,electricity,all-week,night,2035,all-year,R1,0.38680000000,windturbine,0,MUS$2010/PJ,2045
+3,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045
+4,10,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045
+0,10,electricity,all-week,morning,2025,all-year,R1,0.21150000000,windturbine,1,MUS$2010/PJ,2045
+1,10,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2045
+2,10,electricity,all-week,morning,2035,all-year,R1,0.58020000000,windturbine,1,MUS$2010/PJ,2045
+3,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045
+4,10,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045
+0,10,electricity,all-week,afternoon,2025,all-year,R1,0.14100000000,windturbine,2,MUS$2010/PJ,2045
+1,10,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2045
+2,10,electricity,all-week,afternoon,2035,all-year,R1,0.38680000000,windturbine,2,MUS$2010/PJ,2045
+3,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045
+4,10,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045
+0,10,electricity,all-week,early-peak,2025,all-year,R1,0.21150000000,windturbine,3,MUS$2010/PJ,2045
+1,10,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2045
+2,10,electricity,all-week,early-peak,2035,all-year,R1,0.58020000000,windturbine,3,MUS$2010/PJ,2045
+3,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045
+4,10,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045
+0,10,electricity,all-week,late-peak,2025,all-year,R1,0.42290000000,windturbine,4,MUS$2010/PJ,2045
+1,10,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2045
+2,10,electricity,all-week,late-peak,2035,all-year,R1,1.16040000000,windturbine,4,MUS$2010/PJ,2045
+3,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
+4,10,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
+0,10,electricity,all-week,evening,2025,all-year,R1,0.28190000000,windturbine,5,MUS$2010/PJ,2045
+1,10,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2045
+2,10,electricity,all-week,evening,2035,all-year,R1,0.77360000000,windturbine,5,MUS$2010/PJ,2045
+3,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
+4,10,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
+1,10,electricity,all-week,night,2030,all-year,R1,0.27220000000,windturbine,0,MUS$2010/PJ,2050
+2,10,electricity,all-week,night,2035,all-year,R1,0.38680000000,windturbine,0,MUS$2010/PJ,2050
+3,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050
+4,10,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050
+5,10,electricity,all-week,night,2050,all-year,R1,0.27430000000,windturbine,0,MUS$2010/PJ,2050
+1,10,electricity,all-week,morning,2030,all-year,R1,0.40830000000,windturbine,1,MUS$2010/PJ,2050
+2,10,electricity,all-week,morning,2035,all-year,R1,0.58020000000,windturbine,1,MUS$2010/PJ,2050
+3,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050
+4,10,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050
+5,10,electricity,all-week,morning,2050,all-year,R1,0.41150000000,windturbine,1,MUS$2010/PJ,2050
+1,10,electricity,all-week,afternoon,2030,all-year,R1,0.27220000000,windturbine,2,MUS$2010/PJ,2050
+2,10,electricity,all-week,afternoon,2035,all-year,R1,0.38680000000,windturbine,2,MUS$2010/PJ,2050
+3,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050
+4,10,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050
+5,10,electricity,all-week,afternoon,2050,all-year,R1,0.27430000000,windturbine,2,MUS$2010/PJ,2050
+1,10,electricity,all-week,early-peak,2030,all-year,R1,0.40830000000,windturbine,3,MUS$2010/PJ,2050
+2,10,electricity,all-week,early-peak,2035,all-year,R1,0.58020000000,windturbine,3,MUS$2010/PJ,2050
+3,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050
+4,10,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050
+5,10,electricity,all-week,early-peak,2050,all-year,R1,0.41150000000,windturbine,3,MUS$2010/PJ,2050
+1,10,electricity,all-week,late-peak,2030,all-year,R1,0.81670000000,windturbine,4,MUS$2010/PJ,2050
+2,10,electricity,all-week,late-peak,2035,all-year,R1,1.16040000000,windturbine,4,MUS$2010/PJ,2050
+3,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
+4,10,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
+5,10,electricity,all-week,late-peak,2050,all-year,R1,0.82290000000,windturbine,4,MUS$2010/PJ,2050
+1,10,electricity,all-week,evening,2030,all-year,R1,0.54440000000,windturbine,5,MUS$2010/PJ,2050
+2,10,electricity,all-week,evening,2035,all-year,R1,0.77360000000,windturbine,5,MUS$2010/PJ,2050
+3,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050
+4,10,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050
+5,10,electricity,all-week,evening,2050,all-year,R1,0.54860000000,windturbine,5,MUS$2010/PJ,2050
diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
index b57a8cc6..55ff4780 100644
--- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
+++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCACapacity.csv
@@ -3,63 +3,56 @@ A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
-A1,17.40000000000,R1,2025,R1,residential,heatpump,newcapa,2025
+A1,9.80620000000,R1,2025,R1,residential,gasboiler,newcapa,2025
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2025
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2025
-A1,0.31410000000,R1,2025,R1,power,windturbine,newcapa,2025
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2025
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2025
-A1,17.40000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,9.71990000000,R1,2025,R1,gas,gassupply1,newcapa,2025
+A1,9.80620000000,R1,2025,R1,residential,gasboiler,newcapa,2030
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2030
 A1,10.60000000000,R1,2030,R1,residential,heatpump,newcapa,2030
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2030
-A1,4.79070000000,R1,2030,R1,power,gasCCGT,newcapa,2030
-A1,0.31410000000,R1,2025,R1,power,windturbine,newcapa,2030
-A1,2.07080000000,R1,2030,R1,power,windturbine,newcapa,2030
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,2.33610000000,R1,2030,R1,power,gasCCGT,newcapa,2030
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2030
 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2030
-A1,7.38610000000,R1,2030,R1,gas,gassupply1,newcapa,2030
+A1,9.71990000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,3.28690000000,R1,2030,R1,gas,gassupply1,newcapa,2030
 A1,10.60000000000,R1,2030,R1,residential,heatpump,newcapa,2035
 A1,23.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2035
-A1,4.79070000000,R1,2030,R1,power,gasCCGT,newcapa,2035
-A1,0.31410000000,R1,2025,R1,power,windturbine,newcapa,2035
-A1,2.07080000000,R1,2030,R1,power,windturbine,newcapa,2035
-A1,5.60000000000,R1,2035,R1,power,windturbine,newcapa,2035
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2035
-A1,7.38610000000,R1,2030,R1,gas,gassupply1,newcapa,2035
-A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2035
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,2.33610000000,R1,2030,R1,power,gasCCGT,newcapa,2035
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2035
+A1,15.40620000000,R1,2035,R1,power,windturbine,newcapa,2035
+A1,9.71990000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,3.28690000000,R1,2030,R1,gas,gassupply1,newcapa,2035
 A1,23.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
 A1,16.20000000000,R1,2040,R1,residential,heatpump,newcapa,2040
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2040
-A1,4.79070000000,R1,2030,R1,power,gasCCGT,newcapa,2040
-A1,0.31410000000,R1,2025,R1,power,windturbine,newcapa,2040
-A1,2.07080000000,R1,2030,R1,power,windturbine,newcapa,2040
-A1,5.60000000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,2.33610000000,R1,2030,R1,power,gasCCGT,newcapa,2040
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2040
+A1,15.40620000000,R1,2035,R1,power,windturbine,newcapa,2040
 A1,5.60000000000,R1,2040,R1,power,windturbine,newcapa,2040
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2040
-A1,7.38610000000,R1,2030,R1,gas,gassupply1,newcapa,2040
-A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2040
+A1,9.71990000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,3.28690000000,R1,2030,R1,gas,gassupply1,newcapa,2040
 A1,16.20000000000,R1,2040,R1,residential,heatpump,newcapa,2045
 A1,28.60000000000,R1,2045,R1,residential,heatpump,newcapa,2045
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2045
-A1,4.79070000000,R1,2030,R1,power,gasCCGT,newcapa,2045
-A1,0.31410000000,R1,2025,R1,power,windturbine,newcapa,2045
-A1,2.07080000000,R1,2030,R1,power,windturbine,newcapa,2045
-A1,5.60000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,2.33610000000,R1,2030,R1,power,gasCCGT,newcapa,2045
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2045
+A1,15.40620000000,R1,2035,R1,power,windturbine,newcapa,2045
 A1,5.60000000000,R1,2040,R1,power,windturbine,newcapa,2045
 A1,5.60000000000,R1,2045,R1,power,windturbine,newcapa,2045
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045
-A1,7.38610000000,R1,2030,R1,gas,gassupply1,newcapa,2045
-A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2045
+A1,9.71990000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,3.28690000000,R1,2030,R1,gas,gassupply1,newcapa,2045
 A1,28.60000000000,R1,2045,R1,residential,heatpump,newcapa,2050
 A1,21.80000000000,R1,2050,R1,residential,heatpump,newcapa,2050
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050
-A1,4.79070000000,R1,2030,R1,power,gasCCGT,newcapa,2050
-A1,2.07080000000,R1,2030,R1,power,windturbine,newcapa,2050
-A1,5.60000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,2.33610000000,R1,2030,R1,power,gasCCGT,newcapa,2050
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,15.40620000000,R1,2035,R1,power,windturbine,newcapa,2050
 A1,5.60000000000,R1,2040,R1,power,windturbine,newcapa,2050
 A1,5.60000000000,R1,2045,R1,power,windturbine,newcapa,2050
-A1,5.91410000000,R1,2050,R1,power,windturbine,newcapa,2050
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050
-A1,7.38610000000,R1,2030,R1,gas,gassupply1,newcapa,2050
-A1,7.50000000000,R1,2035,R1,gas,gassupply1,newcapa,2050
+A1,5.60000000000,R1,2050,R1,power,windturbine,newcapa,2050
+A1,9.71990000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,3.28690000000,R1,2030,R1,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
index 8062d64f..34b6a034 100644
--- a/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
+++ b/docs/tutorial-code/modify-timing-data/1-modify-timeslices/Results/MCAPrices.csv
@@ -31,195 +31,195 @@ electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,202
 gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020
 heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020
 CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020
-electricity,all-week,night,all-year,19.96230000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,20.01080000000,R1,0,MUS$2010/PJ,2025
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,10.77760000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,11.35970000000,R1,0,MUS$2010/PJ,2025
 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
-electricity,all-week,morning,all-year,19.96230000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,20.01080000000,R1,1,MUS$2010/PJ,2025
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,10.77760000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,11.35970000000,R1,1,MUS$2010/PJ,2025
 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
-electricity,all-week,mid-afternoon,all-year,19.96230000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,mid-afternoon,all-year,20.01080000000,R1,2,MUS$2010/PJ,2025
 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025
-heat,all-week,mid-afternoon,all-year,10.77760000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,mid-afternoon,all-year,11.35970000000,R1,2,MUS$2010/PJ,2025
 CO2f,all-week,mid-afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
-electricity,all-week,early-peak,all-year,19.96230000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,20.01080000000,R1,3,MUS$2010/PJ,2025
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,10.77760000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,11.35970000000,R1,3,MUS$2010/PJ,2025
 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
-electricity,all-week,late-peak,all-year,19.96230000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,20.01080000000,R1,4,MUS$2010/PJ,2025
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,10.77760000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,11.35970000000,R1,4,MUS$2010/PJ,2025
 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
-electricity,all-week,evening,all-year,19.96230000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,20.01080000000,R1,5,MUS$2010/PJ,2025
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,10.77760000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,11.35970000000,R1,5,MUS$2010/PJ,2025
 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
-electricity,all-week,early-morning,all-year,19.96230000000,R1,6,MUS$2010/PJ,2025
+electricity,all-week,early-morning,all-year,20.01080000000,R1,6,MUS$2010/PJ,2025
 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2025
-heat,all-week,early-morning,all-year,10.77760000000,R1,6,MUS$2010/PJ,2025
+heat,all-week,early-morning,all-year,11.35970000000,R1,6,MUS$2010/PJ,2025
 CO2f,all-week,early-morning,all-year,0.12010000000,R1,6,MUS$2010/kt,2025
-electricity,all-week,late-afternoon,all-year,19.96230000000,R1,7,MUS$2010/PJ,2025
+electricity,all-week,late-afternoon,all-year,20.01080000000,R1,7,MUS$2010/PJ,2025
 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2025
-heat,all-week,late-afternoon,all-year,10.77760000000,R1,7,MUS$2010/PJ,2025
+heat,all-week,late-afternoon,all-year,11.35970000000,R1,7,MUS$2010/PJ,2025
 CO2f,all-week,late-afternoon,all-year,0.12010000000,R1,7,MUS$2010/kt,2025
-electricity,all-week,night,all-year,22.87850000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,20.85980000000,R1,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,11.65060000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,12.01480000000,R1,0,MUS$2010/PJ,2030
 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
-electricity,all-week,morning,all-year,22.87850000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,20.85980000000,R1,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,11.65060000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,12.01480000000,R1,1,MUS$2010/PJ,2030
 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
-electricity,all-week,mid-afternoon,all-year,22.87850000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,mid-afternoon,all-year,20.85980000000,R1,2,MUS$2010/PJ,2030
 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,mid-afternoon,all-year,11.65060000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,mid-afternoon,all-year,12.01480000000,R1,2,MUS$2010/PJ,2030
 CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
-electricity,all-week,early-peak,all-year,22.87850000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,20.85980000000,R1,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,11.65060000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,12.01480000000,R1,3,MUS$2010/PJ,2030
 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
-electricity,all-week,late-peak,all-year,22.87850000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,20.85980000000,R1,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,11.65060000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,12.01480000000,R1,4,MUS$2010/PJ,2030
 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
-electricity,all-week,evening,all-year,22.87850000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,20.85980000000,R1,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,11.65060000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,12.01480000000,R1,5,MUS$2010/PJ,2030
 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
-electricity,all-week,early-morning,all-year,22.87850000000,R1,6,MUS$2010/PJ,2030
+electricity,all-week,early-morning,all-year,20.85980000000,R1,6,MUS$2010/PJ,2030
 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2030
-heat,all-week,early-morning,all-year,11.65060000000,R1,6,MUS$2010/PJ,2030
+heat,all-week,early-morning,all-year,12.01480000000,R1,6,MUS$2010/PJ,2030
 CO2f,all-week,early-morning,all-year,0.15700000000,R1,6,MUS$2010/kt,2030
-electricity,all-week,late-afternoon,all-year,22.87850000000,R1,7,MUS$2010/PJ,2030
+electricity,all-week,late-afternoon,all-year,20.85980000000,R1,7,MUS$2010/PJ,2030
 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2030
-heat,all-week,late-afternoon,all-year,11.65060000000,R1,7,MUS$2010/PJ,2030
+heat,all-week,late-afternoon,all-year,12.01480000000,R1,7,MUS$2010/PJ,2030
 CO2f,all-week,late-afternoon,all-year,0.15700000000,R1,7,MUS$2010/kt,2030
-electricity,all-week,night,all-year,25.99690000000,R1,0,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,20.91030000000,R1,0,MUS$2010/PJ,2035
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035
-heat,all-week,night,all-year,12.89800000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,10.86330000000,R1,0,MUS$2010/PJ,2035
 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
-electricity,all-week,morning,all-year,25.99690000000,R1,1,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,20.91030000000,R1,1,MUS$2010/PJ,2035
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035
-heat,all-week,morning,all-year,12.89800000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,10.86330000000,R1,1,MUS$2010/PJ,2035
 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
-electricity,all-week,mid-afternoon,all-year,25.99690000000,R1,2,MUS$2010/PJ,2035
+electricity,all-week,mid-afternoon,all-year,20.91030000000,R1,2,MUS$2010/PJ,2035
 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035
-heat,all-week,mid-afternoon,all-year,12.89800000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,mid-afternoon,all-year,10.86330000000,R1,2,MUS$2010/PJ,2035
 CO2f,all-week,mid-afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
-electricity,all-week,early-peak,all-year,25.99690000000,R1,3,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,20.91030000000,R1,3,MUS$2010/PJ,2035
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035
-heat,all-week,early-peak,all-year,12.89800000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,10.86330000000,R1,3,MUS$2010/PJ,2035
 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
-electricity,all-week,late-peak,all-year,25.99690000000,R1,4,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,20.91030000000,R1,4,MUS$2010/PJ,2035
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035
-heat,all-week,late-peak,all-year,12.89800000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,10.86330000000,R1,4,MUS$2010/PJ,2035
 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
-electricity,all-week,evening,all-year,25.99690000000,R1,5,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,20.91030000000,R1,5,MUS$2010/PJ,2035
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035
-heat,all-week,evening,all-year,12.89800000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,10.86330000000,R1,5,MUS$2010/PJ,2035
 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
-electricity,all-week,early-morning,all-year,25.99690000000,R1,6,MUS$2010/PJ,2035
+electricity,all-week,early-morning,all-year,20.91030000000,R1,6,MUS$2010/PJ,2035
 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2035
-heat,all-week,early-morning,all-year,12.89800000000,R1,6,MUS$2010/PJ,2035
+heat,all-week,early-morning,all-year,10.86330000000,R1,6,MUS$2010/PJ,2035
 CO2f,all-week,early-morning,all-year,0.21490000000,R1,6,MUS$2010/kt,2035
-electricity,all-week,late-afternoon,all-year,25.99690000000,R1,7,MUS$2010/PJ,2035
+electricity,all-week,late-afternoon,all-year,20.91030000000,R1,7,MUS$2010/PJ,2035
 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2035
-heat,all-week,late-afternoon,all-year,12.89800000000,R1,7,MUS$2010/PJ,2035
+heat,all-week,late-afternoon,all-year,10.86330000000,R1,7,MUS$2010/PJ,2035
 CO2f,all-week,late-afternoon,all-year,0.21490000000,R1,7,MUS$2010/kt,2035
-electricity,all-week,night,all-year,28.22430000000,R1,0,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,21.83200000000,R1,0,MUS$2010/PJ,2040
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040
-heat,all-week,night,all-year,13.78890000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,11.23200000000,R1,0,MUS$2010/PJ,2040
 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
-electricity,all-week,morning,all-year,28.22430000000,R1,1,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,21.83200000000,R1,1,MUS$2010/PJ,2040
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040
-heat,all-week,morning,all-year,13.78890000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,11.23200000000,R1,1,MUS$2010/PJ,2040
 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
-electricity,all-week,mid-afternoon,all-year,28.22430000000,R1,2,MUS$2010/PJ,2040
+electricity,all-week,mid-afternoon,all-year,21.83200000000,R1,2,MUS$2010/PJ,2040
 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040
-heat,all-week,mid-afternoon,all-year,13.78890000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,mid-afternoon,all-year,11.23200000000,R1,2,MUS$2010/PJ,2040
 CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
-electricity,all-week,early-peak,all-year,28.22430000000,R1,3,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,21.83200000000,R1,3,MUS$2010/PJ,2040
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040
-heat,all-week,early-peak,all-year,13.78890000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,11.23200000000,R1,3,MUS$2010/PJ,2040
 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
-electricity,all-week,late-peak,all-year,28.22430000000,R1,4,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,21.83200000000,R1,4,MUS$2010/PJ,2040
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040
-heat,all-week,late-peak,all-year,13.78890000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,11.23200000000,R1,4,MUS$2010/PJ,2040
 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
-electricity,all-week,evening,all-year,28.22430000000,R1,5,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,21.83200000000,R1,5,MUS$2010/PJ,2040
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040
-heat,all-week,evening,all-year,13.78890000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,11.23200000000,R1,5,MUS$2010/PJ,2040
 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
-electricity,all-week,early-morning,all-year,28.22430000000,R1,6,MUS$2010/PJ,2040
+electricity,all-week,early-morning,all-year,21.83200000000,R1,6,MUS$2010/PJ,2040
 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2040
-heat,all-week,early-morning,all-year,13.78890000000,R1,6,MUS$2010/PJ,2040
+heat,all-week,early-morning,all-year,11.23200000000,R1,6,MUS$2010/PJ,2040
 CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040
-electricity,all-week,late-afternoon,all-year,28.22430000000,R1,7,MUS$2010/PJ,2040
+electricity,all-week,late-afternoon,all-year,21.83200000000,R1,7,MUS$2010/PJ,2040
 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2040
-heat,all-week,late-afternoon,all-year,13.78890000000,R1,7,MUS$2010/PJ,2040
+heat,all-week,late-afternoon,all-year,11.23200000000,R1,7,MUS$2010/PJ,2040
 CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040
-electricity,all-week,night,all-year,31.11670000000,R1,0,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,23.02900000000,R1,0,MUS$2010/PJ,2045
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045
-heat,all-week,night,all-year,14.94590000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,11.71080000000,R1,0,MUS$2010/PJ,2045
 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
-electricity,all-week,morning,all-year,31.11670000000,R1,1,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,23.02900000000,R1,1,MUS$2010/PJ,2045
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045
-heat,all-week,morning,all-year,14.94590000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,11.71080000000,R1,1,MUS$2010/PJ,2045
 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
-electricity,all-week,mid-afternoon,all-year,31.11670000000,R1,2,MUS$2010/PJ,2045
+electricity,all-week,mid-afternoon,all-year,23.02900000000,R1,2,MUS$2010/PJ,2045
 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045
-heat,all-week,mid-afternoon,all-year,14.94590000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,mid-afternoon,all-year,11.71080000000,R1,2,MUS$2010/PJ,2045
 CO2f,all-week,mid-afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
-electricity,all-week,early-peak,all-year,31.11670000000,R1,3,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,23.02900000000,R1,3,MUS$2010/PJ,2045
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045
-heat,all-week,early-peak,all-year,14.94590000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,11.71080000000,R1,3,MUS$2010/PJ,2045
 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
-electricity,all-week,late-peak,all-year,31.11670000000,R1,4,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,23.02900000000,R1,4,MUS$2010/PJ,2045
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045
-heat,all-week,late-peak,all-year,14.94590000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,11.71080000000,R1,4,MUS$2010/PJ,2045
 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
-electricity,all-week,evening,all-year,31.11670000000,R1,5,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,23.02900000000,R1,5,MUS$2010/PJ,2045
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
-heat,all-week,evening,all-year,14.94590000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,11.71080000000,R1,5,MUS$2010/PJ,2045
 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
-electricity,all-week,early-morning,all-year,31.11670000000,R1,6,MUS$2010/PJ,2045
+electricity,all-week,early-morning,all-year,23.02900000000,R1,6,MUS$2010/PJ,2045
 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2045
-heat,all-week,early-morning,all-year,14.94590000000,R1,6,MUS$2010/PJ,2045
+heat,all-week,early-morning,all-year,11.71080000000,R1,6,MUS$2010/PJ,2045
 CO2f,all-week,early-morning,all-year,0.35390000000,R1,6,MUS$2010/kt,2045
-electricity,all-week,late-afternoon,all-year,31.11670000000,R1,7,MUS$2010/PJ,2045
+electricity,all-week,late-afternoon,all-year,23.02900000000,R1,7,MUS$2010/PJ,2045
 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2045
-heat,all-week,late-afternoon,all-year,14.94590000000,R1,7,MUS$2010/PJ,2045
+heat,all-week,late-afternoon,all-year,11.71080000000,R1,7,MUS$2010/PJ,2045
 CO2f,all-week,late-afternoon,all-year,0.35390000000,R1,7,MUS$2010/kt,2045
-electricity,all-week,night,all-year,33.36640000000,R1,0,MUS$2010/PJ,2050
+electricity,all-week,night,all-year,23.95990000000,R1,0,MUS$2010/PJ,2050
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
-heat,all-week,night,all-year,15.84580000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,12.08320000000,R1,0,MUS$2010/PJ,2050
 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
-electricity,all-week,morning,all-year,33.36640000000,R1,1,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,23.95990000000,R1,1,MUS$2010/PJ,2050
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
-heat,all-week,morning,all-year,15.84580000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,12.08320000000,R1,1,MUS$2010/PJ,2050
 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
-electricity,all-week,mid-afternoon,all-year,33.36640000000,R1,2,MUS$2010/PJ,2050
+electricity,all-week,mid-afternoon,all-year,23.95990000000,R1,2,MUS$2010/PJ,2050
 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
-heat,all-week,mid-afternoon,all-year,15.84580000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,mid-afternoon,all-year,12.08320000000,R1,2,MUS$2010/PJ,2050
 CO2f,all-week,mid-afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
-electricity,all-week,early-peak,all-year,33.36640000000,R1,3,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,23.95990000000,R1,3,MUS$2010/PJ,2050
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
-heat,all-week,early-peak,all-year,15.84580000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,12.08320000000,R1,3,MUS$2010/PJ,2050
 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
-electricity,all-week,late-peak,all-year,33.36640000000,R1,4,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,23.95990000000,R1,4,MUS$2010/PJ,2050
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
-heat,all-week,late-peak,all-year,15.84580000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,12.08320000000,R1,4,MUS$2010/PJ,2050
 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
-electricity,all-week,evening,all-year,33.36640000000,R1,5,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,23.95990000000,R1,5,MUS$2010/PJ,2050
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
-heat,all-week,evening,all-year,15.84580000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,12.08320000000,R1,5,MUS$2010/PJ,2050
 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
-electricity,all-week,early-morning,all-year,33.36640000000,R1,6,MUS$2010/PJ,2050
+electricity,all-week,early-morning,all-year,23.95990000000,R1,6,MUS$2010/PJ,2050
 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2050
-heat,all-week,early-morning,all-year,15.84580000000,R1,6,MUS$2010/PJ,2050
+heat,all-week,early-morning,all-year,12.08320000000,R1,6,MUS$2010/PJ,2050
 CO2f,all-week,early-morning,all-year,0.43510000000,R1,6,MUS$2010/kt,2050
-electricity,all-week,late-afternoon,all-year,33.36640000000,R1,7,MUS$2010/PJ,2050
+electricity,all-week,late-afternoon,all-year,23.95990000000,R1,7,MUS$2010/PJ,2050
 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2050
-heat,all-week,late-afternoon,all-year,15.84580000000,R1,7,MUS$2010/PJ,2050
+heat,all-week,late-afternoon,all-year,12.08320000000,R1,7,MUS$2010/PJ,2050
 CO2f,all-week,late-afternoon,all-year,0.43510000000,R1,7,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
index 59c5a304..8a73c228 100644
--- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
+++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCACapacity.csv
@@ -3,126 +3,100 @@ A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
 A1,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2022
-A1,11.04000000000,R1,2022,R1,residential,heatpump,newcapa,2022
-A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2022
-A1,1.25000000000,R1,2022,R1,power,gasCCGT,newcapa,2022
-A1,5.97750000000,R1,2022,R1,power,windturbine,newcapa,2022
+A1,11.04000000000,R1,2022,R1,residential,gasboiler,newcapa,2022
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2022
+A1,9.54040000000,R1,2022,R1,gas,gassupply1,newcapa,2022
 A1,6.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2024
-A1,11.04000000000,R1,2022,R1,residential,heatpump,newcapa,2024
-A1,4.24000000000,R1,2024,R1,residential,heatpump,newcapa,2024
-A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2024
-A1,1.25000000000,R1,2022,R1,power,gasCCGT,newcapa,2024
-A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2024
-A1,5.97750000000,R1,2022,R1,power,windturbine,newcapa,2024
-A1,14.63790000000,R1,2024,R1,gas,gassupply1,newcapa,2024
+A1,11.04000000000,R1,2022,R1,residential,gasboiler,newcapa,2024
+A1,4.24000000000,R1,2024,R1,residential,gasboiler,newcapa,2024
+A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2024
+A1,9.54040000000,R1,2022,R1,gas,gassupply1,newcapa,2024
+A1,2.88710000000,R1,2024,R1,gas,gassupply1,newcapa,2024
 A1,4.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2026
-A1,11.04000000000,R1,2022,R1,residential,heatpump,newcapa,2026
-A1,4.24000000000,R1,2024,R1,residential,heatpump,newcapa,2026
-A1,4.24000000000,R1,2026,R1,residential,heatpump,newcapa,2026
-A1,0.80000000000,R1,2020,R1,power,gasCCGT,newcapa,2026
-A1,1.25000000000,R1,2022,R1,power,gasCCGT,newcapa,2026
-A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2026
-A1,2.08440000000,R1,2026,R1,power,gasCCGT,newcapa,2026
-A1,5.97750000000,R1,2022,R1,power,windturbine,newcapa,2026
+A1,11.04000000000,R1,2022,R1,residential,gasboiler,newcapa,2026
+A1,4.24000000000,R1,2024,R1,residential,gasboiler,newcapa,2026
+A1,4.24000000000,R1,2026,R1,residential,gasboiler,newcapa,2026
+A1,13.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2026
+A1,9.54040000000,R1,2022,R1,gas,gassupply1,newcapa,2026
+A1,2.88710000000,R1,2024,R1,gas,gassupply1,newcapa,2026
+A1,4.38710000000,R1,2026,R1,gas,gassupply1,newcapa,2026
 A1,2.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2028
-A1,11.04000000000,R1,2022,R1,residential,heatpump,newcapa,2028
-A1,4.24000000000,R1,2024,R1,residential,heatpump,newcapa,2028
-A1,4.24000000000,R1,2026,R1,residential,heatpump,newcapa,2028
-A1,4.24000000000,R1,2028,R1,residential,heatpump,newcapa,2028
+A1,11.04000000000,R1,2022,R1,residential,gasboiler,newcapa,2028
+A1,4.24000000000,R1,2024,R1,residential,gasboiler,newcapa,2028
+A1,4.24000000000,R1,2026,R1,residential,gasboiler,newcapa,2028
+A1,1.99000000000,R1,2028,R1,residential,gasboiler,newcapa,2028
+A1,2.25000000000,R1,2028,R1,residential,heatpump,newcapa,2028
 A1,0.40000000000,R1,2020,R1,power,gasCCGT,newcapa,2028
-A1,1.25000000000,R1,2022,R1,power,gasCCGT,newcapa,2028
-A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2028
-A1,2.08440000000,R1,2026,R1,power,gasCCGT,newcapa,2028
-A1,2.28440000000,R1,2028,R1,power,gasCCGT,newcapa,2028
-A1,5.97750000000,R1,2022,R1,power,windturbine,newcapa,2028
-A1,15.77630000000,R1,2028,R1,gas,gassupply1,newcapa,2028
-A1,11.04000000000,R1,2022,R1,residential,heatpump,newcapa,2030
-A1,4.24000000000,R1,2024,R1,residential,heatpump,newcapa,2030
-A1,4.24000000000,R1,2026,R1,residential,heatpump,newcapa,2030
-A1,4.24000000000,R1,2028,R1,residential,heatpump,newcapa,2030
-A1,4.24000000000,R1,2030,R1,residential,heatpump,newcapa,2030
-A1,1.25000000000,R1,2022,R1,power,gasCCGT,newcapa,2030
-A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2030
-A1,2.08440000000,R1,2026,R1,power,gasCCGT,newcapa,2030
-A1,2.28440000000,R1,2028,R1,power,gasCCGT,newcapa,2030
-A1,5.97750000000,R1,2022,R1,power,windturbine,newcapa,2030
-A1,5.14000000000,R1,2030,R1,power,windturbine,newcapa,2030
+A1,0.60000000000,R1,2028,R1,power,gasCCGT,newcapa,2028
+A1,10.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2028
+A1,9.54040000000,R1,2022,R1,gas,gassupply1,newcapa,2028
+A1,2.88710000000,R1,2024,R1,gas,gassupply1,newcapa,2028
+A1,4.38710000000,R1,2026,R1,gas,gassupply1,newcapa,2028
+A1,4.65710000000,R1,2028,R1,gas,gassupply1,newcapa,2028
+A1,11.04000000000,R1,2022,R1,residential,gasboiler,newcapa,2030
+A1,4.24000000000,R1,2024,R1,residential,gasboiler,newcapa,2030
+A1,4.24000000000,R1,2026,R1,residential,gasboiler,newcapa,2030
+A1,1.99000000000,R1,2028,R1,residential,gasboiler,newcapa,2030
+A1,1.42750000000,R1,2030,R1,residential,gasboiler,newcapa,2030
+A1,2.25000000000,R1,2028,R1,residential,heatpump,newcapa,2030
+A1,2.81250000000,R1,2030,R1,residential,heatpump,newcapa,2030
+A1,0.60000000000,R1,2028,R1,power,gasCCGT,newcapa,2030
+A1,0.65000000000,R1,2030,R1,power,gasCCGT,newcapa,2030
+A1,2.25000000000,R1,2030,R1,power,windturbine,newcapa,2030
 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
-A1,14.63790000000,R1,2024,R1,gas,gassupply1,newcapa,2030
-A1,15.77630000000,R1,2028,R1,gas,gassupply1,newcapa,2030
-A1,4.24000000000,R1,2024,R1,residential,heatpump,newcapa,2032
-A1,4.24000000000,R1,2026,R1,residential,heatpump,newcapa,2032
-A1,4.24000000000,R1,2028,R1,residential,heatpump,newcapa,2032
-A1,4.24000000000,R1,2030,R1,residential,heatpump,newcapa,2032
-A1,13.28000000000,R1,2032,R1,residential,heatpump,newcapa,2032
-A1,1.25000000000,R1,2022,R1,power,gasCCGT,newcapa,2032
-A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2032
-A1,2.08440000000,R1,2026,R1,power,gasCCGT,newcapa,2032
-A1,2.28440000000,R1,2028,R1,power,gasCCGT,newcapa,2032
-A1,5.97750000000,R1,2022,R1,power,windturbine,newcapa,2032
-A1,5.14000000000,R1,2030,R1,power,windturbine,newcapa,2032
-A1,2.24000000000,R1,2032,R1,power,windturbine,newcapa,2032
-A1,4.24000000000,R1,2026,R1,residential,heatpump,newcapa,2034
-A1,4.24000000000,R1,2028,R1,residential,heatpump,newcapa,2034
-A1,4.24000000000,R1,2030,R1,residential,heatpump,newcapa,2034
-A1,13.28000000000,R1,2032,R1,residential,heatpump,newcapa,2034
+A1,9.54040000000,R1,2022,R1,gas,gassupply1,newcapa,2030
+A1,2.88710000000,R1,2024,R1,gas,gassupply1,newcapa,2030
+A1,4.38710000000,R1,2026,R1,gas,gassupply1,newcapa,2030
+A1,4.65710000000,R1,2028,R1,gas,gassupply1,newcapa,2030
+A1,2.67960000000,R1,2030,R1,gas,gassupply1,newcapa,2030
+A1,4.24000000000,R1,2024,R1,residential,gasboiler,newcapa,2032
+A1,4.24000000000,R1,2026,R1,residential,gasboiler,newcapa,2032
+A1,1.99000000000,R1,2028,R1,residential,gasboiler,newcapa,2032
+A1,1.42750000000,R1,2030,R1,residential,gasboiler,newcapa,2032
+A1,6.95190000000,R1,2032,R1,residential,gasboiler,newcapa,2032
+A1,2.25000000000,R1,2028,R1,residential,heatpump,newcapa,2032
+A1,2.81250000000,R1,2030,R1,residential,heatpump,newcapa,2032
+A1,6.32810000000,R1,2032,R1,residential,heatpump,newcapa,2032
+A1,0.60000000000,R1,2028,R1,power,gasCCGT,newcapa,2032
+A1,0.65000000000,R1,2030,R1,power,gasCCGT,newcapa,2032
+A1,1.56250000000,R1,2032,R1,power,gasCCGT,newcapa,2032
+A1,2.25000000000,R1,2030,R1,power,windturbine,newcapa,2032
+A1,2.81250000000,R1,2032,R1,power,windturbine,newcapa,2032
+A1,4.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2032
+A1,9.54040000000,R1,2022,R1,gas,gassupply1,newcapa,2032
+A1,2.88710000000,R1,2024,R1,gas,gassupply1,newcapa,2032
+A1,4.38710000000,R1,2026,R1,gas,gassupply1,newcapa,2032
+A1,4.65710000000,R1,2028,R1,gas,gassupply1,newcapa,2032
+A1,2.67960000000,R1,2030,R1,gas,gassupply1,newcapa,2032
+A1,0.34020000000,R1,2032,R1,gas,gassupply1,newcapa,2032
+A1,4.24000000000,R1,2026,R1,residential,gasboiler,newcapa,2034
+A1,1.99000000000,R1,2028,R1,residential,gasboiler,newcapa,2034
+A1,1.42750000000,R1,2030,R1,residential,gasboiler,newcapa,2034
+A1,6.95190000000,R1,2032,R1,residential,gasboiler,newcapa,2034
+A1,2.25000000000,R1,2028,R1,residential,heatpump,newcapa,2034
+A1,2.81250000000,R1,2030,R1,residential,heatpump,newcapa,2034
+A1,6.32810000000,R1,2032,R1,residential,heatpump,newcapa,2034
 A1,6.48000000000,R1,2034,R1,residential,heatpump,newcapa,2034
-A1,1.25000000000,R1,2022,R1,power,gasCCGT,newcapa,2034
-A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2034
-A1,2.08440000000,R1,2026,R1,power,gasCCGT,newcapa,2034
-A1,2.28440000000,R1,2028,R1,power,gasCCGT,newcapa,2034
-A1,5.97750000000,R1,2022,R1,power,windturbine,newcapa,2034
-A1,5.14000000000,R1,2030,R1,power,windturbine,newcapa,2034
-A1,2.24000000000,R1,2032,R1,power,windturbine,newcapa,2034
-A1,2.24000000000,R1,2034,R1,power,windturbine,newcapa,2034
-A1,12.53060000000,R1,2034,R1,gas,gassupply1,newcapa,2034
-A1,4.24000000000,R1,2028,R1,residential,heatpump,newcapa,2036
-A1,4.24000000000,R1,2030,R1,residential,heatpump,newcapa,2036
-A1,13.28000000000,R1,2032,R1,residential,heatpump,newcapa,2036
+A1,0.60000000000,R1,2028,R1,power,gasCCGT,newcapa,2034
+A1,0.65000000000,R1,2030,R1,power,gasCCGT,newcapa,2034
+A1,1.56250000000,R1,2032,R1,power,gasCCGT,newcapa,2034
+A1,0.06750000000,R1,2034,R1,power,gasCCGT,newcapa,2034
+A1,2.25000000000,R1,2030,R1,power,windturbine,newcapa,2034
+A1,2.81250000000,R1,2032,R1,power,windturbine,newcapa,2034
+A1,6.32810000000,R1,2034,R1,power,windturbine,newcapa,2034
+A1,1.99000000000,R1,2028,R1,residential,gasboiler,newcapa,2036
+A1,1.42750000000,R1,2030,R1,residential,gasboiler,newcapa,2036
+A1,6.95190000000,R1,2032,R1,residential,gasboiler,newcapa,2036
+A1,2.25000000000,R1,2028,R1,residential,heatpump,newcapa,2036
+A1,2.81250000000,R1,2030,R1,residential,heatpump,newcapa,2036
+A1,6.32810000000,R1,2032,R1,residential,heatpump,newcapa,2036
 A1,6.48000000000,R1,2034,R1,residential,heatpump,newcapa,2036
 A1,6.48000000000,R1,2036,R1,residential,heatpump,newcapa,2036
-A1,1.25000000000,R1,2022,R1,power,gasCCGT,newcapa,2036
-A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2036
-A1,2.08440000000,R1,2026,R1,power,gasCCGT,newcapa,2036
-A1,2.28440000000,R1,2028,R1,power,gasCCGT,newcapa,2036
-A1,5.97750000000,R1,2022,R1,power,windturbine,newcapa,2036
-A1,5.14000000000,R1,2030,R1,power,windturbine,newcapa,2036
-A1,2.24000000000,R1,2032,R1,power,windturbine,newcapa,2036
-A1,2.24000000000,R1,2034,R1,power,windturbine,newcapa,2036
-A1,2.24000000000,R1,2036,R1,power,windturbine,newcapa,2036
-A1,4.24000000000,R1,2030,R1,residential,heatpump,newcapa,2038
-A1,13.28000000000,R1,2032,R1,residential,heatpump,newcapa,2038
-A1,6.48000000000,R1,2034,R1,residential,heatpump,newcapa,2038
-A1,6.48000000000,R1,2036,R1,residential,heatpump,newcapa,2038
-A1,6.48000000000,R1,2038,R1,residential,heatpump,newcapa,2038
-A1,1.25000000000,R1,2022,R1,power,gasCCGT,newcapa,2038
-A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2038
-A1,2.08440000000,R1,2026,R1,power,gasCCGT,newcapa,2038
-A1,2.28440000000,R1,2028,R1,power,gasCCGT,newcapa,2038
-A1,5.97750000000,R1,2022,R1,power,windturbine,newcapa,2038
-A1,5.14000000000,R1,2030,R1,power,windturbine,newcapa,2038
-A1,2.24000000000,R1,2032,R1,power,windturbine,newcapa,2038
-A1,2.24000000000,R1,2034,R1,power,windturbine,newcapa,2038
-A1,2.24000000000,R1,2036,R1,power,windturbine,newcapa,2038
-A1,2.24000000000,R1,2038,R1,power,windturbine,newcapa,2038
-A1,12.53060000000,R1,2038,R1,gas,gassupply1,newcapa,2038
-A1,13.28000000000,R1,2032,R1,residential,heatpump,newcapa,2040
-A1,6.48000000000,R1,2034,R1,residential,heatpump,newcapa,2040
-A1,6.48000000000,R1,2036,R1,residential,heatpump,newcapa,2040
-A1,6.48000000000,R1,2038,R1,residential,heatpump,newcapa,2040
-A1,6.48000000000,R1,2040,R1,residential,heatpump,newcapa,2040
-A1,1.25000000000,R1,2022,R1,power,gasCCGT,newcapa,2040
-A1,1.88440000000,R1,2024,R1,power,gasCCGT,newcapa,2040
-A1,2.08440000000,R1,2026,R1,power,gasCCGT,newcapa,2040
-A1,2.28440000000,R1,2028,R1,power,gasCCGT,newcapa,2040
-A1,5.97750000000,R1,2022,R1,power,windturbine,newcapa,2040
-A1,5.14000000000,R1,2030,R1,power,windturbine,newcapa,2040
-A1,2.24000000000,R1,2032,R1,power,windturbine,newcapa,2040
-A1,2.24000000000,R1,2034,R1,power,windturbine,newcapa,2040
-A1,2.24000000000,R1,2036,R1,power,windturbine,newcapa,2040
-A1,2.24000000000,R1,2038,R1,power,windturbine,newcapa,2040
-A1,2.24000000000,R1,2040,R1,power,windturbine,newcapa,2040
-A1,14.63790000000,R1,2024,R1,gas,gassupply1,newcapa,2040
-A1,15.77630000000,R1,2028,R1,gas,gassupply1,newcapa,2040
-A1,12.53060000000,R1,2034,R1,gas,gassupply1,newcapa,2040
-A1,12.53060000000,R1,2038,R1,gas,gassupply1,newcapa,2040
+A1,0.60000000000,R1,2028,R1,power,gasCCGT,newcapa,2036
+A1,0.65000000000,R1,2030,R1,power,gasCCGT,newcapa,2036
+A1,1.56250000000,R1,2032,R1,power,gasCCGT,newcapa,2036
+A1,0.06750000000,R1,2034,R1,power,gasCCGT,newcapa,2036
+A1,2.25000000000,R1,2030,R1,power,windturbine,newcapa,2036
+A1,2.81250000000,R1,2032,R1,power,windturbine,newcapa,2036
+A1,6.32810000000,R1,2034,R1,power,windturbine,newcapa,2036
+A1,6.48000000000,R1,2036,R1,power,windturbine,newcapa,2036
diff --git a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
index ef3c5b0b..ed89ff05 100644
--- a/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
+++ b/docs/tutorial-code/modify-timing-data/2-modify-time-framework/Results/MCAPrices.csv
@@ -31,323 +31,259 @@ electricity,all-week,late-afternoon,all-year,19.50000000000,R1,7,MUS$2010/PJ,202
 gas,all-week,late-afternoon,all-year,7.15280000000,R1,7,MUS$2010/PJ,2020
 heat,all-week,late-afternoon,all-year,100.00000000000,R1,7,MUS$2010/PJ,2020
 CO2f,all-week,late-afternoon,all-year,0.08310000000,R1,7,MUS$2010/kt,2020
-electricity,all-week,night,all-year,17.62220000000,R1,0,MUS$2010/PJ,2022
+electricity,all-week,night,all-year,26.30340000000,R1,0,MUS$2010/PJ,2022
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2022
-heat,all-week,night,all-year,9.89130000000,R1,0,MUS$2010/PJ,2022
+heat,all-week,night,all-year,10.36500000000,R1,0,MUS$2010/PJ,2022
 CO2f,all-week,night,all-year,0.09790000000,R1,0,MUS$2010/kt,2022
-electricity,all-week,morning,all-year,17.62220000000,R1,1,MUS$2010/PJ,2022
+electricity,all-week,morning,all-year,26.30340000000,R1,1,MUS$2010/PJ,2022
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2022
-heat,all-week,morning,all-year,9.89130000000,R1,1,MUS$2010/PJ,2022
+heat,all-week,morning,all-year,10.36500000000,R1,1,MUS$2010/PJ,2022
 CO2f,all-week,morning,all-year,0.09790000000,R1,1,MUS$2010/kt,2022
-electricity,all-week,mid-afternoon,all-year,17.62220000000,R1,2,MUS$2010/PJ,2022
+electricity,all-week,mid-afternoon,all-year,26.30340000000,R1,2,MUS$2010/PJ,2022
 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2022
-heat,all-week,mid-afternoon,all-year,9.89130000000,R1,2,MUS$2010/PJ,2022
+heat,all-week,mid-afternoon,all-year,10.36500000000,R1,2,MUS$2010/PJ,2022
 CO2f,all-week,mid-afternoon,all-year,0.09790000000,R1,2,MUS$2010/kt,2022
-electricity,all-week,early-peak,all-year,17.62220000000,R1,3,MUS$2010/PJ,2022
+electricity,all-week,early-peak,all-year,26.30340000000,R1,3,MUS$2010/PJ,2022
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2022
-heat,all-week,early-peak,all-year,9.89130000000,R1,3,MUS$2010/PJ,2022
+heat,all-week,early-peak,all-year,10.36500000000,R1,3,MUS$2010/PJ,2022
 CO2f,all-week,early-peak,all-year,0.09790000000,R1,3,MUS$2010/kt,2022
-electricity,all-week,late-peak,all-year,17.62220000000,R1,4,MUS$2010/PJ,2022
+electricity,all-week,late-peak,all-year,26.30340000000,R1,4,MUS$2010/PJ,2022
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2022
-heat,all-week,late-peak,all-year,9.89130000000,R1,4,MUS$2010/PJ,2022
+heat,all-week,late-peak,all-year,10.36500000000,R1,4,MUS$2010/PJ,2022
 CO2f,all-week,late-peak,all-year,0.09790000000,R1,4,MUS$2010/kt,2022
-electricity,all-week,evening,all-year,17.62220000000,R1,5,MUS$2010/PJ,2022
+electricity,all-week,evening,all-year,26.30340000000,R1,5,MUS$2010/PJ,2022
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2022
-heat,all-week,evening,all-year,9.89130000000,R1,5,MUS$2010/PJ,2022
+heat,all-week,evening,all-year,10.36500000000,R1,5,MUS$2010/PJ,2022
 CO2f,all-week,evening,all-year,0.09790000000,R1,5,MUS$2010/kt,2022
-electricity,all-week,early-morning,all-year,17.62220000000,R1,6,MUS$2010/PJ,2022
+electricity,all-week,early-morning,all-year,26.30340000000,R1,6,MUS$2010/PJ,2022
 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2022
-heat,all-week,early-morning,all-year,9.89130000000,R1,6,MUS$2010/PJ,2022
+heat,all-week,early-morning,all-year,10.36500000000,R1,6,MUS$2010/PJ,2022
 CO2f,all-week,early-morning,all-year,0.09790000000,R1,6,MUS$2010/kt,2022
-electricity,all-week,late-afternoon,all-year,17.62220000000,R1,7,MUS$2010/PJ,2022
+electricity,all-week,late-afternoon,all-year,26.30340000000,R1,7,MUS$2010/PJ,2022
 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2022
-heat,all-week,late-afternoon,all-year,9.89130000000,R1,7,MUS$2010/PJ,2022
+heat,all-week,late-afternoon,all-year,10.36500000000,R1,7,MUS$2010/PJ,2022
 CO2f,all-week,late-afternoon,all-year,0.09790000000,R1,7,MUS$2010/kt,2022
-electricity,all-week,night,all-year,18.54580000000,R1,0,MUS$2010/PJ,2024
+electricity,all-week,night,all-year,26.30340000000,R1,0,MUS$2010/PJ,2024
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2024
-heat,all-week,night,all-year,10.31320000000,R1,0,MUS$2010/PJ,2024
+heat,all-week,night,all-year,11.32090000000,R1,0,MUS$2010/PJ,2024
 CO2f,all-week,night,all-year,0.11270000000,R1,0,MUS$2010/kt,2024
-electricity,all-week,morning,all-year,18.54580000000,R1,1,MUS$2010/PJ,2024
+electricity,all-week,morning,all-year,26.30340000000,R1,1,MUS$2010/PJ,2024
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2024
-heat,all-week,morning,all-year,10.31320000000,R1,1,MUS$2010/PJ,2024
+heat,all-week,morning,all-year,11.32090000000,R1,1,MUS$2010/PJ,2024
 CO2f,all-week,morning,all-year,0.11270000000,R1,1,MUS$2010/kt,2024
-electricity,all-week,mid-afternoon,all-year,18.54580000000,R1,2,MUS$2010/PJ,2024
+electricity,all-week,mid-afternoon,all-year,26.30340000000,R1,2,MUS$2010/PJ,2024
 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2024
-heat,all-week,mid-afternoon,all-year,10.31320000000,R1,2,MUS$2010/PJ,2024
+heat,all-week,mid-afternoon,all-year,11.32090000000,R1,2,MUS$2010/PJ,2024
 CO2f,all-week,mid-afternoon,all-year,0.11270000000,R1,2,MUS$2010/kt,2024
-electricity,all-week,early-peak,all-year,18.54580000000,R1,3,MUS$2010/PJ,2024
+electricity,all-week,early-peak,all-year,26.30340000000,R1,3,MUS$2010/PJ,2024
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2024
-heat,all-week,early-peak,all-year,10.31320000000,R1,3,MUS$2010/PJ,2024
+heat,all-week,early-peak,all-year,11.32090000000,R1,3,MUS$2010/PJ,2024
 CO2f,all-week,early-peak,all-year,0.11270000000,R1,3,MUS$2010/kt,2024
-electricity,all-week,late-peak,all-year,18.54580000000,R1,4,MUS$2010/PJ,2024
+electricity,all-week,late-peak,all-year,26.30340000000,R1,4,MUS$2010/PJ,2024
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2024
-heat,all-week,late-peak,all-year,10.31320000000,R1,4,MUS$2010/PJ,2024
+heat,all-week,late-peak,all-year,11.32090000000,R1,4,MUS$2010/PJ,2024
 CO2f,all-week,late-peak,all-year,0.11270000000,R1,4,MUS$2010/kt,2024
-electricity,all-week,evening,all-year,18.54580000000,R1,5,MUS$2010/PJ,2024
+electricity,all-week,evening,all-year,26.30340000000,R1,5,MUS$2010/PJ,2024
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2024
-heat,all-week,evening,all-year,10.31320000000,R1,5,MUS$2010/PJ,2024
+heat,all-week,evening,all-year,11.32090000000,R1,5,MUS$2010/PJ,2024
 CO2f,all-week,evening,all-year,0.11270000000,R1,5,MUS$2010/kt,2024
-electricity,all-week,early-morning,all-year,18.54580000000,R1,6,MUS$2010/PJ,2024
+electricity,all-week,early-morning,all-year,26.30340000000,R1,6,MUS$2010/PJ,2024
 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2024
-heat,all-week,early-morning,all-year,10.31320000000,R1,6,MUS$2010/PJ,2024
+heat,all-week,early-morning,all-year,11.32090000000,R1,6,MUS$2010/PJ,2024
 CO2f,all-week,early-morning,all-year,0.11270000000,R1,6,MUS$2010/kt,2024
-electricity,all-week,late-afternoon,all-year,18.54580000000,R1,7,MUS$2010/PJ,2024
+electricity,all-week,late-afternoon,all-year,26.30340000000,R1,7,MUS$2010/PJ,2024
 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2024
-heat,all-week,late-afternoon,all-year,10.31320000000,R1,7,MUS$2010/PJ,2024
+heat,all-week,late-afternoon,all-year,11.32090000000,R1,7,MUS$2010/PJ,2024
 CO2f,all-week,late-afternoon,all-year,0.11270000000,R1,7,MUS$2010/kt,2024
-electricity,all-week,night,all-year,19.65640000000,R1,0,MUS$2010/PJ,2026
+electricity,all-week,night,all-year,26.30340000000,R1,0,MUS$2010/PJ,2026
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2026
-heat,all-week,night,all-year,10.68750000000,R1,0,MUS$2010/PJ,2026
+heat,all-week,night,all-year,12.27670000000,R1,0,MUS$2010/PJ,2026
 CO2f,all-week,night,all-year,0.12750000000,R1,0,MUS$2010/kt,2026
-electricity,all-week,morning,all-year,19.65640000000,R1,1,MUS$2010/PJ,2026
+electricity,all-week,morning,all-year,26.30340000000,R1,1,MUS$2010/PJ,2026
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2026
-heat,all-week,morning,all-year,10.68750000000,R1,1,MUS$2010/PJ,2026
+heat,all-week,morning,all-year,12.27670000000,R1,1,MUS$2010/PJ,2026
 CO2f,all-week,morning,all-year,0.12750000000,R1,1,MUS$2010/kt,2026
-electricity,all-week,mid-afternoon,all-year,19.65640000000,R1,2,MUS$2010/PJ,2026
+electricity,all-week,mid-afternoon,all-year,26.30340000000,R1,2,MUS$2010/PJ,2026
 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2026
-heat,all-week,mid-afternoon,all-year,10.68750000000,R1,2,MUS$2010/PJ,2026
+heat,all-week,mid-afternoon,all-year,12.27670000000,R1,2,MUS$2010/PJ,2026
 CO2f,all-week,mid-afternoon,all-year,0.12750000000,R1,2,MUS$2010/kt,2026
-electricity,all-week,early-peak,all-year,19.65640000000,R1,3,MUS$2010/PJ,2026
+electricity,all-week,early-peak,all-year,26.30340000000,R1,3,MUS$2010/PJ,2026
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2026
-heat,all-week,early-peak,all-year,10.68750000000,R1,3,MUS$2010/PJ,2026
+heat,all-week,early-peak,all-year,12.27670000000,R1,3,MUS$2010/PJ,2026
 CO2f,all-week,early-peak,all-year,0.12750000000,R1,3,MUS$2010/kt,2026
-electricity,all-week,late-peak,all-year,19.65640000000,R1,4,MUS$2010/PJ,2026
+electricity,all-week,late-peak,all-year,26.30340000000,R1,4,MUS$2010/PJ,2026
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2026
-heat,all-week,late-peak,all-year,10.68750000000,R1,4,MUS$2010/PJ,2026
+heat,all-week,late-peak,all-year,12.27670000000,R1,4,MUS$2010/PJ,2026
 CO2f,all-week,late-peak,all-year,0.12750000000,R1,4,MUS$2010/kt,2026
-electricity,all-week,evening,all-year,19.65640000000,R1,5,MUS$2010/PJ,2026
+electricity,all-week,evening,all-year,26.30340000000,R1,5,MUS$2010/PJ,2026
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2026
-heat,all-week,evening,all-year,10.68750000000,R1,5,MUS$2010/PJ,2026
+heat,all-week,evening,all-year,12.27670000000,R1,5,MUS$2010/PJ,2026
 CO2f,all-week,evening,all-year,0.12750000000,R1,5,MUS$2010/kt,2026
-electricity,all-week,early-morning,all-year,19.65640000000,R1,6,MUS$2010/PJ,2026
+electricity,all-week,early-morning,all-year,26.30340000000,R1,6,MUS$2010/PJ,2026
 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2026
-heat,all-week,early-morning,all-year,10.68750000000,R1,6,MUS$2010/PJ,2026
+heat,all-week,early-morning,all-year,12.27670000000,R1,6,MUS$2010/PJ,2026
 CO2f,all-week,early-morning,all-year,0.12750000000,R1,6,MUS$2010/kt,2026
-electricity,all-week,late-afternoon,all-year,19.65640000000,R1,7,MUS$2010/PJ,2026
+electricity,all-week,late-afternoon,all-year,26.30340000000,R1,7,MUS$2010/PJ,2026
 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2026
-heat,all-week,late-afternoon,all-year,10.68750000000,R1,7,MUS$2010/PJ,2026
+heat,all-week,late-afternoon,all-year,12.27670000000,R1,7,MUS$2010/PJ,2026
 CO2f,all-week,late-afternoon,all-year,0.12750000000,R1,7,MUS$2010/kt,2026
-electricity,all-week,night,all-year,20.85390000000,R1,0,MUS$2010/PJ,2028
+electricity,all-week,night,all-year,22.04200000000,R1,0,MUS$2010/PJ,2028
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2028
-heat,all-week,night,all-year,11.02650000000,R1,0,MUS$2010/PJ,2028
+heat,all-week,night,all-year,13.06520000000,R1,0,MUS$2010/PJ,2028
 CO2f,all-week,night,all-year,0.14220000000,R1,0,MUS$2010/kt,2028
-electricity,all-week,morning,all-year,20.85390000000,R1,1,MUS$2010/PJ,2028
+electricity,all-week,morning,all-year,22.04200000000,R1,1,MUS$2010/PJ,2028
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2028
-heat,all-week,morning,all-year,11.02650000000,R1,1,MUS$2010/PJ,2028
+heat,all-week,morning,all-year,13.06520000000,R1,1,MUS$2010/PJ,2028
 CO2f,all-week,morning,all-year,0.14220000000,R1,1,MUS$2010/kt,2028
-electricity,all-week,mid-afternoon,all-year,20.85390000000,R1,2,MUS$2010/PJ,2028
+electricity,all-week,mid-afternoon,all-year,22.04200000000,R1,2,MUS$2010/PJ,2028
 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2028
-heat,all-week,mid-afternoon,all-year,11.02650000000,R1,2,MUS$2010/PJ,2028
+heat,all-week,mid-afternoon,all-year,13.06520000000,R1,2,MUS$2010/PJ,2028
 CO2f,all-week,mid-afternoon,all-year,0.14220000000,R1,2,MUS$2010/kt,2028
-electricity,all-week,early-peak,all-year,20.85390000000,R1,3,MUS$2010/PJ,2028
+electricity,all-week,early-peak,all-year,22.04200000000,R1,3,MUS$2010/PJ,2028
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2028
-heat,all-week,early-peak,all-year,11.02650000000,R1,3,MUS$2010/PJ,2028
+heat,all-week,early-peak,all-year,13.06520000000,R1,3,MUS$2010/PJ,2028
 CO2f,all-week,early-peak,all-year,0.14220000000,R1,3,MUS$2010/kt,2028
-electricity,all-week,late-peak,all-year,20.85390000000,R1,4,MUS$2010/PJ,2028
+electricity,all-week,late-peak,all-year,22.04200000000,R1,4,MUS$2010/PJ,2028
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2028
-heat,all-week,late-peak,all-year,11.02650000000,R1,4,MUS$2010/PJ,2028
+heat,all-week,late-peak,all-year,13.06520000000,R1,4,MUS$2010/PJ,2028
 CO2f,all-week,late-peak,all-year,0.14220000000,R1,4,MUS$2010/kt,2028
-electricity,all-week,evening,all-year,20.85390000000,R1,5,MUS$2010/PJ,2028
+electricity,all-week,evening,all-year,22.04200000000,R1,5,MUS$2010/PJ,2028
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2028
-heat,all-week,evening,all-year,11.02650000000,R1,5,MUS$2010/PJ,2028
+heat,all-week,evening,all-year,13.06520000000,R1,5,MUS$2010/PJ,2028
 CO2f,all-week,evening,all-year,0.14220000000,R1,5,MUS$2010/kt,2028
-electricity,all-week,early-morning,all-year,20.85390000000,R1,6,MUS$2010/PJ,2028
+electricity,all-week,early-morning,all-year,22.04200000000,R1,6,MUS$2010/PJ,2028
 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2028
-heat,all-week,early-morning,all-year,11.02650000000,R1,6,MUS$2010/PJ,2028
+heat,all-week,early-morning,all-year,13.06520000000,R1,6,MUS$2010/PJ,2028
 CO2f,all-week,early-morning,all-year,0.14220000000,R1,6,MUS$2010/kt,2028
-electricity,all-week,late-afternoon,all-year,20.85390000000,R1,7,MUS$2010/PJ,2028
+electricity,all-week,late-afternoon,all-year,22.04200000000,R1,7,MUS$2010/PJ,2028
 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2028
-heat,all-week,late-afternoon,all-year,11.02650000000,R1,7,MUS$2010/PJ,2028
+heat,all-week,late-afternoon,all-year,13.06520000000,R1,7,MUS$2010/PJ,2028
 CO2f,all-week,late-afternoon,all-year,0.14220000000,R1,7,MUS$2010/kt,2028
-electricity,all-week,night,all-year,20.98330000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,20.69530000000,R1,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,10.89260000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,13.57170000000,R1,0,MUS$2010/PJ,2030
 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
-electricity,all-week,morning,all-year,20.98330000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,20.69530000000,R1,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,10.89260000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,13.57170000000,R1,1,MUS$2010/PJ,2030
 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
-electricity,all-week,mid-afternoon,all-year,20.98330000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,mid-afternoon,all-year,20.69530000000,R1,2,MUS$2010/PJ,2030
 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,mid-afternoon,all-year,10.89260000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,mid-afternoon,all-year,13.57170000000,R1,2,MUS$2010/PJ,2030
 CO2f,all-week,mid-afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
-electricity,all-week,early-peak,all-year,20.98330000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,20.69530000000,R1,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,10.89260000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,13.57170000000,R1,3,MUS$2010/PJ,2030
 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
-electricity,all-week,late-peak,all-year,20.98330000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,20.69530000000,R1,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,10.89260000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,13.57170000000,R1,4,MUS$2010/PJ,2030
 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
-electricity,all-week,evening,all-year,20.98330000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,20.69530000000,R1,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,10.89260000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,13.57170000000,R1,5,MUS$2010/PJ,2030
 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
-electricity,all-week,early-morning,all-year,20.98330000000,R1,6,MUS$2010/PJ,2030
+electricity,all-week,early-morning,all-year,20.69530000000,R1,6,MUS$2010/PJ,2030
 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2030
-heat,all-week,early-morning,all-year,10.89260000000,R1,6,MUS$2010/PJ,2030
+heat,all-week,early-morning,all-year,13.57170000000,R1,6,MUS$2010/PJ,2030
 CO2f,all-week,early-morning,all-year,0.15700000000,R1,6,MUS$2010/kt,2030
-electricity,all-week,late-afternoon,all-year,20.98330000000,R1,7,MUS$2010/PJ,2030
+electricity,all-week,late-afternoon,all-year,20.69530000000,R1,7,MUS$2010/PJ,2030
 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2030
-heat,all-week,late-afternoon,all-year,10.89260000000,R1,7,MUS$2010/PJ,2030
+heat,all-week,late-afternoon,all-year,13.57170000000,R1,7,MUS$2010/PJ,2030
 CO2f,all-week,late-afternoon,all-year,0.15700000000,R1,7,MUS$2010/kt,2030
-electricity,all-week,night,all-year,21.89680000000,R1,0,MUS$2010/PJ,2032
+electricity,all-week,night,all-year,21.87440000000,R1,0,MUS$2010/PJ,2032
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2032
-heat,all-week,night,all-year,11.25790000000,R1,0,MUS$2010/PJ,2032
+heat,all-week,night,all-year,14.01510000000,R1,0,MUS$2010/PJ,2032
 CO2f,all-week,night,all-year,0.18020000000,R1,0,MUS$2010/kt,2032
-electricity,all-week,morning,all-year,21.89680000000,R1,1,MUS$2010/PJ,2032
+electricity,all-week,morning,all-year,21.87440000000,R1,1,MUS$2010/PJ,2032
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2032
-heat,all-week,morning,all-year,11.25790000000,R1,1,MUS$2010/PJ,2032
+heat,all-week,morning,all-year,14.01510000000,R1,1,MUS$2010/PJ,2032
 CO2f,all-week,morning,all-year,0.18020000000,R1,1,MUS$2010/kt,2032
-electricity,all-week,mid-afternoon,all-year,21.89680000000,R1,2,MUS$2010/PJ,2032
+electricity,all-week,mid-afternoon,all-year,21.87440000000,R1,2,MUS$2010/PJ,2032
 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2032
-heat,all-week,mid-afternoon,all-year,11.25790000000,R1,2,MUS$2010/PJ,2032
+heat,all-week,mid-afternoon,all-year,14.01510000000,R1,2,MUS$2010/PJ,2032
 CO2f,all-week,mid-afternoon,all-year,0.18020000000,R1,2,MUS$2010/kt,2032
-electricity,all-week,early-peak,all-year,21.89680000000,R1,3,MUS$2010/PJ,2032
+electricity,all-week,early-peak,all-year,21.87440000000,R1,3,MUS$2010/PJ,2032
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2032
-heat,all-week,early-peak,all-year,11.25790000000,R1,3,MUS$2010/PJ,2032
+heat,all-week,early-peak,all-year,14.01510000000,R1,3,MUS$2010/PJ,2032
 CO2f,all-week,early-peak,all-year,0.18020000000,R1,3,MUS$2010/kt,2032
-electricity,all-week,late-peak,all-year,21.89680000000,R1,4,MUS$2010/PJ,2032
+electricity,all-week,late-peak,all-year,21.87440000000,R1,4,MUS$2010/PJ,2032
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2032
-heat,all-week,late-peak,all-year,11.25790000000,R1,4,MUS$2010/PJ,2032
+heat,all-week,late-peak,all-year,14.01510000000,R1,4,MUS$2010/PJ,2032
 CO2f,all-week,late-peak,all-year,0.18020000000,R1,4,MUS$2010/kt,2032
-electricity,all-week,evening,all-year,21.89680000000,R1,5,MUS$2010/PJ,2032
+electricity,all-week,evening,all-year,21.87440000000,R1,5,MUS$2010/PJ,2032
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2032
-heat,all-week,evening,all-year,11.25790000000,R1,5,MUS$2010/PJ,2032
+heat,all-week,evening,all-year,14.01510000000,R1,5,MUS$2010/PJ,2032
 CO2f,all-week,evening,all-year,0.18020000000,R1,5,MUS$2010/kt,2032
-electricity,all-week,early-morning,all-year,21.89680000000,R1,6,MUS$2010/PJ,2032
+electricity,all-week,early-morning,all-year,21.87440000000,R1,6,MUS$2010/PJ,2032
 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2032
-heat,all-week,early-morning,all-year,11.25790000000,R1,6,MUS$2010/PJ,2032
+heat,all-week,early-morning,all-year,14.01510000000,R1,6,MUS$2010/PJ,2032
 CO2f,all-week,early-morning,all-year,0.18020000000,R1,6,MUS$2010/kt,2032
-electricity,all-week,late-afternoon,all-year,21.89680000000,R1,7,MUS$2010/PJ,2032
+electricity,all-week,late-afternoon,all-year,21.87440000000,R1,7,MUS$2010/PJ,2032
 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2032
-heat,all-week,late-afternoon,all-year,11.25790000000,R1,7,MUS$2010/PJ,2032
+heat,all-week,late-afternoon,all-year,14.01510000000,R1,7,MUS$2010/PJ,2032
 CO2f,all-week,late-afternoon,all-year,0.18020000000,R1,7,MUS$2010/kt,2032
-electricity,all-week,night,all-year,22.68420000000,R1,0,MUS$2010/PJ,2034
+electricity,all-week,night,all-year,21.06200000000,R1,0,MUS$2010/PJ,2034
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2034
-heat,all-week,night,all-year,11.57290000000,R1,0,MUS$2010/PJ,2034
+heat,all-week,night,all-year,13.74010000000,R1,0,MUS$2010/PJ,2034
 CO2f,all-week,night,all-year,0.20330000000,R1,0,MUS$2010/kt,2034
-electricity,all-week,morning,all-year,22.68420000000,R1,1,MUS$2010/PJ,2034
+electricity,all-week,morning,all-year,21.06200000000,R1,1,MUS$2010/PJ,2034
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2034
-heat,all-week,morning,all-year,11.57290000000,R1,1,MUS$2010/PJ,2034
+heat,all-week,morning,all-year,13.74010000000,R1,1,MUS$2010/PJ,2034
 CO2f,all-week,morning,all-year,0.20330000000,R1,1,MUS$2010/kt,2034
-electricity,all-week,mid-afternoon,all-year,22.68420000000,R1,2,MUS$2010/PJ,2034
+electricity,all-week,mid-afternoon,all-year,21.06200000000,R1,2,MUS$2010/PJ,2034
 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2034
-heat,all-week,mid-afternoon,all-year,11.57290000000,R1,2,MUS$2010/PJ,2034
+heat,all-week,mid-afternoon,all-year,13.74010000000,R1,2,MUS$2010/PJ,2034
 CO2f,all-week,mid-afternoon,all-year,0.20330000000,R1,2,MUS$2010/kt,2034
-electricity,all-week,early-peak,all-year,22.68420000000,R1,3,MUS$2010/PJ,2034
+electricity,all-week,early-peak,all-year,21.06200000000,R1,3,MUS$2010/PJ,2034
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2034
-heat,all-week,early-peak,all-year,11.57290000000,R1,3,MUS$2010/PJ,2034
+heat,all-week,early-peak,all-year,13.74010000000,R1,3,MUS$2010/PJ,2034
 CO2f,all-week,early-peak,all-year,0.20330000000,R1,3,MUS$2010/kt,2034
-electricity,all-week,late-peak,all-year,22.68420000000,R1,4,MUS$2010/PJ,2034
+electricity,all-week,late-peak,all-year,21.06200000000,R1,4,MUS$2010/PJ,2034
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2034
-heat,all-week,late-peak,all-year,11.57290000000,R1,4,MUS$2010/PJ,2034
+heat,all-week,late-peak,all-year,13.74010000000,R1,4,MUS$2010/PJ,2034
 CO2f,all-week,late-peak,all-year,0.20330000000,R1,4,MUS$2010/kt,2034
-electricity,all-week,evening,all-year,22.68420000000,R1,5,MUS$2010/PJ,2034
+electricity,all-week,evening,all-year,21.06200000000,R1,5,MUS$2010/PJ,2034
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2034
-heat,all-week,evening,all-year,11.57290000000,R1,5,MUS$2010/PJ,2034
+heat,all-week,evening,all-year,13.74010000000,R1,5,MUS$2010/PJ,2034
 CO2f,all-week,evening,all-year,0.20330000000,R1,5,MUS$2010/kt,2034
-electricity,all-week,early-morning,all-year,22.68420000000,R1,6,MUS$2010/PJ,2034
+electricity,all-week,early-morning,all-year,21.06200000000,R1,6,MUS$2010/PJ,2034
 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2034
-heat,all-week,early-morning,all-year,11.57290000000,R1,6,MUS$2010/PJ,2034
+heat,all-week,early-morning,all-year,13.74010000000,R1,6,MUS$2010/PJ,2034
 CO2f,all-week,early-morning,all-year,0.20330000000,R1,6,MUS$2010/kt,2034
-electricity,all-week,late-afternoon,all-year,22.68420000000,R1,7,MUS$2010/PJ,2034
+electricity,all-week,late-afternoon,all-year,21.06200000000,R1,7,MUS$2010/PJ,2034
 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2034
-heat,all-week,late-afternoon,all-year,11.57290000000,R1,7,MUS$2010/PJ,2034
+heat,all-week,late-afternoon,all-year,13.74010000000,R1,7,MUS$2010/PJ,2034
 CO2f,all-week,late-afternoon,all-year,0.20330000000,R1,7,MUS$2010/kt,2034
-electricity,all-week,night,all-year,23.37010000000,R1,0,MUS$2010/PJ,2036
+electricity,all-week,night,all-year,20.63080000000,R1,0,MUS$2010/PJ,2036
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2036
-heat,all-week,night,all-year,11.84730000000,R1,0,MUS$2010/PJ,2036
+heat,all-week,night,all-year,13.12030000000,R1,0,MUS$2010/PJ,2036
 CO2f,all-week,night,all-year,0.22650000000,R1,0,MUS$2010/kt,2036
-electricity,all-week,morning,all-year,23.37010000000,R1,1,MUS$2010/PJ,2036
+electricity,all-week,morning,all-year,20.63080000000,R1,1,MUS$2010/PJ,2036
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2036
-heat,all-week,morning,all-year,11.84730000000,R1,1,MUS$2010/PJ,2036
+heat,all-week,morning,all-year,13.12030000000,R1,1,MUS$2010/PJ,2036
 CO2f,all-week,morning,all-year,0.22650000000,R1,1,MUS$2010/kt,2036
-electricity,all-week,mid-afternoon,all-year,23.37010000000,R1,2,MUS$2010/PJ,2036
+electricity,all-week,mid-afternoon,all-year,20.63080000000,R1,2,MUS$2010/PJ,2036
 gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2036
-heat,all-week,mid-afternoon,all-year,11.84730000000,R1,2,MUS$2010/PJ,2036
+heat,all-week,mid-afternoon,all-year,13.12030000000,R1,2,MUS$2010/PJ,2036
 CO2f,all-week,mid-afternoon,all-year,0.22650000000,R1,2,MUS$2010/kt,2036
-electricity,all-week,early-peak,all-year,23.37010000000,R1,3,MUS$2010/PJ,2036
+electricity,all-week,early-peak,all-year,20.63080000000,R1,3,MUS$2010/PJ,2036
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2036
-heat,all-week,early-peak,all-year,11.84730000000,R1,3,MUS$2010/PJ,2036
+heat,all-week,early-peak,all-year,13.12030000000,R1,3,MUS$2010/PJ,2036
 CO2f,all-week,early-peak,all-year,0.22650000000,R1,3,MUS$2010/kt,2036
-electricity,all-week,late-peak,all-year,23.37010000000,R1,4,MUS$2010/PJ,2036
+electricity,all-week,late-peak,all-year,20.63080000000,R1,4,MUS$2010/PJ,2036
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2036
-heat,all-week,late-peak,all-year,11.84730000000,R1,4,MUS$2010/PJ,2036
+heat,all-week,late-peak,all-year,13.12030000000,R1,4,MUS$2010/PJ,2036
 CO2f,all-week,late-peak,all-year,0.22650000000,R1,4,MUS$2010/kt,2036
-electricity,all-week,evening,all-year,23.37010000000,R1,5,MUS$2010/PJ,2036
+electricity,all-week,evening,all-year,20.63080000000,R1,5,MUS$2010/PJ,2036
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2036
-heat,all-week,evening,all-year,11.84730000000,R1,5,MUS$2010/PJ,2036
+heat,all-week,evening,all-year,13.12030000000,R1,5,MUS$2010/PJ,2036
 CO2f,all-week,evening,all-year,0.22650000000,R1,5,MUS$2010/kt,2036
-electricity,all-week,early-morning,all-year,23.37010000000,R1,6,MUS$2010/PJ,2036
+electricity,all-week,early-morning,all-year,20.63080000000,R1,6,MUS$2010/PJ,2036
 gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2036
-heat,all-week,early-morning,all-year,11.84730000000,R1,6,MUS$2010/PJ,2036
+heat,all-week,early-morning,all-year,13.12030000000,R1,6,MUS$2010/PJ,2036
 CO2f,all-week,early-morning,all-year,0.22650000000,R1,6,MUS$2010/kt,2036
-electricity,all-week,late-afternoon,all-year,23.37010000000,R1,7,MUS$2010/PJ,2036
+electricity,all-week,late-afternoon,all-year,20.63080000000,R1,7,MUS$2010/PJ,2036
 gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2036
-heat,all-week,late-afternoon,all-year,11.84730000000,R1,7,MUS$2010/PJ,2036
+heat,all-week,late-afternoon,all-year,13.12030000000,R1,7,MUS$2010/PJ,2036
 CO2f,all-week,late-afternoon,all-year,0.22650000000,R1,7,MUS$2010/kt,2036
-electricity,all-week,night,all-year,23.97280000000,R1,0,MUS$2010/PJ,2038
-gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2038
-heat,all-week,night,all-year,12.08830000000,R1,0,MUS$2010/PJ,2038
-CO2f,all-week,night,all-year,0.24960000000,R1,0,MUS$2010/kt,2038
-electricity,all-week,morning,all-year,23.97280000000,R1,1,MUS$2010/PJ,2038
-gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2038
-heat,all-week,morning,all-year,12.08830000000,R1,1,MUS$2010/PJ,2038
-CO2f,all-week,morning,all-year,0.24960000000,R1,1,MUS$2010/kt,2038
-electricity,all-week,mid-afternoon,all-year,23.97280000000,R1,2,MUS$2010/PJ,2038
-gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2038
-heat,all-week,mid-afternoon,all-year,12.08830000000,R1,2,MUS$2010/PJ,2038
-CO2f,all-week,mid-afternoon,all-year,0.24960000000,R1,2,MUS$2010/kt,2038
-electricity,all-week,early-peak,all-year,23.97280000000,R1,3,MUS$2010/PJ,2038
-gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2038
-heat,all-week,early-peak,all-year,12.08830000000,R1,3,MUS$2010/PJ,2038
-CO2f,all-week,early-peak,all-year,0.24960000000,R1,3,MUS$2010/kt,2038
-electricity,all-week,late-peak,all-year,23.97280000000,R1,4,MUS$2010/PJ,2038
-gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2038
-heat,all-week,late-peak,all-year,12.08830000000,R1,4,MUS$2010/PJ,2038
-CO2f,all-week,late-peak,all-year,0.24960000000,R1,4,MUS$2010/kt,2038
-electricity,all-week,evening,all-year,23.97280000000,R1,5,MUS$2010/PJ,2038
-gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2038
-heat,all-week,evening,all-year,12.08830000000,R1,5,MUS$2010/PJ,2038
-CO2f,all-week,evening,all-year,0.24960000000,R1,5,MUS$2010/kt,2038
-electricity,all-week,early-morning,all-year,23.97280000000,R1,6,MUS$2010/PJ,2038
-gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2038
-heat,all-week,early-morning,all-year,12.08830000000,R1,6,MUS$2010/PJ,2038
-CO2f,all-week,early-morning,all-year,0.24960000000,R1,6,MUS$2010/kt,2038
-electricity,all-week,late-afternoon,all-year,23.97280000000,R1,7,MUS$2010/PJ,2038
-gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2038
-heat,all-week,late-afternoon,all-year,12.08830000000,R1,7,MUS$2010/PJ,2038
-CO2f,all-week,late-afternoon,all-year,0.24960000000,R1,7,MUS$2010/kt,2038
-electricity,all-week,night,all-year,24.50660000000,R1,0,MUS$2010/PJ,2040
-gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040
-heat,all-week,night,all-year,12.30190000000,R1,0,MUS$2010/PJ,2040
-CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
-electricity,all-week,morning,all-year,24.50660000000,R1,1,MUS$2010/PJ,2040
-gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040
-heat,all-week,morning,all-year,12.30190000000,R1,1,MUS$2010/PJ,2040
-CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
-electricity,all-week,mid-afternoon,all-year,24.50660000000,R1,2,MUS$2010/PJ,2040
-gas,all-week,mid-afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040
-heat,all-week,mid-afternoon,all-year,12.30190000000,R1,2,MUS$2010/PJ,2040
-CO2f,all-week,mid-afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
-electricity,all-week,early-peak,all-year,24.50660000000,R1,3,MUS$2010/PJ,2040
-gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040
-heat,all-week,early-peak,all-year,12.30190000000,R1,3,MUS$2010/PJ,2040
-CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
-electricity,all-week,late-peak,all-year,24.50660000000,R1,4,MUS$2010/PJ,2040
-gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040
-heat,all-week,late-peak,all-year,12.30190000000,R1,4,MUS$2010/PJ,2040
-CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
-electricity,all-week,evening,all-year,24.50660000000,R1,5,MUS$2010/PJ,2040
-gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040
-heat,all-week,evening,all-year,12.30190000000,R1,5,MUS$2010/PJ,2040
-CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
-electricity,all-week,early-morning,all-year,24.50660000000,R1,6,MUS$2010/PJ,2040
-gas,all-week,early-morning,all-year,2.55000000000,R1,6,MUS$2010/PJ,2040
-heat,all-week,early-morning,all-year,12.30190000000,R1,6,MUS$2010/PJ,2040
-CO2f,all-week,early-morning,all-year,0.27280000000,R1,6,MUS$2010/kt,2040
-electricity,all-week,late-afternoon,all-year,24.50660000000,R1,7,MUS$2010/PJ,2040
-gas,all-week,late-afternoon,all-year,2.55000000000,R1,7,MUS$2010/PJ,2040
-heat,all-week,late-afternoon,all-year,12.30190000000,R1,7,MUS$2010/PJ,2040
-CO2f,all-week,late-afternoon,all-year,0.27280000000,R1,7,MUS$2010/kt,2040
diff --git a/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv b/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv
index 2a91c624..e4285546 100644
--- a/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv
+++ b/docs/tutorial-code/new-decision-metric/Results/MCACapacity.csv
@@ -3,58 +3,60 @@ A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
-A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025
+A1,19.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2025
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
-A1,1.48830000000,R1,2025,R1,power,gasCCGT,newcapa,2025
-A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2025
-A1,3.40130000000,R1,2025,R1,power,windturbine,newcapa,2025
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
-A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
-A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030
-A1,1.48830000000,R1,2025,R1,power,gasCCGT,newcapa,2030
-A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2030
-A1,10.00000000000,R1,2030,R1,power,solarPV,newcapa,2030
-A1,3.40130000000,R1,2025,R1,power,windturbine,newcapa,2030
-A1,3.25000000000,R1,2030,R1,power,windturbine,newcapa,2030
+A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2025
+A1,19.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2030
+A1,8.51170000000,R1,2030,R1,residential,gasboiler,newcapa,2030
+A1,2.48830000000,R1,2030,R1,residential,heatpump,newcapa,2030
+A1,2.48830000000,R1,2030,R1,power,solarPV,newcapa,2030
 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
-A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
-A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035
-A1,1.48830000000,R1,2025,R1,power,gasCCGT,newcapa,2035
-A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2035
-A1,10.00000000000,R1,2030,R1,power,solarPV,newcapa,2035
-A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2035
-A1,3.40130000000,R1,2025,R1,power,windturbine,newcapa,2035
-A1,3.25000000000,R1,2030,R1,power,windturbine,newcapa,2035
-A1,2.48550000000,R1,2035,R1,gas,gassupply1,newcapa,2035
-A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
-A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040
-A1,1.48830000000,R1,2025,R1,power,gasCCGT,newcapa,2040
-A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2040
-A1,10.00000000000,R1,2030,R1,power,solarPV,newcapa,2040
-A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2040
-A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2040
-A1,3.40130000000,R1,2025,R1,power,windturbine,newcapa,2040
-A1,3.25000000000,R1,2030,R1,power,windturbine,newcapa,2040
-A1,2.48550000000,R1,2035,R1,gas,gassupply1,newcapa,2040
-A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
-A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045
-A1,1.48830000000,R1,2025,R1,power,gasCCGT,newcapa,2045
-A1,10.00000000000,R1,2025,R1,power,solarPV,newcapa,2045
-A1,10.00000000000,R1,2030,R1,power,solarPV,newcapa,2045
-A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2045
-A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2045
-A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2045
-A1,3.40130000000,R1,2025,R1,power,windturbine,newcapa,2045
-A1,3.25000000000,R1,2030,R1,power,windturbine,newcapa,2045
-A1,2.48550000000,R1,2035,R1,gas,gassupply1,newcapa,2045
-A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
+A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,12.02620000000,R1,2030,R1,gas,gassupply1,newcapa,2030
+A1,8.51170000000,R1,2030,R1,residential,gasboiler,newcapa,2035
+A1,21.29660000000,R1,2035,R1,residential,gasboiler,newcapa,2035
+A1,2.48830000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,3.70340000000,R1,2035,R1,residential,heatpump,newcapa,2035
+A1,2.48830000000,R1,2030,R1,power,solarPV,newcapa,2035
+A1,3.70340000000,R1,2035,R1,power,solarPV,newcapa,2035
+A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,12.02620000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,10.46000000000,R1,2035,R1,gas,gassupply1,newcapa,2035
+A1,21.29660000000,R1,2035,R1,residential,gasboiler,newcapa,2040
+A1,5.29640000000,R1,2040,R1,residential,gasboiler,newcapa,2040
+A1,3.70340000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,11.70360000000,R1,2040,R1,residential,heatpump,newcapa,2040
+A1,2.48830000000,R1,2030,R1,power,solarPV,newcapa,2040
+A1,3.70340000000,R1,2035,R1,power,solarPV,newcapa,2040
+A1,9.21530000000,R1,2040,R1,power,solarPV,newcapa,2040
+A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,12.02620000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,10.46000000000,R1,2035,R1,gas,gassupply1,newcapa,2040
+A1,5.29640000000,R1,2040,R1,residential,gasboiler,newcapa,2045
+A1,4.36600000000,R1,2045,R1,residential,gasboiler,newcapa,2045
+A1,11.70360000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,26.63400000000,R1,2045,R1,residential,heatpump,newcapa,2045
+A1,2.37190000000,R1,2045,R1,power,gasCCGT,newcapa,2045
+A1,2.48830000000,R1,2030,R1,power,solarPV,newcapa,2045
+A1,3.70340000000,R1,2035,R1,power,solarPV,newcapa,2045
+A1,9.21530000000,R1,2040,R1,power,solarPV,newcapa,2045
+A1,10.00000000000,R1,2045,R1,power,solarPV,newcapa,2045
+A1,7.59380000000,R1,2045,R1,power,windturbine,newcapa,2045
+A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,12.02620000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,10.46000000000,R1,2035,R1,gas,gassupply1,newcapa,2045
+A1,4.36600000000,R1,2045,R1,residential,gasboiler,newcapa,2050
+A1,26.63400000000,R1,2045,R1,residential,heatpump,newcapa,2050
 A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050
-A1,1.48830000000,R1,2025,R1,power,gasCCGT,newcapa,2050
-A1,10.00000000000,R1,2030,R1,power,solarPV,newcapa,2050
-A1,6.00000000000,R1,2035,R1,power,solarPV,newcapa,2050
-A1,6.00000000000,R1,2040,R1,power,solarPV,newcapa,2050
-A1,6.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
+A1,2.37190000000,R1,2045,R1,power,gasCCGT,newcapa,2050
+A1,2.48830000000,R1,2030,R1,power,solarPV,newcapa,2050
+A1,3.70340000000,R1,2035,R1,power,solarPV,newcapa,2050
+A1,9.21530000000,R1,2040,R1,power,solarPV,newcapa,2050
+A1,10.00000000000,R1,2045,R1,power,solarPV,newcapa,2050
 A1,10.00000000000,R1,2050,R1,power,solarPV,newcapa,2050
-A1,3.25000000000,R1,2030,R1,power,windturbine,newcapa,2050
-A1,9.40130000000,R1,2050,R1,power,windturbine,newcapa,2050
-A1,2.48550000000,R1,2035,R1,gas,gassupply1,newcapa,2050
+A1,7.59380000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,1.29640000000,R1,2050,R1,power,windturbine,newcapa,2050
+A1,15.93330000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,12.02620000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,10.46000000000,R1,2035,R1,gas,gassupply1,newcapa,2050
diff --git a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv
index 811f907e..62a85db3 100644
--- a/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv
+++ b/docs/tutorial-code/new-decision-metric/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
-electricity,all-week,night,all-year,17.00150000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,28.07780000000,R1,0,MUS$2010/PJ,2025
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,9.90690000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,11.84090000000,R1,0,MUS$2010/PJ,2025
 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
-electricity,all-week,morning,all-year,17.00150000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,28.07780000000,R1,1,MUS$2010/PJ,2025
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,9.90690000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,11.84090000000,R1,1,MUS$2010/PJ,2025
 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
-electricity,all-week,afternoon,all-year,17.00150000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,28.07780000000,R1,2,MUS$2010/PJ,2025
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,9.90690000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,11.84090000000,R1,2,MUS$2010/PJ,2025
 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
-electricity,all-week,early-peak,all-year,17.00150000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,28.07780000000,R1,3,MUS$2010/PJ,2025
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,9.90690000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,11.84090000000,R1,3,MUS$2010/PJ,2025
 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
-electricity,all-week,late-peak,all-year,17.00150000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,28.07780000000,R1,4,MUS$2010/PJ,2025
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,9.90690000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,11.84090000000,R1,4,MUS$2010/PJ,2025
 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
-electricity,all-week,evening,all-year,17.00150000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,28.07780000000,R1,5,MUS$2010/PJ,2025
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,9.90690000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,11.84090000000,R1,5,MUS$2010/PJ,2025
 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
-electricity,all-week,night,all-year,16.53820000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,9.21270000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,13.75910000000,R1,0,MUS$2010/PJ,2030
 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
-electricity,all-week,morning,all-year,16.53820000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,9.21270000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,13.75910000000,R1,1,MUS$2010/PJ,2030
 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
-electricity,all-week,afternoon,all-year,16.53820000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2030
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,9.21270000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,13.75910000000,R1,2,MUS$2010/PJ,2030
 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
-electricity,all-week,early-peak,all-year,16.53820000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,9.21270000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,13.75910000000,R1,3,MUS$2010/PJ,2030
 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
-electricity,all-week,late-peak,all-year,16.53820000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,9.21270000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,13.75910000000,R1,4,MUS$2010/PJ,2030
 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
-electricity,all-week,evening,all-year,16.53820000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,9.21270000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,13.75910000000,R1,5,MUS$2010/PJ,2030
 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
-electricity,all-week,night,all-year,16.75420000000,R1,0,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2035
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035
-heat,all-week,night,all-year,9.29910000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,16.35410000000,R1,0,MUS$2010/PJ,2035
 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
-electricity,all-week,morning,all-year,16.75420000000,R1,1,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2035
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035
-heat,all-week,morning,all-year,9.29910000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,16.35410000000,R1,1,MUS$2010/PJ,2035
 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
-electricity,all-week,afternoon,all-year,16.75420000000,R1,2,MUS$2010/PJ,2035
+electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2035
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035
-heat,all-week,afternoon,all-year,9.29910000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,16.35410000000,R1,2,MUS$2010/PJ,2035
 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
-electricity,all-week,early-peak,all-year,16.75420000000,R1,3,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2035
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035
-heat,all-week,early-peak,all-year,9.29910000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,16.35410000000,R1,3,MUS$2010/PJ,2035
 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
-electricity,all-week,late-peak,all-year,16.75420000000,R1,4,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2035
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035
-heat,all-week,late-peak,all-year,9.29910000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,16.35410000000,R1,4,MUS$2010/PJ,2035
 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
-electricity,all-week,evening,all-year,16.75420000000,R1,5,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2035
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035
-heat,all-week,evening,all-year,9.29910000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,16.35410000000,R1,5,MUS$2010/PJ,2035
 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
-electricity,all-week,night,all-year,16.90840000000,R1,0,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,14.87270000000,R1,0,MUS$2010/PJ,2040
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040
-heat,all-week,night,all-year,9.36080000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,16.88830000000,R1,0,MUS$2010/PJ,2040
 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
-electricity,all-week,morning,all-year,16.90840000000,R1,1,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,14.87270000000,R1,1,MUS$2010/PJ,2040
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040
-heat,all-week,morning,all-year,9.36080000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,16.88830000000,R1,1,MUS$2010/PJ,2040
 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
-electricity,all-week,afternoon,all-year,16.90840000000,R1,2,MUS$2010/PJ,2040
+electricity,all-week,afternoon,all-year,14.87270000000,R1,2,MUS$2010/PJ,2040
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040
-heat,all-week,afternoon,all-year,9.36080000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,16.88830000000,R1,2,MUS$2010/PJ,2040
 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
-electricity,all-week,early-peak,all-year,16.90840000000,R1,3,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,14.87270000000,R1,3,MUS$2010/PJ,2040
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040
-heat,all-week,early-peak,all-year,9.36080000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,16.88830000000,R1,3,MUS$2010/PJ,2040
 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
-electricity,all-week,late-peak,all-year,16.90840000000,R1,4,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,14.87270000000,R1,4,MUS$2010/PJ,2040
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040
-heat,all-week,late-peak,all-year,9.36080000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,16.88830000000,R1,4,MUS$2010/PJ,2040
 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
-electricity,all-week,evening,all-year,16.90840000000,R1,5,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,14.87270000000,R1,5,MUS$2010/PJ,2040
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040
-heat,all-week,evening,all-year,9.36080000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,16.88830000000,R1,5,MUS$2010/PJ,2040
 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
-electricity,all-week,night,all-year,17.17320000000,R1,0,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,19.21780000000,R1,0,MUS$2010/PJ,2045
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045
-heat,all-week,night,all-year,9.46670000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,13.64440000000,R1,0,MUS$2010/PJ,2045
 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
-electricity,all-week,morning,all-year,17.17320000000,R1,1,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,19.21780000000,R1,1,MUS$2010/PJ,2045
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045
-heat,all-week,morning,all-year,9.46670000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,13.64440000000,R1,1,MUS$2010/PJ,2045
 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
-electricity,all-week,afternoon,all-year,17.17320000000,R1,2,MUS$2010/PJ,2045
+electricity,all-week,afternoon,all-year,19.21780000000,R1,2,MUS$2010/PJ,2045
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045
-heat,all-week,afternoon,all-year,9.46670000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,13.64440000000,R1,2,MUS$2010/PJ,2045
 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
-electricity,all-week,early-peak,all-year,17.17320000000,R1,3,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,19.21780000000,R1,3,MUS$2010/PJ,2045
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045
-heat,all-week,early-peak,all-year,9.46670000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,13.64440000000,R1,3,MUS$2010/PJ,2045
 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
-electricity,all-week,late-peak,all-year,17.17320000000,R1,4,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,19.21780000000,R1,4,MUS$2010/PJ,2045
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045
-heat,all-week,late-peak,all-year,9.46670000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,13.64440000000,R1,4,MUS$2010/PJ,2045
 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
-electricity,all-week,evening,all-year,17.17320000000,R1,5,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,19.21780000000,R1,5,MUS$2010/PJ,2045
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
-heat,all-week,evening,all-year,9.46670000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,13.64440000000,R1,5,MUS$2010/PJ,2045
 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
-electricity,all-week,night,all-year,17.72660000000,R1,0,MUS$2010/PJ,2050
+electricity,all-week,night,all-year,19.11090000000,R1,0,MUS$2010/PJ,2050
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
-heat,all-week,night,all-year,9.68810000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,12.01950000000,R1,0,MUS$2010/PJ,2050
 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
-electricity,all-week,morning,all-year,17.72660000000,R1,1,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,19.11090000000,R1,1,MUS$2010/PJ,2050
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
-heat,all-week,morning,all-year,9.68810000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,12.01950000000,R1,1,MUS$2010/PJ,2050
 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
-electricity,all-week,afternoon,all-year,17.72660000000,R1,2,MUS$2010/PJ,2050
+electricity,all-week,afternoon,all-year,19.11090000000,R1,2,MUS$2010/PJ,2050
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
-heat,all-week,afternoon,all-year,9.68810000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,12.01950000000,R1,2,MUS$2010/PJ,2050
 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
-electricity,all-week,early-peak,all-year,17.72660000000,R1,3,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,19.11090000000,R1,3,MUS$2010/PJ,2050
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
-heat,all-week,early-peak,all-year,9.68810000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,12.01950000000,R1,3,MUS$2010/PJ,2050
 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
-electricity,all-week,late-peak,all-year,17.72660000000,R1,4,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,19.11090000000,R1,4,MUS$2010/PJ,2050
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
-heat,all-week,late-peak,all-year,9.68810000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,12.01950000000,R1,4,MUS$2010/PJ,2050
 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
-electricity,all-week,evening,all-year,17.72660000000,R1,5,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,19.11090000000,R1,5,MUS$2010/PJ,2050
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
-heat,all-week,evening,all-year,9.68810000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,12.01950000000,R1,5,MUS$2010/PJ,2050
 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/new-decision-metric/power/Technodata.csv b/docs/tutorial-code/new-decision-metric/power/Technodata.csv
index ce96015a..9aafaebb 100644
--- a/docs/tutorial-code/new-decision-metric/power/Technodata.csv
+++ b/docs/tutorial-code/new-decision-metric/power/Technodata.csv
@@ -1,5 +1,5 @@
 ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent1
 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,New
-gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,0.2,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
-windturbine,R1,2020,36.30771182,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
-solarPV,R1,2020,30,1,0,1,0,1,2,0.2,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
+gasCCGT,R1,2020,23.78234399,1,0,1,0,1,2,0.5,60,35,0.9,0.00000189,86,0.1,energy,gas,electricity,1
+windturbine,R1,2020,36.30771182,1,0,1,0,1,2,0.5,60,25,0.4,0.00000189,86,0.1,energy,wind,electricity,1
+solarPV,R1,2020,30,1,0,1,0,1,2,0.5,60,25,0.4,0.00000189,86,0.1,energy,solar,electricity,1
diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index 64c5591c..c363bd60 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -356,21 +356,31 @@ def max_capacity_expansion(
     # Existing and forecasted capacity
     initial = capacity.isel(year=0, drop=True)
     forecasted = capacity.isel(year=1, drop=True)
-
-    # Max capacity addition constraint
     time_frame = int(capacity.year[1] - capacity.year[0])
-    add_cap = techs.get("max_capacity_addition", np.inf) * time_frame
-
-    # Total capacity limit constraint
-    limit = techs.get("total_capacity_limit", np.inf)
-    total_cap = (limit - forecasted).clip(min=0)
 
-    # Max capacity growth constraint
-    max_growth = techs.get("max_capacity_growth", np.inf)
-    growth_cap = initial * (max_growth + 1) ** time_frame - forecasted
+    # MaxCapacityAddition constraint
+    if "max_capacity_addition" in techs:
+        add_cap = techs.max_capacity_addition * time_frame
+    else:
+        add_cap = np.inf
 
-    # Relax growth constraint if no existing capacity
-    growth_cap = growth_cap.where(growth_cap > 0, np.inf)
+    # TotalCapacityLimit constraint
+    if "total_capacity_limit" in techs:
+        limit = techs.total_capacity_limit
+        total_cap = (limit - forecasted).clip(min=0)
+    else:
+        total_cap = np.inf
+
+    # MaxCapacityGrowth constraint
+    if "max_capacity_growth" in techs:
+        seed = techs.get("growth_seed", 1)
+        seeded_initial = np.maximum(initial, seed)
+        growth_cap = (
+            (seeded_initial * (techs.max_capacity_growth + 1) ** time_frame)
+            - forecasted
+        ).clip(min=0)
+    else:
+        growth_cap = np.inf
 
     # Take the most restrictive constraint
     b = np.minimum(np.minimum(add_cap, total_cap), growth_cap)
@@ -384,6 +394,14 @@ def max_capacity_expansion(
             f"Check growth constraint parameters for technologies: {inf_replacements}"
         )
 
+    # np.nan values are also not allowed. This shouldn't happen but just in case
+    if np.isnan(b).any():
+        nan_replacements = b.replacement[np.isnan(b)].values
+        raise ValueError(
+            "Capacity growth constraint cannot be NaN. "
+            f"Check growth constraint parameters for technologies: {nan_replacements}"
+        )
+
     if b.region.dims == ():
         capa = 1
     elif "dst_region" in b.dims:
diff --git a/src/muse/data/example/default_retro/gas/Technodata.csv b/src/muse/data/example/default_retro/gas/Technodata.csv
index 30b78cfd..518222a0 100644
--- a/src/muse/data/example/default_retro/gas/Technodata.csv
+++ b/src/muse/data/example/default_retro/gas/Technodata.csv
@@ -1,3 +1,3 @@
 ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
 Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,%,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gassupply1,R1,2020,0,1,0,1,2.55,1,10,0.5,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
+gassupply1,R1,2020,0,1,0,1,2.55,1,10,1,100,35,0.9,0.00000189,86,0.1,energy,gas,gas,1
diff --git a/src/muse/data/example/trade/residential/Technodata.csv b/src/muse/data/example/trade/residential/Technodata.csv
index 9dc35cdc..604debd0 100644
--- a/src/muse/data/example/trade/residential/Technodata.csv
+++ b/src/muse/data/example/trade/residential/Technodata.csv
@@ -1,6 +1,6 @@
-ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,MaxCapacityGrowth,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
-Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,-,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
-gasboiler,R1,2010,4.52,1,0,1,0,1,600,0.2,2000,10,0.9,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R1,2010,10.55,1,0,1,0,1,600,0.2,2000,10,0.9,0.00000189,86,0.1,energy,electricity,heat,1
-gasboiler,R2,2010,4.94,1,0,1,0,1,600,0.2,2000,10,0.9,0.00000189,86,0.1,energy,gas,heat,1
-heatpump,R2,2010,11.53,1,0,1,0,1,600,0.2,2000,10,0.9,0.00000189,86,0.1,energy,electricity,heat,1
+ProcessName,RegionName,Time,cap_par,cap_exp,fix_par,fix_exp,var_par,var_exp,MaxCapacityAddition,TotalCapacityLimit,TechnicalLife,UtilizationFactor,ScalingSize,efficiency,InterestRate,Type,Fuel,EndUse,Agent2
+Unit,-,Year,MUS$2010/PJ_a,-,MUS$2010/PJ,-,MUS$2010/PJ,-,PJ,PJ,Years,-,PJ,%,-,-,-,-,Retrofit
+gasboiler,R1,2010,4.52,1,0,1,0,1,600,2000,10,0.9,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R1,2010,10.55,1,0,1,0,1,600,2000,10,0.9,0.00000189,86,0.1,energy,electricity,heat,1
+gasboiler,R2,2010,4.94,1,0,1,0,1,600,2000,10,0.9,0.00000189,86,0.1,energy,gas,heat,1
+heatpump,R2,2010,11.53,1,0,1,0,1,600,2000,10,0.9,0.00000189,86,0.1,energy,electricity,heat,1
diff --git a/tests/example_outputs/default/Results/MCACapacity.csv b/tests/example_outputs/default/Results/MCACapacity.csv
index 9d670729..9ecc5b3e 100644
--- a/tests/example_outputs/default/Results/MCACapacity.csv
+++ b/tests/example_outputs/default/Results/MCACapacity.csv
@@ -3,58 +3,56 @@ A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
-A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025
+A1,11.40630000000,R1,2025,R1,residential,gasboiler,newcapa,2025
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2025
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2025
-A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2025
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2025
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2025
-A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,11.78210000000,R1,2025,R1,gas,gassupply1,newcapa,2025
+A1,11.40630000000,R1,2025,R1,residential,gasboiler,newcapa,2030
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2030
 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2030
-A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2030
-A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2030
-A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2030
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,2.51390000000,R1,2030,R1,power,gasCCGT,newcapa,2030
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2030
 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,11.78210000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,3.58380000000,R1,2030,R1,gas,gassupply1,newcapa,2030
 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2035
-A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2035
-A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2035
-A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2035
-A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2035
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2035
-A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2035
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,2.51390000000,R1,2030,R1,power,gasCCGT,newcapa,2035
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2035
+A1,17.40630000000,R1,2035,R1,power,windturbine,newcapa,2035
+A1,11.78210000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,3.58380000000,R1,2030,R1,gas,gassupply1,newcapa,2035
 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2040
-A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2040
-A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2040
-A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2040
-A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,2.51390000000,R1,2030,R1,power,gasCCGT,newcapa,2040
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2040
+A1,17.40630000000,R1,2035,R1,power,windturbine,newcapa,2040
 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2040
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2040
-A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2040
+A1,11.78210000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,3.58380000000,R1,2030,R1,gas,gassupply1,newcapa,2040
 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2045
-A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2045
-A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2045
-A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2045
-A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,2.51390000000,R1,2030,R1,power,gasCCGT,newcapa,2045
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2045
+A1,17.40630000000,R1,2035,R1,power,windturbine,newcapa,2045
 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045
 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045
-A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2045
+A1,11.78210000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,3.58380000000,R1,2030,R1,gas,gassupply1,newcapa,2045
 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
 A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050
-A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2050
-A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2050
-A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,2.37500000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,2.51390000000,R1,2030,R1,power,gasCCGT,newcapa,2050
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,17.40630000000,R1,2035,R1,power,windturbine,newcapa,2050
 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050
 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
-A1,7.91410000000,R1,2050,R1,power,windturbine,newcapa,2050
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050
-A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2050
+A1,6.00000000000,R1,2050,R1,power,windturbine,newcapa,2050
+A1,11.78210000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,3.58380000000,R1,2030,R1,gas,gassupply1,newcapa,2050
diff --git a/tests/example_outputs/default/Results/MCAPrices.csv b/tests/example_outputs/default/Results/MCAPrices.csv
index 94a1a3b8..33aadc67 100644
--- a/tests/example_outputs/default/Results/MCAPrices.csv
+++ b/tests/example_outputs/default/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
-electricity,all-week,night,all-year,19.97590000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,20.19730000000,R1,0,MUS$2010/PJ,2025
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,10.84880000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,11.47240000000,R1,0,MUS$2010/PJ,2025
 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
-electricity,all-week,morning,all-year,19.97590000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,20.19730000000,R1,1,MUS$2010/PJ,2025
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,10.84880000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,11.47240000000,R1,1,MUS$2010/PJ,2025
 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
-electricity,all-week,afternoon,all-year,19.97590000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,20.19730000000,R1,2,MUS$2010/PJ,2025
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,10.84880000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,11.47240000000,R1,2,MUS$2010/PJ,2025
 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
-electricity,all-week,early-peak,all-year,19.97590000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,20.19730000000,R1,3,MUS$2010/PJ,2025
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,10.84880000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,11.47240000000,R1,3,MUS$2010/PJ,2025
 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
-electricity,all-week,late-peak,all-year,19.97590000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,20.19730000000,R1,4,MUS$2010/PJ,2025
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,10.84880000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,11.47240000000,R1,4,MUS$2010/PJ,2025
 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
-electricity,all-week,evening,all-year,19.97590000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,20.19730000000,R1,5,MUS$2010/PJ,2025
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,10.84880000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,11.47240000000,R1,5,MUS$2010/PJ,2025
 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
-electricity,all-week,night,all-year,20.87770000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,21.30250000000,R1,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,10.94850000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,12.30170000000,R1,0,MUS$2010/PJ,2030
 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
-electricity,all-week,morning,all-year,20.87770000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,21.30250000000,R1,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,10.94850000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,12.30170000000,R1,1,MUS$2010/PJ,2030
 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
-electricity,all-week,afternoon,all-year,20.87770000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,afternoon,all-year,21.30250000000,R1,2,MUS$2010/PJ,2030
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,10.94850000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,12.30170000000,R1,2,MUS$2010/PJ,2030
 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
-electricity,all-week,early-peak,all-year,20.87770000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,21.30250000000,R1,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,10.94850000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,12.30170000000,R1,3,MUS$2010/PJ,2030
 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
-electricity,all-week,late-peak,all-year,20.87770000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,21.30250000000,R1,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,10.94850000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,12.30170000000,R1,4,MUS$2010/PJ,2030
 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
-electricity,all-week,evening,all-year,20.87770000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,21.30250000000,R1,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,10.94850000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,12.30170000000,R1,5,MUS$2010/PJ,2030
 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
-electricity,all-week,night,all-year,22.67730000000,R1,0,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,21.32680000000,R1,0,MUS$2010/PJ,2035
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035
-heat,all-week,night,all-year,11.66830000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,11.12810000000,R1,0,MUS$2010/PJ,2035
 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
-electricity,all-week,morning,all-year,22.67730000000,R1,1,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,21.32680000000,R1,1,MUS$2010/PJ,2035
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035
-heat,all-week,morning,all-year,11.66830000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,11.12810000000,R1,1,MUS$2010/PJ,2035
 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
-electricity,all-week,afternoon,all-year,22.67730000000,R1,2,MUS$2010/PJ,2035
+electricity,all-week,afternoon,all-year,21.32680000000,R1,2,MUS$2010/PJ,2035
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035
-heat,all-week,afternoon,all-year,11.66830000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,11.12810000000,R1,2,MUS$2010/PJ,2035
 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
-electricity,all-week,early-peak,all-year,22.67730000000,R1,3,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,21.32680000000,R1,3,MUS$2010/PJ,2035
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035
-heat,all-week,early-peak,all-year,11.66830000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,11.12810000000,R1,3,MUS$2010/PJ,2035
 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
-electricity,all-week,late-peak,all-year,22.67730000000,R1,4,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,21.32680000000,R1,4,MUS$2010/PJ,2035
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035
-heat,all-week,late-peak,all-year,11.66830000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,11.12810000000,R1,4,MUS$2010/PJ,2035
 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
-electricity,all-week,evening,all-year,22.67730000000,R1,5,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,21.32680000000,R1,5,MUS$2010/PJ,2035
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035
-heat,all-week,evening,all-year,11.66830000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,11.12810000000,R1,5,MUS$2010/PJ,2035
 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
-electricity,all-week,night,all-year,23.96280000000,R1,0,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,22.24110000000,R1,0,MUS$2010/PJ,2040
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040
-heat,all-week,night,all-year,12.18250000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,11.49390000000,R1,0,MUS$2010/PJ,2040
 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
-electricity,all-week,morning,all-year,23.96280000000,R1,1,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,22.24110000000,R1,1,MUS$2010/PJ,2040
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040
-heat,all-week,morning,all-year,12.18250000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,11.49390000000,R1,1,MUS$2010/PJ,2040
 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
-electricity,all-week,afternoon,all-year,23.96280000000,R1,2,MUS$2010/PJ,2040
+electricity,all-week,afternoon,all-year,22.24110000000,R1,2,MUS$2010/PJ,2040
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040
-heat,all-week,afternoon,all-year,12.18250000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,11.49390000000,R1,2,MUS$2010/PJ,2040
 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
-electricity,all-week,early-peak,all-year,23.96280000000,R1,3,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,22.24110000000,R1,3,MUS$2010/PJ,2040
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040
-heat,all-week,early-peak,all-year,12.18250000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,11.49390000000,R1,3,MUS$2010/PJ,2040
 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
-electricity,all-week,late-peak,all-year,23.96280000000,R1,4,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,22.24110000000,R1,4,MUS$2010/PJ,2040
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040
-heat,all-week,late-peak,all-year,12.18250000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,11.49390000000,R1,4,MUS$2010/PJ,2040
 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
-electricity,all-week,evening,all-year,23.96280000000,R1,5,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,22.24110000000,R1,5,MUS$2010/PJ,2040
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040
-heat,all-week,evening,all-year,12.18250000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,11.49390000000,R1,5,MUS$2010/PJ,2040
 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
-electricity,all-week,night,all-year,25.61540000000,R1,0,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,23.41660000000,R1,0,MUS$2010/PJ,2045
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045
-heat,all-week,night,all-year,12.84360000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,11.96410000000,R1,0,MUS$2010/PJ,2045
 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
-electricity,all-week,morning,all-year,25.61540000000,R1,1,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,23.41660000000,R1,1,MUS$2010/PJ,2045
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045
-heat,all-week,morning,all-year,12.84360000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,11.96410000000,R1,1,MUS$2010/PJ,2045
 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
-electricity,all-week,afternoon,all-year,25.61540000000,R1,2,MUS$2010/PJ,2045
+electricity,all-week,afternoon,all-year,23.41660000000,R1,2,MUS$2010/PJ,2045
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045
-heat,all-week,afternoon,all-year,12.84360000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,11.96410000000,R1,2,MUS$2010/PJ,2045
 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
-electricity,all-week,early-peak,all-year,25.61540000000,R1,3,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,23.41660000000,R1,3,MUS$2010/PJ,2045
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045
-heat,all-week,early-peak,all-year,12.84360000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,11.96410000000,R1,3,MUS$2010/PJ,2045
 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
-electricity,all-week,late-peak,all-year,25.61540000000,R1,4,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,23.41660000000,R1,4,MUS$2010/PJ,2045
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045
-heat,all-week,late-peak,all-year,12.84360000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,11.96410000000,R1,4,MUS$2010/PJ,2045
 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
-electricity,all-week,evening,all-year,25.61540000000,R1,5,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,23.41660000000,R1,5,MUS$2010/PJ,2045
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
-heat,all-week,evening,all-year,12.84360000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,11.96410000000,R1,5,MUS$2010/PJ,2045
 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
-electricity,all-week,night,all-year,26.90080000000,R1,0,MUS$2010/PJ,2050
+electricity,all-week,night,all-year,24.33090000000,R1,0,MUS$2010/PJ,2050
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
-heat,all-week,night,all-year,13.35770000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,12.32980000000,R1,0,MUS$2010/PJ,2050
 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
-electricity,all-week,morning,all-year,26.90080000000,R1,1,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,24.33090000000,R1,1,MUS$2010/PJ,2050
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
-heat,all-week,morning,all-year,13.35770000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,12.32980000000,R1,1,MUS$2010/PJ,2050
 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
-electricity,all-week,afternoon,all-year,26.90080000000,R1,2,MUS$2010/PJ,2050
+electricity,all-week,afternoon,all-year,24.33090000000,R1,2,MUS$2010/PJ,2050
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
-heat,all-week,afternoon,all-year,13.35770000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,12.32980000000,R1,2,MUS$2010/PJ,2050
 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
-electricity,all-week,early-peak,all-year,26.90080000000,R1,3,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,24.33090000000,R1,3,MUS$2010/PJ,2050
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
-heat,all-week,early-peak,all-year,13.35770000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,12.32980000000,R1,3,MUS$2010/PJ,2050
 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
-electricity,all-week,late-peak,all-year,26.90080000000,R1,4,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,24.33090000000,R1,4,MUS$2010/PJ,2050
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
-heat,all-week,late-peak,all-year,13.35770000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,12.32980000000,R1,4,MUS$2010/PJ,2050
 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
-electricity,all-week,evening,all-year,26.90080000000,R1,5,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,24.33090000000,R1,5,MUS$2010/PJ,2050
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
-heat,all-week,evening,all-year,13.35770000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,12.32980000000,R1,5,MUS$2010/PJ,2050
 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/tests/example_outputs/default_adhoc/Results/MCACapacity.csv b/tests/example_outputs/default_adhoc/Results/MCACapacity.csv
index 1697de22..9857e4c7 100644
--- a/tests/example_outputs/default_adhoc/Results/MCACapacity.csv
+++ b/tests/example_outputs/default_adhoc/Results/MCACapacity.csv
@@ -3,37 +3,45 @@ A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
-A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025
+A1,11.40630000000,R1,2025,R1,residential,gasboiler,newcapa,2025
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2025
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
-A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2025
+A1,5.34380000000,R1,2025,R1,power,windturbine,newcapa,2025
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
-A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,7.81580000000,R1,2025,R1,gas,gassupply1,newcapa,2025
+A1,11.40630000000,R1,2025,R1,residential,gasboiler,newcapa,2030
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2030
 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030
-A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2030
+A1,5.34380000000,R1,2025,R1,power,windturbine,newcapa,2030
 A1,13.25000000000,R1,2030,R1,power,windturbine,newcapa,2030
 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,7.81580000000,R1,2025,R1,gas,gassupply1,newcapa,2030
 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035
-A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2035
+A1,5.34380000000,R1,2025,R1,power,windturbine,newcapa,2035
 A1,13.25000000000,R1,2030,R1,power,windturbine,newcapa,2035
-A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2035
+A1,17.40630000000,R1,2035,R1,power,windturbine,newcapa,2035
+A1,7.81580000000,R1,2025,R1,gas,gassupply1,newcapa,2035
 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040
-A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2040
+A1,5.34380000000,R1,2025,R1,power,windturbine,newcapa,2040
 A1,13.25000000000,R1,2030,R1,power,windturbine,newcapa,2040
-A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,17.40630000000,R1,2035,R1,power,windturbine,newcapa,2040
 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2040
+A1,7.81580000000,R1,2025,R1,gas,gassupply1,newcapa,2040
 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045
-A1,16.75000000000,R1,2025,R1,power,windturbine,newcapa,2045
+A1,5.34380000000,R1,2025,R1,power,windturbine,newcapa,2045
 A1,13.25000000000,R1,2030,R1,power,windturbine,newcapa,2045
-A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,17.40630000000,R1,2035,R1,power,windturbine,newcapa,2045
 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045
 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045
+A1,7.81580000000,R1,2025,R1,gas,gassupply1,newcapa,2045
 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
 A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050
 A1,13.25000000000,R1,2030,R1,power,windturbine,newcapa,2050
-A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,17.40630000000,R1,2035,R1,power,windturbine,newcapa,2050
 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050
 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
-A1,22.75000000000,R1,2050,R1,power,windturbine,newcapa,2050
+A1,11.34380000000,R1,2050,R1,power,windturbine,newcapa,2050
+A1,7.81580000000,R1,2025,R1,gas,gassupply1,newcapa,2050
diff --git a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv
index 6cfb4171..e800a393 100644
--- a/tests/example_outputs/default_adhoc/Results/MCAPrices.csv
+++ b/tests/example_outputs/default_adhoc/Results/MCAPrices.csv
@@ -23,53 +23,53 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
-electricity,all-week,night,all-year,18.26000000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,18.65090000000,R1,0,MUS$2010/PJ,2025
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,10.65340000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,11.62470000000,R1,0,MUS$2010/PJ,2025
 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
-electricity,all-week,morning,all-year,18.26000000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,18.65090000000,R1,1,MUS$2010/PJ,2025
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,10.65340000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,11.62470000000,R1,1,MUS$2010/PJ,2025
 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
-electricity,all-week,afternoon,all-year,18.26000000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,18.65090000000,R1,2,MUS$2010/PJ,2025
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,10.65340000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,11.62470000000,R1,2,MUS$2010/PJ,2025
 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
-electricity,all-week,early-peak,all-year,18.26000000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,18.65090000000,R1,3,MUS$2010/PJ,2025
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,10.65340000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,11.62470000000,R1,3,MUS$2010/PJ,2025
 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
-electricity,all-week,late-peak,all-year,18.26000000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,18.65090000000,R1,4,MUS$2010/PJ,2025
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,10.65340000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,11.62470000000,R1,4,MUS$2010/PJ,2025
 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
-electricity,all-week,evening,all-year,18.26000000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,18.65090000000,R1,5,MUS$2010/PJ,2025
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,10.65340000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,11.62470000000,R1,5,MUS$2010/PJ,2025
 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
 electricity,all-week,night,all-year,17.99980000000,R1,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,9.90140000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,11.48290000000,R1,0,MUS$2010/PJ,2030
 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
 electricity,all-week,morning,all-year,17.99980000000,R1,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,9.90140000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,11.48290000000,R1,1,MUS$2010/PJ,2030
 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
 electricity,all-week,afternoon,all-year,17.99980000000,R1,2,MUS$2010/PJ,2030
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,9.90140000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,11.48290000000,R1,2,MUS$2010/PJ,2030
 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
 electricity,all-week,early-peak,all-year,17.99980000000,R1,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,9.90140000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,11.48290000000,R1,3,MUS$2010/PJ,2030
 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
 electricity,all-week,late-peak,all-year,17.99980000000,R1,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,9.90140000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,11.48290000000,R1,4,MUS$2010/PJ,2030
 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
 electricity,all-week,evening,all-year,17.99980000000,R1,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,9.90140000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,11.48290000000,R1,5,MUS$2010/PJ,2030
 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
 electricity,all-week,night,all-year,17.99980000000,R1,0,MUS$2010/PJ,2035
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035
diff --git a/tests/example_outputs/default_retro/Results/MCACapacity.csv b/tests/example_outputs/default_retro/Results/MCACapacity.csv
index 9e0d65a5..8f35542a 100644
--- a/tests/example_outputs/default_retro/Results/MCACapacity.csv
+++ b/tests/example_outputs/default_retro/Results/MCACapacity.csv
@@ -4,54 +4,70 @@ A1,1.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2020
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,retrofit,2020
 A1,6.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025
 A1,5.00000000000,R1,2020,R1,residential,gasboiler,retrofit,2025
-A1,13.00000000000,R1,2025,R1,residential,heatpump,retrofit,2025
-A1,7.44440000000,R1,2025,R1,power,gasCCGT,newcapa,2025
+A1,5.40630000000,R1,2025,R1,residential,gasboiler,retrofit,2025
+A1,7.59380000000,R1,2025,R1,residential,heatpump,retrofit,2025
+A1,5.04170000000,R1,2025,R1,power,gasCCGT,newcapa,2025
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,retrofit,2025
-A1,5.54670000000,R1,2025,R1,gas,gassupply1,newcapa,2025
+A1,8.50210000000,R1,2025,R1,gas,gassupply1,newcapa,2025
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,retrofit,2025
 A1,6.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030
-A1,19.00000000000,R1,2025,R1,residential,heatpump,retrofit,2030
+A1,5.40630000000,R1,2025,R1,residential,gasboiler,retrofit,2030
+A1,13.59380000000,R1,2025,R1,residential,heatpump,retrofit,2030
 A1,5.00000000000,R1,2030,R1,residential,heatpump,retrofit,2030
-A1,11.00000000000,R1,2030,R1,power,windturbine,newcapa,2030
-A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2030
+A1,1.51390000000,R1,2030,R1,power,gasCCGT,newcapa,2030
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2030
+A1,5.04170000000,R1,2025,R1,power,gasCCGT,retrofit,2030
 A1,2.25000000000,R1,2030,R1,power,windturbine,retrofit,2030
 A1,7.50000000000,R1,2020,R1,gas,gassupply1,retrofit,2030
-A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2030
+A1,8.50210000000,R1,2025,R1,gas,gassupply1,retrofit,2030
+A1,1.91380000000,R1,2030,R1,gas,gassupply1,retrofit,2030
 A1,6.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035
 A1,11.00000000000,R1,2030,R1,residential,heatpump,retrofit,2035
 A1,19.00000000000,R1,2035,R1,residential,heatpump,retrofit,2035
-A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2035
-A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2035
-A1,13.25000000000,R1,2030,R1,power,windturbine,retrofit,2035
-A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2035
-A1,6.88560000000,R1,2035,R1,gas,gassupply1,retrofit,2035
+A1,1.69440000000,R1,2035,R1,power,gasCCGT,newcapa,2035
+A1,7.59380000000,R1,2035,R1,power,windturbine,newcapa,2035
+A1,5.04170000000,R1,2025,R1,power,gasCCGT,retrofit,2035
+A1,1.51390000000,R1,2030,R1,power,gasCCGT,retrofit,2035
+A1,9.84380000000,R1,2030,R1,power,windturbine,retrofit,2035
+A1,8.50210000000,R1,2025,R1,gas,gassupply1,retrofit,2035
+A1,1.91380000000,R1,2030,R1,gas,gassupply1,retrofit,2035
+A1,3.36170000000,R1,2035,R1,gas,gassupply1,retrofit,2035
 A1,6.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040
 A1,25.00000000000,R1,2035,R1,residential,heatpump,retrofit,2040
 A1,11.00000000000,R1,2040,R1,residential,heatpump,retrofit,2040
 A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2040
-A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2040
-A1,13.25000000000,R1,2030,R1,power,windturbine,retrofit,2040
-A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2040
-A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2040
-A1,6.88560000000,R1,2035,R1,gas,gassupply1,retrofit,2040
+A1,5.04170000000,R1,2025,R1,power,gasCCGT,retrofit,2040
+A1,1.51390000000,R1,2030,R1,power,gasCCGT,retrofit,2040
+A1,1.69440000000,R1,2035,R1,power,gasCCGT,retrofit,2040
+A1,9.84380000000,R1,2030,R1,power,windturbine,retrofit,2040
+A1,7.59380000000,R1,2035,R1,power,windturbine,retrofit,2040
+A1,8.50210000000,R1,2025,R1,gas,gassupply1,retrofit,2040
+A1,1.91380000000,R1,2030,R1,gas,gassupply1,retrofit,2040
+A1,3.36170000000,R1,2035,R1,gas,gassupply1,retrofit,2040
 A1,6.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045
 A1,17.00000000000,R1,2040,R1,residential,heatpump,retrofit,2045
 A1,25.00000000000,R1,2045,R1,residential,heatpump,retrofit,2045
 A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045
-A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2045
-A1,13.25000000000,R1,2030,R1,power,windturbine,retrofit,2045
-A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2045
+A1,5.04170000000,R1,2025,R1,power,gasCCGT,retrofit,2045
+A1,1.51390000000,R1,2030,R1,power,gasCCGT,retrofit,2045
+A1,1.69440000000,R1,2035,R1,power,gasCCGT,retrofit,2045
+A1,9.84380000000,R1,2030,R1,power,windturbine,retrofit,2045
+A1,7.59380000000,R1,2035,R1,power,windturbine,retrofit,2045
 A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2045
-A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2045
-A1,6.88560000000,R1,2035,R1,gas,gassupply1,retrofit,2045
+A1,8.50210000000,R1,2025,R1,gas,gassupply1,retrofit,2045
+A1,1.91380000000,R1,2030,R1,gas,gassupply1,retrofit,2045
+A1,3.36170000000,R1,2035,R1,gas,gassupply1,retrofit,2045
 A1,6.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050
 A1,31.00000000000,R1,2045,R1,residential,heatpump,retrofit,2050
 A1,17.00000000000,R1,2050,R1,residential,heatpump,retrofit,2050
 A1,6.00000000000,R1,2050,R1,power,windturbine,newcapa,2050
-A1,7.44440000000,R1,2025,R1,power,gasCCGT,retrofit,2050
-A1,13.25000000000,R1,2030,R1,power,windturbine,retrofit,2050
-A1,6.00000000000,R1,2035,R1,power,windturbine,retrofit,2050
+A1,5.04170000000,R1,2025,R1,power,gasCCGT,retrofit,2050
+A1,1.51390000000,R1,2030,R1,power,gasCCGT,retrofit,2050
+A1,1.69440000000,R1,2035,R1,power,gasCCGT,retrofit,2050
+A1,9.84380000000,R1,2030,R1,power,windturbine,retrofit,2050
+A1,7.59380000000,R1,2035,R1,power,windturbine,retrofit,2050
 A1,6.00000000000,R1,2040,R1,power,windturbine,retrofit,2050
 A1,6.00000000000,R1,2045,R1,power,windturbine,retrofit,2050
-A1,5.54670000000,R1,2025,R1,gas,gassupply1,retrofit,2050
-A1,6.88560000000,R1,2035,R1,gas,gassupply1,retrofit,2050
+A1,8.50210000000,R1,2025,R1,gas,gassupply1,retrofit,2050
+A1,1.91380000000,R1,2030,R1,gas,gassupply1,retrofit,2050
+A1,3.36170000000,R1,2035,R1,gas,gassupply1,retrofit,2050
diff --git a/tests/example_outputs/default_retro/Results/MCAPrices.csv b/tests/example_outputs/default_retro/Results/MCAPrices.csv
index a42f1fbf..9352e1af 100644
--- a/tests/example_outputs/default_retro/Results/MCAPrices.csv
+++ b/tests/example_outputs/default_retro/Results/MCAPrices.csv
@@ -25,145 +25,145 @@ heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
 electricity,all-week,night,all-year,20.19730000000,R1,0,MUS$2010/PJ,2025
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,10.91890000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,11.18130000000,R1,0,MUS$2010/PJ,2025
 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
 electricity,all-week,morning,all-year,20.19730000000,R1,1,MUS$2010/PJ,2025
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,10.91890000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,11.18130000000,R1,1,MUS$2010/PJ,2025
 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
 electricity,all-week,afternoon,all-year,20.19730000000,R1,2,MUS$2010/PJ,2025
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,10.91890000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,11.18130000000,R1,2,MUS$2010/PJ,2025
 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
 electricity,all-week,early-peak,all-year,20.19730000000,R1,3,MUS$2010/PJ,2025
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,10.91890000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,11.18130000000,R1,3,MUS$2010/PJ,2025
 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
 electricity,all-week,late-peak,all-year,20.19730000000,R1,4,MUS$2010/PJ,2025
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,10.91890000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,11.18130000000,R1,4,MUS$2010/PJ,2025
 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
 electricity,all-week,evening,all-year,20.19730000000,R1,5,MUS$2010/PJ,2025
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,10.91890000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,11.18130000000,R1,5,MUS$2010/PJ,2025
 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
-electricity,all-week,night,all-year,21.11680000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,21.34800000000,R1,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,11.04410000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,11.69420000000,R1,0,MUS$2010/PJ,2030
 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
-electricity,all-week,morning,all-year,21.11680000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,21.34800000000,R1,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,11.04410000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,11.69420000000,R1,1,MUS$2010/PJ,2030
 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
-electricity,all-week,afternoon,all-year,21.11680000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,afternoon,all-year,21.34800000000,R1,2,MUS$2010/PJ,2030
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,11.04410000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,11.69420000000,R1,2,MUS$2010/PJ,2030
 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
-electricity,all-week,early-peak,all-year,21.11680000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,21.34800000000,R1,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,11.04410000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,11.69420000000,R1,3,MUS$2010/PJ,2030
 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
-electricity,all-week,late-peak,all-year,21.11680000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,21.34800000000,R1,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,11.04410000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,11.69420000000,R1,4,MUS$2010/PJ,2030
 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
-electricity,all-week,evening,all-year,21.11680000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,21.34800000000,R1,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,11.04410000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,11.69420000000,R1,5,MUS$2010/PJ,2030
 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
-electricity,all-week,night,all-year,23.06600000000,R1,0,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,23.61420000000,R1,0,MUS$2010/PJ,2035
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035
-heat,all-week,night,all-year,11.82380000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,12.04310000000,R1,0,MUS$2010/PJ,2035
 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
-electricity,all-week,morning,all-year,23.06600000000,R1,1,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,23.61420000000,R1,1,MUS$2010/PJ,2035
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035
-heat,all-week,morning,all-year,11.82380000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,12.04310000000,R1,1,MUS$2010/PJ,2035
 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
-electricity,all-week,afternoon,all-year,23.06600000000,R1,2,MUS$2010/PJ,2035
+electricity,all-week,afternoon,all-year,23.61420000000,R1,2,MUS$2010/PJ,2035
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035
-heat,all-week,afternoon,all-year,11.82380000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,12.04310000000,R1,2,MUS$2010/PJ,2035
 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
-electricity,all-week,early-peak,all-year,23.06600000000,R1,3,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,23.61420000000,R1,3,MUS$2010/PJ,2035
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035
-heat,all-week,early-peak,all-year,11.82380000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,12.04310000000,R1,3,MUS$2010/PJ,2035
 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
-electricity,all-week,late-peak,all-year,23.06600000000,R1,4,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,23.61420000000,R1,4,MUS$2010/PJ,2035
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035
-heat,all-week,late-peak,all-year,11.82380000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,12.04310000000,R1,4,MUS$2010/PJ,2035
 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
-electricity,all-week,evening,all-year,23.06600000000,R1,5,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,23.61420000000,R1,5,MUS$2010/PJ,2035
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035
-heat,all-week,evening,all-year,11.82380000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,12.04310000000,R1,5,MUS$2010/PJ,2035
 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
-electricity,all-week,night,all-year,24.45820000000,R1,0,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,25.15710000000,R1,0,MUS$2010/PJ,2040
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040
-heat,all-week,night,all-year,12.38070000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,12.66020000000,R1,0,MUS$2010/PJ,2040
 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
-electricity,all-week,morning,all-year,24.45820000000,R1,1,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,25.15710000000,R1,1,MUS$2010/PJ,2040
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040
-heat,all-week,morning,all-year,12.38070000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,12.66020000000,R1,1,MUS$2010/PJ,2040
 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
-electricity,all-week,afternoon,all-year,24.45820000000,R1,2,MUS$2010/PJ,2040
+electricity,all-week,afternoon,all-year,25.15710000000,R1,2,MUS$2010/PJ,2040
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040
-heat,all-week,afternoon,all-year,12.38070000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,12.66020000000,R1,2,MUS$2010/PJ,2040
 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
-electricity,all-week,early-peak,all-year,24.45820000000,R1,3,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,25.15710000000,R1,3,MUS$2010/PJ,2040
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040
-heat,all-week,early-peak,all-year,12.38070000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,12.66020000000,R1,3,MUS$2010/PJ,2040
 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
-electricity,all-week,late-peak,all-year,24.45820000000,R1,4,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,25.15710000000,R1,4,MUS$2010/PJ,2040
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040
-heat,all-week,late-peak,all-year,12.38070000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,12.66020000000,R1,4,MUS$2010/PJ,2040
 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
-electricity,all-week,evening,all-year,24.45820000000,R1,5,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,25.15710000000,R1,5,MUS$2010/PJ,2040
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040
-heat,all-week,evening,all-year,12.38070000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,12.66020000000,R1,5,MUS$2010/PJ,2040
 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
-electricity,all-week,night,all-year,26.24810000000,R1,0,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,27.14070000000,R1,0,MUS$2010/PJ,2045
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045
-heat,all-week,night,all-year,13.09670000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,13.45370000000,R1,0,MUS$2010/PJ,2045
 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
-electricity,all-week,morning,all-year,26.24810000000,R1,1,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,27.14070000000,R1,1,MUS$2010/PJ,2045
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045
-heat,all-week,morning,all-year,13.09670000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,13.45370000000,R1,1,MUS$2010/PJ,2045
 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
-electricity,all-week,afternoon,all-year,26.24810000000,R1,2,MUS$2010/PJ,2045
+electricity,all-week,afternoon,all-year,27.14070000000,R1,2,MUS$2010/PJ,2045
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045
-heat,all-week,afternoon,all-year,13.09670000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,13.45370000000,R1,2,MUS$2010/PJ,2045
 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
-electricity,all-week,early-peak,all-year,26.24810000000,R1,3,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,27.14070000000,R1,3,MUS$2010/PJ,2045
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045
-heat,all-week,early-peak,all-year,13.09670000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,13.45370000000,R1,3,MUS$2010/PJ,2045
 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
-electricity,all-week,late-peak,all-year,26.24810000000,R1,4,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,27.14070000000,R1,4,MUS$2010/PJ,2045
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045
-heat,all-week,late-peak,all-year,13.09670000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,13.45370000000,R1,4,MUS$2010/PJ,2045
 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
-electricity,all-week,evening,all-year,26.24810000000,R1,5,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,27.14070000000,R1,5,MUS$2010/PJ,2045
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
-heat,all-week,evening,all-year,13.09670000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,13.45370000000,R1,5,MUS$2010/PJ,2045
 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
-electricity,all-week,night,all-year,27.64030000000,R1,0,MUS$2010/PJ,2050
+electricity,all-week,night,all-year,28.68350000000,R1,0,MUS$2010/PJ,2050
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
-heat,all-week,night,all-year,13.65350000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,14.07080000000,R1,0,MUS$2010/PJ,2050
 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
-electricity,all-week,morning,all-year,27.64030000000,R1,1,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,28.68350000000,R1,1,MUS$2010/PJ,2050
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
-heat,all-week,morning,all-year,13.65350000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,14.07080000000,R1,1,MUS$2010/PJ,2050
 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
-electricity,all-week,afternoon,all-year,27.64030000000,R1,2,MUS$2010/PJ,2050
+electricity,all-week,afternoon,all-year,28.68350000000,R1,2,MUS$2010/PJ,2050
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
-heat,all-week,afternoon,all-year,13.65350000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,14.07080000000,R1,2,MUS$2010/PJ,2050
 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
-electricity,all-week,early-peak,all-year,27.64030000000,R1,3,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,28.68350000000,R1,3,MUS$2010/PJ,2050
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
-heat,all-week,early-peak,all-year,13.65350000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,14.07080000000,R1,3,MUS$2010/PJ,2050
 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
-electricity,all-week,late-peak,all-year,27.64030000000,R1,4,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,28.68350000000,R1,4,MUS$2010/PJ,2050
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
-heat,all-week,late-peak,all-year,13.65350000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,14.07080000000,R1,4,MUS$2010/PJ,2050
 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
-electricity,all-week,evening,all-year,27.64030000000,R1,5,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,28.68350000000,R1,5,MUS$2010/PJ,2050
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
-heat,all-week,evening,all-year,13.65350000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,14.07080000000,R1,5,MUS$2010/PJ,2050
 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/tests/example_outputs/default_timeslice/Results/MCACapacity.csv b/tests/example_outputs/default_timeslice/Results/MCACapacity.csv
index fb43c23d..77ecf362 100644
--- a/tests/example_outputs/default_timeslice/Results/MCACapacity.csv
+++ b/tests/example_outputs/default_timeslice/Results/MCACapacity.csv
@@ -3,37 +3,45 @@ A1,10.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
 A1,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
-A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025
+A1,11.40630000000,R1,2025,R1,residential,gasboiler,newcapa,2025
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2025
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
-A1,6.60000000000,R1,2025,R1,power,windturbine,newcapa,2025
+A1,2.03750000000,R1,2025,R1,power,windturbine,newcapa,2025
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
-A1,19.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,8.00140000000,R1,2025,R1,gas,gassupply1,newcapa,2025
+A1,11.40630000000,R1,2025,R1,residential,gasboiler,newcapa,2030
+A1,7.59380000000,R1,2025,R1,residential,heatpump,newcapa,2030
 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2030
-A1,6.60000000000,R1,2025,R1,power,windturbine,newcapa,2030
+A1,2.03750000000,R1,2025,R1,power,windturbine,newcapa,2030
 A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2030
 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,8.00140000000,R1,2025,R1,gas,gassupply1,newcapa,2030
 A1,11.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035
-A1,6.60000000000,R1,2025,R1,power,windturbine,newcapa,2035
+A1,2.03750000000,R1,2025,R1,power,windturbine,newcapa,2035
 A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2035
-A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2035
+A1,6.96250000000,R1,2035,R1,power,windturbine,newcapa,2035
+A1,8.00140000000,R1,2025,R1,gas,gassupply1,newcapa,2035
 A1,25.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040
-A1,6.60000000000,R1,2025,R1,power,windturbine,newcapa,2040
+A1,2.03750000000,R1,2025,R1,power,windturbine,newcapa,2040
 A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2040
-A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,6.96250000000,R1,2035,R1,power,windturbine,newcapa,2040
 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2040
+A1,8.00140000000,R1,2025,R1,gas,gassupply1,newcapa,2040
 A1,17.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045
-A1,6.60000000000,R1,2025,R1,power,windturbine,newcapa,2045
+A1,2.03750000000,R1,2025,R1,power,windturbine,newcapa,2045
 A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2045
-A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,6.96250000000,R1,2035,R1,power,windturbine,newcapa,2045
 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2045
 A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2045
+A1,8.00140000000,R1,2025,R1,gas,gassupply1,newcapa,2045
 A1,31.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
 A1,23.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050
 A1,5.40000000000,R1,2030,R1,power,windturbine,newcapa,2050
-A1,2.40000000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,6.96250000000,R1,2035,R1,power,windturbine,newcapa,2050
 A1,2.40000000000,R1,2040,R1,power,windturbine,newcapa,2050
 A1,2.40000000000,R1,2045,R1,power,windturbine,newcapa,2050
-A1,9.00000000000,R1,2050,R1,power,windturbine,newcapa,2050
+A1,4.43750000000,R1,2050,R1,power,windturbine,newcapa,2050
+A1,8.00140000000,R1,2025,R1,gas,gassupply1,newcapa,2050
diff --git a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv
index 98e28b6b..ebdafed5 100644
--- a/tests/example_outputs/default_timeslice/Results/MCAPrices.csv
+++ b/tests/example_outputs/default_timeslice/Results/MCAPrices.csv
@@ -23,53 +23,53 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
-electricity,all-week,night,all-year,8.84520000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,11.31650000000,R1,0,MUS$2010/PJ,2025
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,7.71080000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,10.73510000000,R1,0,MUS$2010/PJ,2025
 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
-electricity,all-week,morning,all-year,8.84520000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,11.31650000000,R1,1,MUS$2010/PJ,2025
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,7.71080000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,10.73510000000,R1,1,MUS$2010/PJ,2025
 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
-electricity,all-week,afternoon,all-year,8.84520000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,11.31650000000,R1,2,MUS$2010/PJ,2025
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,7.71080000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,10.73510000000,R1,2,MUS$2010/PJ,2025
 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
-electricity,all-week,early-peak,all-year,8.84520000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,11.31650000000,R1,3,MUS$2010/PJ,2025
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,7.71080000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,10.73510000000,R1,3,MUS$2010/PJ,2025
 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
-electricity,all-week,late-peak,all-year,8.84520000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,11.31650000000,R1,4,MUS$2010/PJ,2025
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,7.71080000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,10.73510000000,R1,4,MUS$2010/PJ,2025
 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
-electricity,all-week,evening,all-year,8.84520000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,11.31650000000,R1,5,MUS$2010/PJ,2025
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,7.71080000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,10.73510000000,R1,5,MUS$2010/PJ,2025
 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
 electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,6.13550000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,8.80540000000,R1,0,MUS$2010/PJ,2030
 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
 electricity,all-week,morning,all-year,7.19990000000,R1,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,6.13550000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,8.80540000000,R1,1,MUS$2010/PJ,2030
 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
 electricity,all-week,afternoon,all-year,7.19990000000,R1,2,MUS$2010/PJ,2030
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,6.13550000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,8.80540000000,R1,2,MUS$2010/PJ,2030
 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
 electricity,all-week,early-peak,all-year,7.19990000000,R1,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,6.13550000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,8.80540000000,R1,3,MUS$2010/PJ,2030
 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
 electricity,all-week,late-peak,all-year,7.19990000000,R1,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,6.13550000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,8.80540000000,R1,4,MUS$2010/PJ,2030
 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
 electricity,all-week,evening,all-year,7.19990000000,R1,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,6.13550000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,8.80540000000,R1,5,MUS$2010/PJ,2030
 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
 electricity,all-week,night,all-year,7.19990000000,R1,0,MUS$2010/PJ,2035
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035
diff --git a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv
index eb692f92..4d23447b 100644
--- a/tests/example_outputs/default_timeslice/Results/Power_Supply.csv
+++ b/tests/example_outputs/default_timeslice/Results/Power_Supply.csv
@@ -1,133 +1,133 @@
 asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2020,all-year,R1,0.05560000000,gasCCGT,0,MUS$2010/PJ,2025
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2025
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,night,2020,all-year,R1,5.09280000000,gasCCGT,0,MUS$2010/kt,2025
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2020,all-year,R1,0.08330000000,gasCCGT,1,MUS$2010/PJ,2025
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2025
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,morning,2020,all-year,R1,7.63920000000,gasCCGT,1,MUS$2010/kt,2025
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2020,all-year,R1,0.05560000000,gasCCGT,2,MUS$2010/PJ,2025
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2025
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,afternoon,2020,all-year,R1,5.09280000000,gasCCGT,2,MUS$2010/kt,2025
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2020,all-year,R1,0.08330000000,gasCCGT,3,MUS$2010/PJ,2025
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2025
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,early-peak,2020,all-year,R1,7.63920000000,gasCCGT,3,MUS$2010/kt,2025
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2020,all-year,R1,0.16670000000,gasCCGT,4,MUS$2010/PJ,2025
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2025
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,late-peak,2020,all-year,R1,15.27830000000,gasCCGT,4,MUS$2010/kt,2025
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2020,all-year,R1,0.11110000000,gasCCGT,5,MUS$2010/PJ,2025
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2025
-0,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,all-week,evening,2020,all-year,R1,10.18560000000,gasCCGT,5,MUS$2010/kt,2025
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2030
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2030
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2030
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2030
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2030
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2030
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2030
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2030
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2030
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2030
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2030
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2030
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2035
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2035
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2035
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2035
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2035
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2035
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2035
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2035
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2035
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2035
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2035
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2035
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2035
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2035
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2035
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2035
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2035
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2035
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2040
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2040
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2040
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2040
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2040
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2040
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2040
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2040
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2040
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2040
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2040
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2040
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2025,all-year,R1,0.36670000000,windturbine,0,MUS$2010/PJ,2045
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2045
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2025,all-year,R1,0.55000000000,windturbine,1,MUS$2010/PJ,2045
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2045
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2025,all-year,R1,0.36670000000,windturbine,2,MUS$2010/PJ,2045
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2045
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2025,all-year,R1,0.55000000000,windturbine,3,MUS$2010/PJ,2045
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2045
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2025,all-year,R1,1.10000000000,windturbine,4,MUS$2010/PJ,2045
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2045
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
-0,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2025,all-year,R1,0.73330000000,windturbine,5,MUS$2010/PJ,2045
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2045
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2050
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2035,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050
-5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,night,2050,all-year,R1,0.50000000000,windturbine,0,MUS$2010/PJ,2050
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2050
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2035,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050
-5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,morning,2050,all-year,R1,0.75000000000,windturbine,1,MUS$2010/PJ,2050
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2050
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2035,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050
-5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,afternoon,2050,all-year,R1,0.50000000000,windturbine,2,MUS$2010/PJ,2050
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2050
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2035,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050
-5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,early-peak,2050,all-year,R1,0.75000000000,windturbine,3,MUS$2010/PJ,2050
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2050
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
-5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,late-peak,2050,all-year,R1,1.50000000000,windturbine,4,MUS$2010/PJ,2050
-1,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2050
-2,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050
-3,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050
-4,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050
-5,CommodityUsage.ENERGY|PRODUCT,electricity,all-week,evening,2050,all-year,R1,1.00000000000,windturbine,5,MUS$2010/PJ,2050
+0,10,electricity,all-week,night,2020,all-year,R1,0.05560000000,gasCCGT,0,MUS$2010/PJ,2025
+1,10,electricity,all-week,night,2025,all-year,R1,0.11320000000,windturbine,0,MUS$2010/PJ,2025
+0,6,CO2f,all-week,night,2020,all-year,R1,5.09280000000,gasCCGT,0,MUS$2010/kt,2025
+0,10,electricity,all-week,morning,2020,all-year,R1,0.08330000000,gasCCGT,1,MUS$2010/PJ,2025
+1,10,electricity,all-week,morning,2025,all-year,R1,0.16980000000,windturbine,1,MUS$2010/PJ,2025
+0,6,CO2f,all-week,morning,2020,all-year,R1,7.63920000000,gasCCGT,1,MUS$2010/kt,2025
+0,10,electricity,all-week,afternoon,2020,all-year,R1,0.05560000000,gasCCGT,2,MUS$2010/PJ,2025
+1,10,electricity,all-week,afternoon,2025,all-year,R1,0.11320000000,windturbine,2,MUS$2010/PJ,2025
+0,6,CO2f,all-week,afternoon,2020,all-year,R1,5.09280000000,gasCCGT,2,MUS$2010/kt,2025
+0,10,electricity,all-week,early-peak,2020,all-year,R1,0.08330000000,gasCCGT,3,MUS$2010/PJ,2025
+1,10,electricity,all-week,early-peak,2025,all-year,R1,0.16980000000,windturbine,3,MUS$2010/PJ,2025
+0,6,CO2f,all-week,early-peak,2020,all-year,R1,7.63920000000,gasCCGT,3,MUS$2010/kt,2025
+0,10,electricity,all-week,late-peak,2020,all-year,R1,0.16670000000,gasCCGT,4,MUS$2010/PJ,2025
+1,10,electricity,all-week,late-peak,2025,all-year,R1,0.33960000000,windturbine,4,MUS$2010/PJ,2025
+0,6,CO2f,all-week,late-peak,2020,all-year,R1,15.27830000000,gasCCGT,4,MUS$2010/kt,2025
+0,10,electricity,all-week,evening,2020,all-year,R1,0.11110000000,gasCCGT,5,MUS$2010/PJ,2025
+1,10,electricity,all-week,evening,2025,all-year,R1,0.22640000000,windturbine,5,MUS$2010/PJ,2025
+0,6,CO2f,all-week,evening,2020,all-year,R1,10.18560000000,gasCCGT,5,MUS$2010/kt,2025
+1,10,electricity,all-week,night,2025,all-year,R1,0.11320000000,windturbine,0,MUS$2010/PJ,2030
+2,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2030
+1,10,electricity,all-week,morning,2025,all-year,R1,0.16980000000,windturbine,1,MUS$2010/PJ,2030
+2,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2030
+1,10,electricity,all-week,afternoon,2025,all-year,R1,0.11320000000,windturbine,2,MUS$2010/PJ,2030
+2,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2030
+1,10,electricity,all-week,early-peak,2025,all-year,R1,0.16980000000,windturbine,3,MUS$2010/PJ,2030
+2,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2030
+1,10,electricity,all-week,late-peak,2025,all-year,R1,0.33960000000,windturbine,4,MUS$2010/PJ,2030
+2,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2030
+1,10,electricity,all-week,evening,2025,all-year,R1,0.22640000000,windturbine,5,MUS$2010/PJ,2030
+2,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2030
+0,10,electricity,all-week,night,2025,all-year,R1,0.11320000000,windturbine,0,MUS$2010/PJ,2035
+1,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2035
+2,10,electricity,all-week,night,2035,all-year,R1,0.38680000000,windturbine,0,MUS$2010/PJ,2035
+0,10,electricity,all-week,morning,2025,all-year,R1,0.16980000000,windturbine,1,MUS$2010/PJ,2035
+1,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2035
+2,10,electricity,all-week,morning,2035,all-year,R1,0.58020000000,windturbine,1,MUS$2010/PJ,2035
+0,10,electricity,all-week,afternoon,2025,all-year,R1,0.11320000000,windturbine,2,MUS$2010/PJ,2035
+1,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2035
+2,10,electricity,all-week,afternoon,2035,all-year,R1,0.38680000000,windturbine,2,MUS$2010/PJ,2035
+0,10,electricity,all-week,early-peak,2025,all-year,R1,0.16980000000,windturbine,3,MUS$2010/PJ,2035
+1,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2035
+2,10,electricity,all-week,early-peak,2035,all-year,R1,0.58020000000,windturbine,3,MUS$2010/PJ,2035
+0,10,electricity,all-week,late-peak,2025,all-year,R1,0.33960000000,windturbine,4,MUS$2010/PJ,2035
+1,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2035
+2,10,electricity,all-week,late-peak,2035,all-year,R1,1.16040000000,windturbine,4,MUS$2010/PJ,2035
+0,10,electricity,all-week,evening,2025,all-year,R1,0.22640000000,windturbine,5,MUS$2010/PJ,2035
+1,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2035
+2,10,electricity,all-week,evening,2035,all-year,R1,0.77360000000,windturbine,5,MUS$2010/PJ,2035
+0,10,electricity,all-week,night,2025,all-year,R1,0.11320000000,windturbine,0,MUS$2010/PJ,2040
+1,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2040
+2,10,electricity,all-week,night,2035,all-year,R1,0.38680000000,windturbine,0,MUS$2010/PJ,2040
+3,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2040
+0,10,electricity,all-week,morning,2025,all-year,R1,0.16980000000,windturbine,1,MUS$2010/PJ,2040
+1,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2040
+2,10,electricity,all-week,morning,2035,all-year,R1,0.58020000000,windturbine,1,MUS$2010/PJ,2040
+3,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2040
+0,10,electricity,all-week,afternoon,2025,all-year,R1,0.11320000000,windturbine,2,MUS$2010/PJ,2040
+1,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2040
+2,10,electricity,all-week,afternoon,2035,all-year,R1,0.38680000000,windturbine,2,MUS$2010/PJ,2040
+3,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2040
+0,10,electricity,all-week,early-peak,2025,all-year,R1,0.16980000000,windturbine,3,MUS$2010/PJ,2040
+1,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2040
+2,10,electricity,all-week,early-peak,2035,all-year,R1,0.58020000000,windturbine,3,MUS$2010/PJ,2040
+3,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2040
+0,10,electricity,all-week,late-peak,2025,all-year,R1,0.33960000000,windturbine,4,MUS$2010/PJ,2040
+1,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2040
+2,10,electricity,all-week,late-peak,2035,all-year,R1,1.16040000000,windturbine,4,MUS$2010/PJ,2040
+3,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2040
+0,10,electricity,all-week,evening,2025,all-year,R1,0.22640000000,windturbine,5,MUS$2010/PJ,2040
+1,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2040
+2,10,electricity,all-week,evening,2035,all-year,R1,0.77360000000,windturbine,5,MUS$2010/PJ,2040
+3,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2040
+0,10,electricity,all-week,night,2025,all-year,R1,0.11320000000,windturbine,0,MUS$2010/PJ,2045
+1,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2045
+2,10,electricity,all-week,night,2035,all-year,R1,0.38680000000,windturbine,0,MUS$2010/PJ,2045
+3,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045
+4,10,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045
+0,10,electricity,all-week,morning,2025,all-year,R1,0.16980000000,windturbine,1,MUS$2010/PJ,2045
+1,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2045
+2,10,electricity,all-week,morning,2035,all-year,R1,0.58020000000,windturbine,1,MUS$2010/PJ,2045
+3,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045
+4,10,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045
+0,10,electricity,all-week,afternoon,2025,all-year,R1,0.11320000000,windturbine,2,MUS$2010/PJ,2045
+1,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2045
+2,10,electricity,all-week,afternoon,2035,all-year,R1,0.38680000000,windturbine,2,MUS$2010/PJ,2045
+3,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045
+4,10,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2045
+0,10,electricity,all-week,early-peak,2025,all-year,R1,0.16980000000,windturbine,3,MUS$2010/PJ,2045
+1,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2045
+2,10,electricity,all-week,early-peak,2035,all-year,R1,0.58020000000,windturbine,3,MUS$2010/PJ,2045
+3,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045
+4,10,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2045
+0,10,electricity,all-week,late-peak,2025,all-year,R1,0.33960000000,windturbine,4,MUS$2010/PJ,2045
+1,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2045
+2,10,electricity,all-week,late-peak,2035,all-year,R1,1.16040000000,windturbine,4,MUS$2010/PJ,2045
+3,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
+4,10,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
+0,10,electricity,all-week,evening,2025,all-year,R1,0.22640000000,windturbine,5,MUS$2010/PJ,2045
+1,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2045
+2,10,electricity,all-week,evening,2035,all-year,R1,0.77360000000,windturbine,5,MUS$2010/PJ,2045
+3,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
+4,10,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
+1,10,electricity,all-week,night,2030,all-year,R1,0.30000000000,windturbine,0,MUS$2010/PJ,2050
+2,10,electricity,all-week,night,2035,all-year,R1,0.38680000000,windturbine,0,MUS$2010/PJ,2050
+3,10,electricity,all-week,night,2040,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050
+4,10,electricity,all-week,night,2045,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050
+5,10,electricity,all-week,night,2050,all-year,R1,0.24650000000,windturbine,0,MUS$2010/PJ,2050
+1,10,electricity,all-week,morning,2030,all-year,R1,0.45000000000,windturbine,1,MUS$2010/PJ,2050
+2,10,electricity,all-week,morning,2035,all-year,R1,0.58020000000,windturbine,1,MUS$2010/PJ,2050
+3,10,electricity,all-week,morning,2040,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050
+4,10,electricity,all-week,morning,2045,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050
+5,10,electricity,all-week,morning,2050,all-year,R1,0.36980000000,windturbine,1,MUS$2010/PJ,2050
+1,10,electricity,all-week,afternoon,2030,all-year,R1,0.30000000000,windturbine,2,MUS$2010/PJ,2050
+2,10,electricity,all-week,afternoon,2035,all-year,R1,0.38680000000,windturbine,2,MUS$2010/PJ,2050
+3,10,electricity,all-week,afternoon,2040,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050
+4,10,electricity,all-week,afternoon,2045,all-year,R1,0.13330000000,windturbine,2,MUS$2010/PJ,2050
+5,10,electricity,all-week,afternoon,2050,all-year,R1,0.24650000000,windturbine,2,MUS$2010/PJ,2050
+1,10,electricity,all-week,early-peak,2030,all-year,R1,0.45000000000,windturbine,3,MUS$2010/PJ,2050
+2,10,electricity,all-week,early-peak,2035,all-year,R1,0.58020000000,windturbine,3,MUS$2010/PJ,2050
+3,10,electricity,all-week,early-peak,2040,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050
+4,10,electricity,all-week,early-peak,2045,all-year,R1,0.20000000000,windturbine,3,MUS$2010/PJ,2050
+5,10,electricity,all-week,early-peak,2050,all-year,R1,0.36980000000,windturbine,3,MUS$2010/PJ,2050
+1,10,electricity,all-week,late-peak,2030,all-year,R1,0.90000000000,windturbine,4,MUS$2010/PJ,2050
+2,10,electricity,all-week,late-peak,2035,all-year,R1,1.16040000000,windturbine,4,MUS$2010/PJ,2050
+3,10,electricity,all-week,late-peak,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
+4,10,electricity,all-week,late-peak,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
+5,10,electricity,all-week,late-peak,2050,all-year,R1,0.73960000000,windturbine,4,MUS$2010/PJ,2050
+1,10,electricity,all-week,evening,2030,all-year,R1,0.60000000000,windturbine,5,MUS$2010/PJ,2050
+2,10,electricity,all-week,evening,2035,all-year,R1,0.77360000000,windturbine,5,MUS$2010/PJ,2050
+3,10,electricity,all-week,evening,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050
+4,10,electricity,all-week,evening,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050
+5,10,electricity,all-week,evening,2050,all-year,R1,0.49310000000,windturbine,5,MUS$2010/PJ,2050
diff --git a/tests/example_outputs/medium/Results/MCACapacity.csv b/tests/example_outputs/medium/Results/MCACapacity.csv
index 47c2dd66..ab51b299 100644
--- a/tests/example_outputs/medium/Results/MCACapacity.csv
+++ b/tests/example_outputs/medium/Results/MCACapacity.csv
@@ -4,70 +4,65 @@ A1,10.00000000000,R1,2020,R1,residential,gasstove,newcapa,2020
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
 A1,8.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
+A1,4.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2025
 A1,8.00000000000,R1,2020,R1,residential,gasstove,newcapa,2025
 A1,4.00000000000,R1,2025,R1,residential,gasstove,newcapa,2025
-A1,4.00000000000,R1,2025,R1,residential,heatpump,newcapa,2025
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
-A1,0.77780000000,R1,2025,R1,power,gasCCGT,newcapa,2025
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
-A1,11.63810000000,R1,2025,R1,gas,gassupply1,newcapa,2025
-A1,5.04670000000,R1,2030,R1,residential,gasboiler,newcapa,2030
+A1,13.83720000000,R1,2025,R1,gas,gassupply1,newcapa,2025
+A1,4.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2030
+A1,8.51170000000,R1,2030,R1,residential,gasboiler,newcapa,2030
 A1,4.00000000000,R1,2025,R1,residential,gasstove,newcapa,2030
 A1,11.00000000000,R1,2030,R1,residential,gasstove,newcapa,2030
-A1,4.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
-A1,5.95330000000,R1,2030,R1,residential,heatpump,newcapa,2030
-A1,0.77780000000,R1,2025,R1,power,gasCCGT,newcapa,2030
-A1,8.20330000000,R1,2030,R1,power,windturbine,newcapa,2030
+A1,2.48830000000,R1,2030,R1,residential,heatpump,newcapa,2030
+A1,2.48830000000,R1,2030,R1,power,windturbine,newcapa,2030
 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
-A1,11.63810000000,R1,2025,R1,gas,gassupply1,newcapa,2030
-A1,5.34770000000,R1,2030,R1,gas,gassupply1,newcapa,2030
-A1,5.04670000000,R1,2030,R1,residential,gasboiler,newcapa,2035
+A1,13.83720000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,11.49440000000,R1,2030,R1,gas,gassupply1,newcapa,2030
+A1,8.51170000000,R1,2030,R1,residential,gasboiler,newcapa,2035
+A1,3.29660000000,R1,2035,R1,residential,gasboiler,newcapa,2035
 A1,11.00000000000,R1,2030,R1,residential,gasstove,newcapa,2035
 A1,7.00000000000,R1,2035,R1,residential,gasstove,newcapa,2035
-A1,5.95330000000,R1,2030,R1,residential,heatpump,newcapa,2035
-A1,7.00000000000,R1,2035,R1,residential,heatpump,newcapa,2035
-A1,0.77780000000,R1,2025,R1,power,gasCCGT,newcapa,2035
-A1,8.20330000000,R1,2030,R1,power,windturbine,newcapa,2035
-A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2035
-A1,11.63810000000,R1,2025,R1,gas,gassupply1,newcapa,2035
-A1,5.34770000000,R1,2030,R1,gas,gassupply1,newcapa,2035
-A1,10.83330000000,R1,2035,R1,gas,gassupply1,newcapa,2035
+A1,2.48830000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,3.70340000000,R1,2035,R1,residential,heatpump,newcapa,2035
+A1,2.48830000000,R1,2030,R1,power,windturbine,newcapa,2035
+A1,3.70340000000,R1,2035,R1,power,windturbine,newcapa,2035
+A1,13.83720000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,11.49440000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,9.92450000000,R1,2035,R1,gas,gassupply1,newcapa,2035
+A1,3.29660000000,R1,2035,R1,residential,gasboiler,newcapa,2040
+A1,2.29640000000,R1,2040,R1,residential,gasboiler,newcapa,2040
 A1,7.00000000000,R1,2035,R1,residential,gasstove,newcapa,2040
 A1,14.00000000000,R1,2040,R1,residential,gasstove,newcapa,2040
-A1,7.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
-A1,14.00000000000,R1,2040,R1,residential,heatpump,newcapa,2040
-A1,0.77780000000,R1,2025,R1,power,gasCCGT,newcapa,2040
-A1,8.20330000000,R1,2030,R1,power,windturbine,newcapa,2040
-A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2040
-A1,8.04670000000,R1,2040,R1,power,windturbine,newcapa,2040
-A1,11.63810000000,R1,2025,R1,gas,gassupply1,newcapa,2040
-A1,5.34770000000,R1,2030,R1,gas,gassupply1,newcapa,2040
-A1,10.83330000000,R1,2035,R1,gas,gassupply1,newcapa,2040
+A1,3.70340000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,11.70360000000,R1,2040,R1,residential,heatpump,newcapa,2040
+A1,2.48830000000,R1,2030,R1,power,windturbine,newcapa,2040
+A1,3.70340000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,9.21530000000,R1,2040,R1,power,windturbine,newcapa,2040
+A1,13.83720000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,11.49440000000,R1,2030,R1,gas,gassupply1,newcapa,2040
+A1,9.92450000000,R1,2035,R1,gas,gassupply1,newcapa,2040
+A1,2.29640000000,R1,2040,R1,residential,gasboiler,newcapa,2045
 A1,14.00000000000,R1,2040,R1,residential,gasstove,newcapa,2045
 A1,10.00000000000,R1,2045,R1,residential,gasstove,newcapa,2045
-A1,14.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
+A1,11.70360000000,R1,2040,R1,residential,heatpump,newcapa,2045
 A1,10.00000000000,R1,2045,R1,residential,heatpump,newcapa,2045
-A1,0.77780000000,R1,2025,R1,power,gasCCGT,newcapa,2045
-A1,8.20330000000,R1,2030,R1,power,windturbine,newcapa,2045
-A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2045
-A1,8.04670000000,R1,2040,R1,power,windturbine,newcapa,2045
-A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2045
-A1,11.63810000000,R1,2025,R1,gas,gassupply1,newcapa,2045
-A1,5.34770000000,R1,2030,R1,gas,gassupply1,newcapa,2045
-A1,10.83330000000,R1,2035,R1,gas,gassupply1,newcapa,2045
-A1,0.14640000000,R1,2045,R1,gas,gassupply1,newcapa,2045
+A1,2.48830000000,R1,2030,R1,power,windturbine,newcapa,2045
+A1,3.70340000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,9.21530000000,R1,2040,R1,power,windturbine,newcapa,2045
+A1,6.29660000000,R1,2045,R1,power,windturbine,newcapa,2045
+A1,13.83720000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,11.49440000000,R1,2030,R1,gas,gassupply1,newcapa,2045
+A1,9.92450000000,R1,2035,R1,gas,gassupply1,newcapa,2045
 A1,10.00000000000,R1,2045,R1,residential,gasstove,newcapa,2050
 A1,17.00000000000,R1,2050,R1,residential,gasstove,newcapa,2050
 A1,10.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
 A1,17.00000000000,R1,2050,R1,residential,heatpump,newcapa,2050
-A1,0.77780000000,R1,2025,R1,power,gasCCGT,newcapa,2050
-A1,8.20330000000,R1,2030,R1,power,windturbine,newcapa,2050
-A1,3.00000000000,R1,2035,R1,power,windturbine,newcapa,2050
-A1,8.04670000000,R1,2040,R1,power,windturbine,newcapa,2050
-A1,3.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
-A1,3.00000000000,R1,2050,R1,power,windturbine,newcapa,2050
-A1,11.63810000000,R1,2025,R1,gas,gassupply1,newcapa,2050
-A1,5.34770000000,R1,2030,R1,gas,gassupply1,newcapa,2050
-A1,10.83330000000,R1,2035,R1,gas,gassupply1,newcapa,2050
-A1,0.14640000000,R1,2045,R1,gas,gassupply1,newcapa,2050
-A1,3.33330000000,R1,2050,R1,gas,gassupply1,newcapa,2050
+A1,2.48830000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,3.70340000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,9.21530000000,R1,2040,R1,power,windturbine,newcapa,2050
+A1,6.29660000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,5.29640000000,R1,2050,R1,power,windturbine,newcapa,2050
+A1,13.83720000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,11.49440000000,R1,2030,R1,gas,gassupply1,newcapa,2050
+A1,9.92450000000,R1,2035,R1,gas,gassupply1,newcapa,2050
diff --git a/tests/example_outputs/medium/Results/MCAPrices.csv b/tests/example_outputs/medium/Results/MCAPrices.csv
index e3ddfa9b..76806a17 100644
--- a/tests/example_outputs/medium/Results/MCAPrices.csv
+++ b/tests/example_outputs/medium/Results/MCAPrices.csv
@@ -29,183 +29,183 @@ gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
 cook,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
-electricity,all-week,night,all-year,20.19730000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,28.37730000000,R1,0,MUS$2010/PJ,2025
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,11.45710000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,11.84750000000,R1,0,MUS$2010/PJ,2025
 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
 cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2025
-electricity,all-week,morning,all-year,20.19730000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,28.37730000000,R1,1,MUS$2010/PJ,2025
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,11.45710000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,11.84750000000,R1,1,MUS$2010/PJ,2025
 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
 cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2025
-electricity,all-week,afternoon,all-year,20.19730000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,28.37730000000,R1,2,MUS$2010/PJ,2025
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,11.45710000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,11.84750000000,R1,2,MUS$2010/PJ,2025
 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
 cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2025
-electricity,all-week,early-peak,all-year,20.19730000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,28.37730000000,R1,3,MUS$2010/PJ,2025
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,11.45710000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,11.84750000000,R1,3,MUS$2010/PJ,2025
 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
 cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2025
-electricity,all-week,late-peak,all-year,20.19730000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,28.37730000000,R1,4,MUS$2010/PJ,2025
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,11.45710000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,11.84750000000,R1,4,MUS$2010/PJ,2025
 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
 cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2025
-electricity,all-week,evening,all-year,20.19730000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,28.37730000000,R1,5,MUS$2010/PJ,2025
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,11.45710000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,11.84750000000,R1,5,MUS$2010/PJ,2025
 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
 cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2025
-electricity,all-week,night,all-year,18.98130000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,17.99980000000,R1,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,11.55150000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,13.50050000000,R1,0,MUS$2010/PJ,2030
 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
 cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2030
-electricity,all-week,morning,all-year,18.98130000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,17.99980000000,R1,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,11.55160000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,13.50050000000,R1,1,MUS$2010/PJ,2030
 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
 cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2030
-electricity,all-week,afternoon,all-year,18.98130000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,afternoon,all-year,17.99980000000,R1,2,MUS$2010/PJ,2030
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,11.55150000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,13.50050000000,R1,2,MUS$2010/PJ,2030
 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
 cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2030
-electricity,all-week,early-peak,all-year,18.98130000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,17.99980000000,R1,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,11.55160000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,13.50050000000,R1,3,MUS$2010/PJ,2030
 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
 cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2030
-electricity,all-week,late-peak,all-year,18.98130000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,17.99980000000,R1,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,11.55160000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,13.50050000000,R1,4,MUS$2010/PJ,2030
 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
 cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2030
-electricity,all-week,evening,all-year,18.98130000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,17.99980000000,R1,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,11.55160000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,13.50050000000,R1,5,MUS$2010/PJ,2030
 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
 cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2030
-electricity,all-week,night,all-year,19.47080000000,R1,0,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,17.99980000000,R1,0,MUS$2010/PJ,2035
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035
-heat,all-week,night,all-year,12.51550000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,15.16660000000,R1,0,MUS$2010/PJ,2035
 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
 cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2035
-electricity,all-week,morning,all-year,19.47080000000,R1,1,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,17.99980000000,R1,1,MUS$2010/PJ,2035
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035
-heat,all-week,morning,all-year,12.51550000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,15.16660000000,R1,1,MUS$2010/PJ,2035
 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
 cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2035
-electricity,all-week,afternoon,all-year,19.47080000000,R1,2,MUS$2010/PJ,2035
+electricity,all-week,afternoon,all-year,17.99980000000,R1,2,MUS$2010/PJ,2035
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035
-heat,all-week,afternoon,all-year,12.51550000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,15.16660000000,R1,2,MUS$2010/PJ,2035
 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
 cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2035
-electricity,all-week,early-peak,all-year,19.47080000000,R1,3,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,17.99980000000,R1,3,MUS$2010/PJ,2035
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035
-heat,all-week,early-peak,all-year,12.51550000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,15.16660000000,R1,3,MUS$2010/PJ,2035
 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
 cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2035
-electricity,all-week,late-peak,all-year,19.47080000000,R1,4,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,17.99980000000,R1,4,MUS$2010/PJ,2035
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035
-heat,all-week,late-peak,all-year,12.51560000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,15.16670000000,R1,4,MUS$2010/PJ,2035
 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
 cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2035
-electricity,all-week,evening,all-year,19.47080000000,R1,5,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,17.99980000000,R1,5,MUS$2010/PJ,2035
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035
-heat,all-week,evening,all-year,12.51560000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,15.16670000000,R1,5,MUS$2010/PJ,2035
 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
 cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2035
-electricity,all-week,night,all-year,19.34930000000,R1,0,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,17.99980000000,R1,0,MUS$2010/PJ,2040
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040
-heat,all-week,night,all-year,10.33710000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,12.97460000000,R1,0,MUS$2010/PJ,2040
 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
 cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2040
-electricity,all-week,morning,all-year,19.34930000000,R1,1,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,17.99980000000,R1,1,MUS$2010/PJ,2040
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040
-heat,all-week,morning,all-year,10.33710000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,12.97460000000,R1,1,MUS$2010/PJ,2040
 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
 cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2040
-electricity,all-week,afternoon,all-year,19.34930000000,R1,2,MUS$2010/PJ,2040
+electricity,all-week,afternoon,all-year,17.99980000000,R1,2,MUS$2010/PJ,2040
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040
-heat,all-week,afternoon,all-year,10.33710000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,12.97460000000,R1,2,MUS$2010/PJ,2040
 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
 cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2040
-electricity,all-week,early-peak,all-year,19.34930000000,R1,3,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,17.99980000000,R1,3,MUS$2010/PJ,2040
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040
-heat,all-week,early-peak,all-year,10.33710000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,12.97460000000,R1,3,MUS$2010/PJ,2040
 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
 cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2040
-electricity,all-week,late-peak,all-year,19.34930000000,R1,4,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,17.99980000000,R1,4,MUS$2010/PJ,2040
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040
-heat,all-week,late-peak,all-year,10.33710000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,12.97460000000,R1,4,MUS$2010/PJ,2040
 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
 cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2040
-electricity,all-week,evening,all-year,19.34930000000,R1,5,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,17.99980000000,R1,5,MUS$2010/PJ,2040
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040
-heat,all-week,evening,all-year,10.33710000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,12.97460000000,R1,5,MUS$2010/PJ,2040
 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
 cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2040
-electricity,all-week,night,all-year,19.72330000000,R1,0,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,17.99980000000,R1,0,MUS$2010/PJ,2045
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045
-heat,all-week,night,all-year,10.48670000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,11.44150000000,R1,0,MUS$2010/PJ,2045
 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
 cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2045
-electricity,all-week,morning,all-year,19.72330000000,R1,1,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,17.99980000000,R1,1,MUS$2010/PJ,2045
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045
-heat,all-week,morning,all-year,10.48670000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,11.44150000000,R1,1,MUS$2010/PJ,2045
 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
 cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2045
-electricity,all-week,afternoon,all-year,19.72330000000,R1,2,MUS$2010/PJ,2045
+electricity,all-week,afternoon,all-year,17.99980000000,R1,2,MUS$2010/PJ,2045
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045
-heat,all-week,afternoon,all-year,10.48670000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,11.44150000000,R1,2,MUS$2010/PJ,2045
 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
 cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2045
-electricity,all-week,early-peak,all-year,19.72330000000,R1,3,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,17.99980000000,R1,3,MUS$2010/PJ,2045
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045
-heat,all-week,early-peak,all-year,10.48670000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,11.44150000000,R1,3,MUS$2010/PJ,2045
 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
 cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2045
-electricity,all-week,late-peak,all-year,19.72330000000,R1,4,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,17.99980000000,R1,4,MUS$2010/PJ,2045
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045
-heat,all-week,late-peak,all-year,10.48670000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,11.44150000000,R1,4,MUS$2010/PJ,2045
 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
 cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2045
-electricity,all-week,evening,all-year,19.72330000000,R1,5,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,17.99980000000,R1,5,MUS$2010/PJ,2045
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
-heat,all-week,evening,all-year,10.48670000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,11.44150000000,R1,5,MUS$2010/PJ,2045
 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
 cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2045
-electricity,all-week,night,all-year,20.01420000000,R1,0,MUS$2010/PJ,2050
+electricity,all-week,night,all-year,17.99980000000,R1,0,MUS$2010/PJ,2050
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
-heat,all-week,night,all-year,10.60310000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,9.79730000000,R1,0,MUS$2010/PJ,2050
 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
 cook,all-week,night,all-year,5.14740000000,R1,0,MUS$2010/PJ,2050
-electricity,all-week,morning,all-year,20.01420000000,R1,1,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,17.99980000000,R1,1,MUS$2010/PJ,2050
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
-heat,all-week,morning,all-year,10.60310000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,9.79730000000,R1,1,MUS$2010/PJ,2050
 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
 cook,all-week,morning,all-year,5.14740000000,R1,1,MUS$2010/PJ,2050
-electricity,all-week,afternoon,all-year,20.01420000000,R1,2,MUS$2010/PJ,2050
+electricity,all-week,afternoon,all-year,17.99980000000,R1,2,MUS$2010/PJ,2050
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
-heat,all-week,afternoon,all-year,10.60310000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,9.79730000000,R1,2,MUS$2010/PJ,2050
 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
 cook,all-week,afternoon,all-year,5.14740000000,R1,2,MUS$2010/PJ,2050
-electricity,all-week,early-peak,all-year,20.01420000000,R1,3,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,17.99980000000,R1,3,MUS$2010/PJ,2050
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
-heat,all-week,early-peak,all-year,10.60310000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,9.79730000000,R1,3,MUS$2010/PJ,2050
 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
 cook,all-week,early-peak,all-year,5.14740000000,R1,3,MUS$2010/PJ,2050
-electricity,all-week,late-peak,all-year,20.01420000000,R1,4,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,17.99980000000,R1,4,MUS$2010/PJ,2050
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
-heat,all-week,late-peak,all-year,10.60310000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,9.79730000000,R1,4,MUS$2010/PJ,2050
 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
 cook,all-week,late-peak,all-year,5.14740000000,R1,4,MUS$2010/PJ,2050
-electricity,all-week,evening,all-year,20.01420000000,R1,5,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,17.99980000000,R1,5,MUS$2010/PJ,2050
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
-heat,all-week,evening,all-year,10.60310000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,9.79730000000,R1,5,MUS$2010/PJ,2050
 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
 cook,all-week,evening,all-year,5.14740000000,R1,5,MUS$2010/PJ,2050
diff --git a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv
index 4609502b..92268148 100644
--- a/tests/example_outputs/multiple_agents/Results/MCACapacity.csv
+++ b/tests/example_outputs/multiple_agents/Results/MCACapacity.csv
@@ -4,70 +4,78 @@ A2,5.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2020
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2020
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2020
 A1,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
-A1,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2025
+A1,7.01170000000,R1,2025,R1,residential,gasboiler,newcapa,2025
+A1,2.48830000000,R1,2025,R1,residential,heatpump,newcapa,2025
 A2,2.50000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
-A2,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2025
+A2,7.01170000000,R1,2025,R1,residential,gasboiler,newcapa,2025
+A2,2.48830000000,R1,2025,R1,residential,heatpump,newcapa,2025
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2025
-A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2025
+A1,1.21180000000,R1,2025,R1,power,gasCCGT,newcapa,2025
 A1,15.00000000000,R1,2020,R1,gas,gassupply1,newcapa,2025
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2025
-A1,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030
-A1,5.50000000000,R1,2030,R1,residential,heatpump,newcapa,2030
-A2,9.50000000000,R1,2025,R1,residential,heatpump,newcapa,2030
-A2,5.50000000000,R1,2030,R1,residential,heatpump,newcapa,2030
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2030
-A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2030
-A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2030
-A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2030
+A1,13.21280000000,R1,2025,R1,gas,gassupply1,newcapa,2025
+A1,7.01170000000,R1,2025,R1,residential,gasboiler,newcapa,2030
+A1,1.79660000000,R1,2030,R1,residential,gasboiler,newcapa,2030
+A1,2.48830000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A1,3.70340000000,R1,2030,R1,residential,heatpump,newcapa,2030
+A2,7.01170000000,R1,2025,R1,residential,gasboiler,newcapa,2030
+A2,1.79660000000,R1,2030,R1,residential,gasboiler,newcapa,2030
+A2,2.48830000000,R1,2025,R1,residential,heatpump,newcapa,2030
+A2,3.70340000000,R1,2030,R1,residential,heatpump,newcapa,2030
+A1,1.21180000000,R1,2025,R1,power,gasCCGT,newcapa,2030
+A1,0.91690000000,R1,2030,R1,power,gasCCGT,newcapa,2030
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2030
 A1,7.50000000000,R1,2020,R1,gas,gassupply1,newcapa,2030
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2030
-A1,5.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035
-A1,12.50000000000,R1,2035,R1,residential,heatpump,newcapa,2035
-A2,5.50000000000,R1,2030,R1,residential,heatpump,newcapa,2035
-A2,12.50000000000,R1,2035,R1,residential,heatpump,newcapa,2035
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2035
-A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2035
-A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2035
-A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2035
-A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2035
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2035
-A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2035
-A1,12.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A1,13.21280000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,5.54800000000,R1,2030,R1,gas,gassupply1,newcapa,2030
+A1,1.79660000000,R1,2030,R1,residential,gasboiler,newcapa,2035
+A1,0.79640000000,R1,2035,R1,residential,gasboiler,newcapa,2035
+A1,3.70340000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A1,11.70360000000,R1,2035,R1,residential,heatpump,newcapa,2035
+A2,1.79660000000,R1,2030,R1,residential,gasboiler,newcapa,2035
+A2,0.79640000000,R1,2035,R1,residential,gasboiler,newcapa,2035
+A2,3.70340000000,R1,2030,R1,residential,heatpump,newcapa,2035
+A2,11.70360000000,R1,2035,R1,residential,heatpump,newcapa,2035
+A1,1.21180000000,R1,2025,R1,power,gasCCGT,newcapa,2035
+A1,0.91690000000,R1,2030,R1,power,gasCCGT,newcapa,2035
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2035
+A1,18.43060000000,R1,2035,R1,power,windturbine,newcapa,2035
+A1,13.21280000000,R1,2025,R1,gas,gassupply1,newcapa,2035
+A1,5.54800000000,R1,2030,R1,gas,gassupply1,newcapa,2035
+A1,0.79640000000,R1,2035,R1,residential,gasboiler,newcapa,2040
+A1,11.70360000000,R1,2035,R1,residential,heatpump,newcapa,2040
 A1,8.50000000000,R1,2040,R1,residential,heatpump,newcapa,2040
-A2,12.50000000000,R1,2035,R1,residential,heatpump,newcapa,2040
+A2,0.79640000000,R1,2035,R1,residential,gasboiler,newcapa,2040
+A2,11.70360000000,R1,2035,R1,residential,heatpump,newcapa,2040
 A2,8.50000000000,R1,2040,R1,residential,heatpump,newcapa,2040
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2040
-A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2040
-A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2040
-A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2040
-A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2040
-A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2040
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2040
-A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2040
+A1,1.21180000000,R1,2025,R1,power,gasCCGT,newcapa,2040
+A1,0.91690000000,R1,2030,R1,power,gasCCGT,newcapa,2040
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2040
+A1,18.43060000000,R1,2035,R1,power,windturbine,newcapa,2040
+A1,9.59320000000,R1,2040,R1,power,windturbine,newcapa,2040
+A1,13.21280000000,R1,2025,R1,gas,gassupply1,newcapa,2040
+A1,5.54800000000,R1,2030,R1,gas,gassupply1,newcapa,2040
 A1,8.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045
 A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2045
 A2,8.50000000000,R1,2040,R1,residential,heatpump,newcapa,2045
 A2,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2045
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2045
-A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2045
-A1,1.91410000000,R1,2025,R1,power,windturbine,newcapa,2045
-A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2045
-A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2045
-A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2045
-A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2045
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2045
-A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2045
+A1,1.21180000000,R1,2025,R1,power,gasCCGT,newcapa,2045
+A1,0.91690000000,R1,2030,R1,power,gasCCGT,newcapa,2045
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2045
+A1,18.43060000000,R1,2035,R1,power,windturbine,newcapa,2045
+A1,9.59320000000,R1,2040,R1,power,windturbine,newcapa,2045
+A1,7.59280000000,R1,2045,R1,power,windturbine,newcapa,2045
+A1,13.21280000000,R1,2025,R1,gas,gassupply1,newcapa,2045
+A1,5.54800000000,R1,2030,R1,gas,gassupply1,newcapa,2045
 A1,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
 A1,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050
 A2,15.50000000000,R1,2045,R1,residential,heatpump,newcapa,2050
 A2,11.50000000000,R1,2050,R1,residential,heatpump,newcapa,2050
-A1,6.59380000000,R1,2025,R1,power,gasCCGT,newcapa,2050
-A1,0.27960000000,R1,2030,R1,power,gasCCGT,newcapa,2050
-A1,12.62080000000,R1,2030,R1,power,windturbine,newcapa,2050
-A1,6.00000000000,R1,2035,R1,power,windturbine,newcapa,2050
-A1,6.00000000000,R1,2040,R1,power,windturbine,newcapa,2050
-A1,6.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
-A1,7.91410000000,R1,2050,R1,power,windturbine,newcapa,2050
-A1,4.12600000000,R1,2025,R1,gas,gassupply1,newcapa,2050
-A1,7.35250000000,R1,2035,R1,gas,gassupply1,newcapa,2050
+A1,1.21180000000,R1,2025,R1,power,gasCCGT,newcapa,2050
+A1,0.91690000000,R1,2030,R1,power,gasCCGT,newcapa,2050
+A1,7.59380000000,R1,2030,R1,power,windturbine,newcapa,2050
+A1,18.43060000000,R1,2035,R1,power,windturbine,newcapa,2050
+A1,9.59320000000,R1,2040,R1,power,windturbine,newcapa,2050
+A1,7.59280000000,R1,2045,R1,power,windturbine,newcapa,2050
+A1,6.00000000000,R1,2050,R1,power,windturbine,newcapa,2050
+A1,13.21280000000,R1,2025,R1,gas,gassupply1,newcapa,2050
+A1,5.54800000000,R1,2030,R1,gas,gassupply1,newcapa,2050
diff --git a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv
index 94a1a3b8..e822a3f3 100644
--- a/tests/example_outputs/multiple_agents/Results/MCAPrices.csv
+++ b/tests/example_outputs/multiple_agents/Results/MCAPrices.csv
@@ -23,147 +23,147 @@ electricity,all-week,evening,all-year,19.50000000000,R1,5,MUS$2010/PJ,2020
 gas,all-week,evening,all-year,7.15280000000,R1,5,MUS$2010/PJ,2020
 heat,all-week,evening,all-year,100.00000000000,R1,5,MUS$2010/PJ,2020
 CO2f,all-week,evening,all-year,0.08310000000,R1,5,MUS$2010/kt,2020
-electricity,all-week,night,all-year,19.97590000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,20.19730000000,R1,0,MUS$2010/PJ,2025
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,10.84880000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,11.59940000000,R1,0,MUS$2010/PJ,2025
 CO2f,all-week,night,all-year,0.12010000000,R1,0,MUS$2010/kt,2025
-electricity,all-week,morning,all-year,19.97590000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,20.19730000000,R1,1,MUS$2010/PJ,2025
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,10.84880000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,11.59940000000,R1,1,MUS$2010/PJ,2025
 CO2f,all-week,morning,all-year,0.12010000000,R1,1,MUS$2010/kt,2025
-electricity,all-week,afternoon,all-year,19.97590000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,20.19730000000,R1,2,MUS$2010/PJ,2025
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,10.84880000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,11.59940000000,R1,2,MUS$2010/PJ,2025
 CO2f,all-week,afternoon,all-year,0.12010000000,R1,2,MUS$2010/kt,2025
-electricity,all-week,early-peak,all-year,19.97590000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,20.19730000000,R1,3,MUS$2010/PJ,2025
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,10.84880000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,11.59940000000,R1,3,MUS$2010/PJ,2025
 CO2f,all-week,early-peak,all-year,0.12010000000,R1,3,MUS$2010/kt,2025
-electricity,all-week,late-peak,all-year,19.97590000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,20.19730000000,R1,4,MUS$2010/PJ,2025
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,10.84880000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,11.59940000000,R1,4,MUS$2010/PJ,2025
 CO2f,all-week,late-peak,all-year,0.12010000000,R1,4,MUS$2010/kt,2025
-electricity,all-week,evening,all-year,19.97590000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,20.19730000000,R1,5,MUS$2010/PJ,2025
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,10.84880000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,11.59940000000,R1,5,MUS$2010/PJ,2025
 CO2f,all-week,evening,all-year,0.12010000000,R1,5,MUS$2010/kt,2025
-electricity,all-week,night,all-year,20.87770000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,20.15910000000,R1,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,10.94850000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,12.75710000000,R1,0,MUS$2010/PJ,2030
 CO2f,all-week,night,all-year,0.15700000000,R1,0,MUS$2010/kt,2030
-electricity,all-week,morning,all-year,20.87770000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,20.15910000000,R1,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,10.94850000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,12.75710000000,R1,1,MUS$2010/PJ,2030
 CO2f,all-week,morning,all-year,0.15700000000,R1,1,MUS$2010/kt,2030
-electricity,all-week,afternoon,all-year,20.87770000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,afternoon,all-year,20.15910000000,R1,2,MUS$2010/PJ,2030
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,10.94850000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,12.75710000000,R1,2,MUS$2010/PJ,2030
 CO2f,all-week,afternoon,all-year,0.15700000000,R1,2,MUS$2010/kt,2030
-electricity,all-week,early-peak,all-year,20.87770000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,20.15910000000,R1,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,10.94850000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,12.75710000000,R1,3,MUS$2010/PJ,2030
 CO2f,all-week,early-peak,all-year,0.15700000000,R1,3,MUS$2010/kt,2030
-electricity,all-week,late-peak,all-year,20.87770000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,20.15910000000,R1,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,10.94850000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,12.75710000000,R1,4,MUS$2010/PJ,2030
 CO2f,all-week,late-peak,all-year,0.15700000000,R1,4,MUS$2010/kt,2030
-electricity,all-week,evening,all-year,20.87770000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,20.15910000000,R1,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,10.94850000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,12.75710000000,R1,5,MUS$2010/PJ,2030
 CO2f,all-week,evening,all-year,0.15700000000,R1,5,MUS$2010/kt,2030
-electricity,all-week,night,all-year,22.67730000000,R1,0,MUS$2010/PJ,2035
+electricity,all-week,night,all-year,19.69230000000,R1,0,MUS$2010/PJ,2035
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2035
-heat,all-week,night,all-year,11.66830000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,11.55500000000,R1,0,MUS$2010/PJ,2035
 CO2f,all-week,night,all-year,0.21490000000,R1,0,MUS$2010/kt,2035
-electricity,all-week,morning,all-year,22.67730000000,R1,1,MUS$2010/PJ,2035
+electricity,all-week,morning,all-year,19.69230000000,R1,1,MUS$2010/PJ,2035
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2035
-heat,all-week,morning,all-year,11.66830000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,11.55500000000,R1,1,MUS$2010/PJ,2035
 CO2f,all-week,morning,all-year,0.21490000000,R1,1,MUS$2010/kt,2035
-electricity,all-week,afternoon,all-year,22.67730000000,R1,2,MUS$2010/PJ,2035
+electricity,all-week,afternoon,all-year,19.69230000000,R1,2,MUS$2010/PJ,2035
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2035
-heat,all-week,afternoon,all-year,11.66830000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,11.55500000000,R1,2,MUS$2010/PJ,2035
 CO2f,all-week,afternoon,all-year,0.21490000000,R1,2,MUS$2010/kt,2035
-electricity,all-week,early-peak,all-year,22.67730000000,R1,3,MUS$2010/PJ,2035
+electricity,all-week,early-peak,all-year,19.69230000000,R1,3,MUS$2010/PJ,2035
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2035
-heat,all-week,early-peak,all-year,11.66830000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,11.55500000000,R1,3,MUS$2010/PJ,2035
 CO2f,all-week,early-peak,all-year,0.21490000000,R1,3,MUS$2010/kt,2035
-electricity,all-week,late-peak,all-year,22.67730000000,R1,4,MUS$2010/PJ,2035
+electricity,all-week,late-peak,all-year,19.69230000000,R1,4,MUS$2010/PJ,2035
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2035
-heat,all-week,late-peak,all-year,11.66830000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,11.55500000000,R1,4,MUS$2010/PJ,2035
 CO2f,all-week,late-peak,all-year,0.21490000000,R1,4,MUS$2010/kt,2035
-electricity,all-week,evening,all-year,22.67730000000,R1,5,MUS$2010/PJ,2035
+electricity,all-week,evening,all-year,19.69230000000,R1,5,MUS$2010/PJ,2035
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2035
-heat,all-week,evening,all-year,11.66830000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,11.55500000000,R1,5,MUS$2010/PJ,2035
 CO2f,all-week,evening,all-year,0.21490000000,R1,5,MUS$2010/kt,2035
-electricity,all-week,night,all-year,23.96280000000,R1,0,MUS$2010/PJ,2040
+electricity,all-week,night,all-year,19.91940000000,R1,0,MUS$2010/PJ,2040
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2040
-heat,all-week,night,all-year,12.18250000000,R1,0,MUS$2010/PJ,2040
+heat,all-week,night,all-year,10.98830000000,R1,0,MUS$2010/PJ,2040
 CO2f,all-week,night,all-year,0.27280000000,R1,0,MUS$2010/kt,2040
-electricity,all-week,morning,all-year,23.96280000000,R1,1,MUS$2010/PJ,2040
+electricity,all-week,morning,all-year,19.91940000000,R1,1,MUS$2010/PJ,2040
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2040
-heat,all-week,morning,all-year,12.18250000000,R1,1,MUS$2010/PJ,2040
+heat,all-week,morning,all-year,10.98830000000,R1,1,MUS$2010/PJ,2040
 CO2f,all-week,morning,all-year,0.27280000000,R1,1,MUS$2010/kt,2040
-electricity,all-week,afternoon,all-year,23.96280000000,R1,2,MUS$2010/PJ,2040
+electricity,all-week,afternoon,all-year,19.91940000000,R1,2,MUS$2010/PJ,2040
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2040
-heat,all-week,afternoon,all-year,12.18250000000,R1,2,MUS$2010/PJ,2040
+heat,all-week,afternoon,all-year,10.98830000000,R1,2,MUS$2010/PJ,2040
 CO2f,all-week,afternoon,all-year,0.27280000000,R1,2,MUS$2010/kt,2040
-electricity,all-week,early-peak,all-year,23.96280000000,R1,3,MUS$2010/PJ,2040
+electricity,all-week,early-peak,all-year,19.91940000000,R1,3,MUS$2010/PJ,2040
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2040
-heat,all-week,early-peak,all-year,12.18250000000,R1,3,MUS$2010/PJ,2040
+heat,all-week,early-peak,all-year,10.98830000000,R1,3,MUS$2010/PJ,2040
 CO2f,all-week,early-peak,all-year,0.27280000000,R1,3,MUS$2010/kt,2040
-electricity,all-week,late-peak,all-year,23.96280000000,R1,4,MUS$2010/PJ,2040
+electricity,all-week,late-peak,all-year,19.91940000000,R1,4,MUS$2010/PJ,2040
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2040
-heat,all-week,late-peak,all-year,12.18250000000,R1,4,MUS$2010/PJ,2040
+heat,all-week,late-peak,all-year,10.98830000000,R1,4,MUS$2010/PJ,2040
 CO2f,all-week,late-peak,all-year,0.27280000000,R1,4,MUS$2010/kt,2040
-electricity,all-week,evening,all-year,23.96280000000,R1,5,MUS$2010/PJ,2040
+electricity,all-week,evening,all-year,19.91940000000,R1,5,MUS$2010/PJ,2040
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2040
-heat,all-week,evening,all-year,12.18250000000,R1,5,MUS$2010/PJ,2040
+heat,all-week,evening,all-year,10.98830000000,R1,5,MUS$2010/PJ,2040
 CO2f,all-week,evening,all-year,0.27280000000,R1,5,MUS$2010/kt,2040
-electricity,all-week,night,all-year,25.61540000000,R1,0,MUS$2010/PJ,2045
+electricity,all-week,night,all-year,20.35840000000,R1,0,MUS$2010/PJ,2045
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2045
-heat,all-week,night,all-year,12.84360000000,R1,0,MUS$2010/PJ,2045
+heat,all-week,night,all-year,10.74080000000,R1,0,MUS$2010/PJ,2045
 CO2f,all-week,night,all-year,0.35390000000,R1,0,MUS$2010/kt,2045
-electricity,all-week,morning,all-year,25.61540000000,R1,1,MUS$2010/PJ,2045
+electricity,all-week,morning,all-year,20.35840000000,R1,1,MUS$2010/PJ,2045
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2045
-heat,all-week,morning,all-year,12.84360000000,R1,1,MUS$2010/PJ,2045
+heat,all-week,morning,all-year,10.74080000000,R1,1,MUS$2010/PJ,2045
 CO2f,all-week,morning,all-year,0.35390000000,R1,1,MUS$2010/kt,2045
-electricity,all-week,afternoon,all-year,25.61540000000,R1,2,MUS$2010/PJ,2045
+electricity,all-week,afternoon,all-year,20.35840000000,R1,2,MUS$2010/PJ,2045
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2045
-heat,all-week,afternoon,all-year,12.84360000000,R1,2,MUS$2010/PJ,2045
+heat,all-week,afternoon,all-year,10.74080000000,R1,2,MUS$2010/PJ,2045
 CO2f,all-week,afternoon,all-year,0.35390000000,R1,2,MUS$2010/kt,2045
-electricity,all-week,early-peak,all-year,25.61540000000,R1,3,MUS$2010/PJ,2045
+electricity,all-week,early-peak,all-year,20.35840000000,R1,3,MUS$2010/PJ,2045
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2045
-heat,all-week,early-peak,all-year,12.84360000000,R1,3,MUS$2010/PJ,2045
+heat,all-week,early-peak,all-year,10.74080000000,R1,3,MUS$2010/PJ,2045
 CO2f,all-week,early-peak,all-year,0.35390000000,R1,3,MUS$2010/kt,2045
-electricity,all-week,late-peak,all-year,25.61540000000,R1,4,MUS$2010/PJ,2045
+electricity,all-week,late-peak,all-year,20.35840000000,R1,4,MUS$2010/PJ,2045
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2045
-heat,all-week,late-peak,all-year,12.84360000000,R1,4,MUS$2010/PJ,2045
+heat,all-week,late-peak,all-year,10.74080000000,R1,4,MUS$2010/PJ,2045
 CO2f,all-week,late-peak,all-year,0.35390000000,R1,4,MUS$2010/kt,2045
-electricity,all-week,evening,all-year,25.61540000000,R1,5,MUS$2010/PJ,2045
+electricity,all-week,evening,all-year,20.35840000000,R1,5,MUS$2010/PJ,2045
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2045
-heat,all-week,evening,all-year,12.84360000000,R1,5,MUS$2010/PJ,2045
+heat,all-week,evening,all-year,10.74080000000,R1,5,MUS$2010/PJ,2045
 CO2f,all-week,evening,all-year,0.35390000000,R1,5,MUS$2010/kt,2045
-electricity,all-week,night,all-year,26.90080000000,R1,0,MUS$2010/PJ,2050
+electricity,all-week,night,all-year,20.75650000000,R1,0,MUS$2010/PJ,2050
 gas,all-week,night,all-year,2.55000000000,R1,0,MUS$2010/PJ,2050
-heat,all-week,night,all-year,13.35770000000,R1,0,MUS$2010/PJ,2050
+heat,all-week,night,all-year,10.90000000000,R1,0,MUS$2010/PJ,2050
 CO2f,all-week,night,all-year,0.43510000000,R1,0,MUS$2010/kt,2050
-electricity,all-week,morning,all-year,26.90080000000,R1,1,MUS$2010/PJ,2050
+electricity,all-week,morning,all-year,20.75650000000,R1,1,MUS$2010/PJ,2050
 gas,all-week,morning,all-year,2.55000000000,R1,1,MUS$2010/PJ,2050
-heat,all-week,morning,all-year,13.35770000000,R1,1,MUS$2010/PJ,2050
+heat,all-week,morning,all-year,10.90000000000,R1,1,MUS$2010/PJ,2050
 CO2f,all-week,morning,all-year,0.43510000000,R1,1,MUS$2010/kt,2050
-electricity,all-week,afternoon,all-year,26.90080000000,R1,2,MUS$2010/PJ,2050
+electricity,all-week,afternoon,all-year,20.75650000000,R1,2,MUS$2010/PJ,2050
 gas,all-week,afternoon,all-year,2.55000000000,R1,2,MUS$2010/PJ,2050
-heat,all-week,afternoon,all-year,13.35770000000,R1,2,MUS$2010/PJ,2050
+heat,all-week,afternoon,all-year,10.90000000000,R1,2,MUS$2010/PJ,2050
 CO2f,all-week,afternoon,all-year,0.43510000000,R1,2,MUS$2010/kt,2050
-electricity,all-week,early-peak,all-year,26.90080000000,R1,3,MUS$2010/PJ,2050
+electricity,all-week,early-peak,all-year,20.75650000000,R1,3,MUS$2010/PJ,2050
 gas,all-week,early-peak,all-year,2.55000000000,R1,3,MUS$2010/PJ,2050
-heat,all-week,early-peak,all-year,13.35770000000,R1,3,MUS$2010/PJ,2050
+heat,all-week,early-peak,all-year,10.90000000000,R1,3,MUS$2010/PJ,2050
 CO2f,all-week,early-peak,all-year,0.43510000000,R1,3,MUS$2010/kt,2050
-electricity,all-week,late-peak,all-year,26.90080000000,R1,4,MUS$2010/PJ,2050
+electricity,all-week,late-peak,all-year,20.75650000000,R1,4,MUS$2010/PJ,2050
 gas,all-week,late-peak,all-year,2.55000000000,R1,4,MUS$2010/PJ,2050
-heat,all-week,late-peak,all-year,13.35770000000,R1,4,MUS$2010/PJ,2050
+heat,all-week,late-peak,all-year,10.90000000000,R1,4,MUS$2010/PJ,2050
 CO2f,all-week,late-peak,all-year,0.43510000000,R1,4,MUS$2010/kt,2050
-electricity,all-week,evening,all-year,26.90080000000,R1,5,MUS$2010/PJ,2050
+electricity,all-week,evening,all-year,20.75650000000,R1,5,MUS$2010/PJ,2050
 gas,all-week,evening,all-year,2.55000000000,R1,5,MUS$2010/PJ,2050
-heat,all-week,evening,all-year,13.35770000000,R1,5,MUS$2010/PJ,2050
+heat,all-week,evening,all-year,10.90000000000,R1,5,MUS$2010/PJ,2050
 CO2f,all-week,evening,all-year,0.43510000000,R1,5,MUS$2010/kt,2050
diff --git a/tests/test_constraints.py b/tests/test_constraints.py
index 37503cf6..70c2362b 100644
--- a/tests/test_constraints.py
+++ b/tests/test_constraints.py
@@ -515,9 +515,6 @@ def test_max_capacity_expansion(max_capacity_expansion):
     assert max_capacity_expansion.production == 0
     assert max_capacity_expansion.b.dims == ("replacement",)
     assert max_capacity_expansion.b.shape == (4,)
-    assert max_capacity_expansion.b.values == approx(
-        [50, 16.883199999999995, 16.883199999999995, 50]
-    )
     assert (
         max_capacity_expansion.replacement
         == ["estove", "gasboiler", "gasstove", "heatpump"]
@@ -542,6 +539,39 @@ def test_max_capacity_expansion_no_limits(
     assert result is None
 
 
+def test_max_capacity_expansion_seed(
+    market_demand, capacity, search_space, technologies
+):
+    from muse.constraints import max_capacity_expansion
+
+    seed = 10
+    technologies["growth_seed"] = seed
+
+    # Scenario 1: Zero capacity
+    capacity[:] = 0
+    result1 = max_capacity_expansion(
+        market_demand, capacity, search_space, technologies
+    )
+
+    # Scenario 2: Existing capacity = seed
+    capacity.sel(year=2020)[:] = seed
+    result2 = max_capacity_expansion(
+        market_demand, capacity, search_space, technologies
+    )
+
+    # Scenario 3: Existing capacity > seed
+    capacity.sel(year=2020)[:] = 2 * seed
+    result3 = max_capacity_expansion(
+        market_demand, capacity, search_space, technologies
+    )
+
+    # Result with zero capacity should match result with capacity = seed
+    assert result1.b.values == approx(result2.b.values)
+
+    # Result with capacity > should not match
+    assert result1.b.values != approx(result3.b.values)
+
+
 def test_max_capacity_expansion_infinite_limits(
     market_demand, capacity, search_space, technologies
 ):
diff --git a/tests/test_fullsim_regression.py b/tests/test_fullsim_regression.py
index 152cb195..68303c67 100644
--- a/tests/test_fullsim_regression.py
+++ b/tests/test_fullsim_regression.py
@@ -50,6 +50,12 @@ def test_tutorial_regression(tutorial_path, tmpdir, compare_dirs):
 
     from muse.mca import MCA
 
+    # Mark as xfail for a specific tutorial
+    if "modify-time-framework" in str(tutorial_path):
+        mark.xfail(reason="Known issue with this tutorial (#371)")(
+            test_tutorial_regression
+        )
+
     # fail the test if this warning crops up
     simplefilter("error", DtypeWarning)