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 cb4249e0f..c708a1711 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,6.13290000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,6.43650000000,R1,0,MUS$2010/PJ,2025
 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,3.88680000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,6.00150000000,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,7.95490000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,7.10740000000,R1,1,MUS$2010/PJ,2025
 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,4.46370000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,6.44870000000,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,12.20640000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,9.20290000000,R1,2,MUS$2010/PJ,2025
 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,5.81000000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,7.84540000000,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,7.95490000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,7.10740000000,R1,3,MUS$2010/PJ,2025
 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,4.46370000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,6.44870000000,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,7.95490000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,7.10740000000,R1,4,MUS$2010/PJ,2025
 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,4.46370000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,6.44870000000,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,12.20640000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,8.78050000000,R1,5,MUS$2010/PJ,2025
 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,5.81000000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,7.56390000000,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,0.66670000000,R1,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,2.69360000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,2.81510000000,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,0.66670000000,R1,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,3.42250000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,3.08350000000,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,0.66670000000,R1,2,MUS$2010/PJ,2030
 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,5.12310000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,3.92170000000,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,0.66670000000,R1,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,3.42250000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,3.08350000000,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,0.66670000000,R1,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,3.42250000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,3.08350000000,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,0.66670000000,R1,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,5.12310000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,3.75270000000,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,0.66670000000,R1,0,MUS$2010/PJ,2035
 gas,all-week,night,all-year,0.47220000000,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 ff56d993c..ec843ec60 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,143 +1,133 @@
-asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,year
-0,10,electricity,all-week,night,2020,all-year,R1,0.20000000000,gasCCGT,0,2020
-0,6,CO2f,all-week,night,2020,all-year,R1,18.33400000000,gasCCGT,0,2020
-0,10,electricity,all-week,morning,2020,all-year,R1,0.40000000000,gasCCGT,1,2020
-0,6,CO2f,all-week,morning,2020,all-year,R1,36.66800000000,gasCCGT,1,2020
-0,10,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,2020
-0,6,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,2020
-0,10,electricity,all-week,early-peak,2020,all-year,R1,0.40000000000,gasCCGT,3,2020
-0,6,CO2f,all-week,early-peak,2020,all-year,R1,36.66800000000,gasCCGT,3,2020
-0,10,electricity,all-week,late-peak,2020,all-year,R1,0.80000000000,gasCCGT,4,2020
-0,6,CO2f,all-week,late-peak,2020,all-year,R1,73.33600000000,gasCCGT,4,2020
-0,10,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,2020
-0,6,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,2020
-0,10,electricity,all-week,night,2020,all-year,R1,0.20000000000,gasCCGT,0,2025
-0,6,CO2f,all-week,night,2020,all-year,R1,18.33400000000,gasCCGT,0,2025
-1,10,electricity,all-week,night,2020,all-year,R1,0.22220000000,windturbine,0,2025
-0,10,electricity,all-week,morning,2020,all-year,R1,0.40000000000,gasCCGT,1,2025
-0,6,CO2f,all-week,morning,2020,all-year,R1,36.66800000000,gasCCGT,1,2025
-1,10,electricity,all-week,morning,2020,all-year,R1,0.23330000000,windturbine,1,2025
-0,10,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,2025
-0,6,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,2025
-0,10,electricity,all-week,early-peak,2020,all-year,R1,0.40000000000,gasCCGT,3,2025
-0,6,CO2f,all-week,early-peak,2020,all-year,R1,36.66800000000,gasCCGT,3,2025
-1,10,electricity,all-week,early-peak,2020,all-year,R1,0.23330000000,windturbine,3,2025
-0,10,electricity,all-week,late-peak,2020,all-year,R1,0.80000000000,gasCCGT,4,2025
-0,6,CO2f,all-week,late-peak,2020,all-year,R1,73.33600000000,gasCCGT,4,2025
-1,10,electricity,all-week,late-peak,2020,all-year,R1,0.46670000000,windturbine,4,2025
-0,10,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,2025
-0,6,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,2025
-1,10,electricity,all-week,night,2020,all-year,R1,0.33330000000,windturbine,0,2030
-2,10,electricity,all-week,night,2025,all-year,R1,0.33330000000,windturbine,0,2030
-1,10,electricity,all-week,morning,2020,all-year,R1,0.50000000000,windturbine,1,2030
-2,10,electricity,all-week,morning,2025,all-year,R1,0.50000000000,windturbine,1,2030
-1,10,electricity,all-week,afternoon,2020,all-year,R1,0.33330000000,windturbine,2,2030
-2,10,electricity,all-week,afternoon,2025,all-year,R1,0.33330000000,windturbine,2,2030
-1,10,electricity,all-week,early-peak,2020,all-year,R1,0.50000000000,windturbine,3,2030
-2,10,electricity,all-week,early-peak,2025,all-year,R1,0.50000000000,windturbine,3,2030
-1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,4,2030
-2,10,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,2030
-1,10,electricity,all-week,evening,2020,all-year,R1,0.66670000000,windturbine,5,2030
-2,10,electricity,all-week,evening,2025,all-year,R1,0.66670000000,windturbine,5,2030
-1,10,electricity,all-week,night,2020,all-year,R1,0.20000000000,windturbine,0,2035
-2,10,electricity,all-week,night,2025,all-year,R1,0.20000000000,windturbine,0,2035
-3,10,electricity,all-week,night,2030,all-year,R1,0.40000000000,windturbine,0,2035
-1,10,electricity,all-week,morning,2020,all-year,R1,0.30000000000,windturbine,1,2035
-2,10,electricity,all-week,morning,2025,all-year,R1,0.30000000000,windturbine,1,2035
-3,10,electricity,all-week,morning,2030,all-year,R1,0.60000000000,windturbine,1,2035
-1,10,electricity,all-week,afternoon,2020,all-year,R1,0.20000000000,windturbine,2,2035
-2,10,electricity,all-week,afternoon,2025,all-year,R1,0.20000000000,windturbine,2,2035
-3,10,electricity,all-week,afternoon,2030,all-year,R1,0.40000000000,windturbine,2,2035
-1,10,electricity,all-week,early-peak,2020,all-year,R1,0.30000000000,windturbine,3,2035
-2,10,electricity,all-week,early-peak,2025,all-year,R1,0.30000000000,windturbine,3,2035
-3,10,electricity,all-week,early-peak,2030,all-year,R1,0.60000000000,windturbine,3,2035
-1,10,electricity,all-week,late-peak,2020,all-year,R1,0.60000000000,windturbine,4,2035
-2,10,electricity,all-week,late-peak,2025,all-year,R1,0.60000000000,windturbine,4,2035
-3,10,electricity,all-week,late-peak,2030,all-year,R1,1.20000000000,windturbine,4,2035
-1,10,electricity,all-week,evening,2020,all-year,R1,0.40000000000,windturbine,5,2035
-2,10,electricity,all-week,evening,2025,all-year,R1,0.40000000000,windturbine,5,2035
-3,10,electricity,all-week,evening,2030,all-year,R1,0.80000000000,windturbine,5,2035
-1,10,electricity,all-week,night,2020,all-year,R1,0.15560000000,windturbine,0,2040
-2,10,electricity,all-week,night,2025,all-year,R1,0.15560000000,windturbine,0,2040
-3,10,electricity,all-week,night,2030,all-year,R1,0.31110000000,windturbine,0,2040
-4,10,electricity,all-week,night,2035,all-year,R1,0.31110000000,windturbine,0,2040
-1,10,electricity,all-week,morning,2020,all-year,R1,0.23330000000,windturbine,1,2040
-2,10,electricity,all-week,morning,2025,all-year,R1,0.23330000000,windturbine,1,2040
-3,10,electricity,all-week,morning,2030,all-year,R1,0.46670000000,windturbine,1,2040
-4,10,electricity,all-week,morning,2035,all-year,R1,0.46670000000,windturbine,1,2040
-1,10,electricity,all-week,afternoon,2020,all-year,R1,0.15560000000,windturbine,2,2040
-2,10,electricity,all-week,afternoon,2025,all-year,R1,0.15560000000,windturbine,2,2040
-3,10,electricity,all-week,afternoon,2030,all-year,R1,0.31110000000,windturbine,2,2040
-4,10,electricity,all-week,afternoon,2035,all-year,R1,0.31110000000,windturbine,2,2040
-1,10,electricity,all-week,early-peak,2020,all-year,R1,0.23330000000,windturbine,3,2040
-2,10,electricity,all-week,early-peak,2025,all-year,R1,0.23330000000,windturbine,3,2040
-3,10,electricity,all-week,early-peak,2030,all-year,R1,0.46670000000,windturbine,3,2040
-4,10,electricity,all-week,early-peak,2035,all-year,R1,0.46670000000,windturbine,3,2040
-1,10,electricity,all-week,late-peak,2020,all-year,R1,0.46670000000,windturbine,4,2040
-2,10,electricity,all-week,late-peak,2025,all-year,R1,0.46670000000,windturbine,4,2040
-3,10,electricity,all-week,late-peak,2030,all-year,R1,0.93330000000,windturbine,4,2040
-4,10,electricity,all-week,late-peak,2035,all-year,R1,0.93330000000,windturbine,4,2040
-1,10,electricity,all-week,evening,2020,all-year,R1,0.31110000000,windturbine,5,2040
-2,10,electricity,all-week,evening,2025,all-year,R1,0.31110000000,windturbine,5,2040
-3,10,electricity,all-week,evening,2030,all-year,R1,0.62220000000,windturbine,5,2040
-4,10,electricity,all-week,evening,2035,all-year,R1,0.62220000000,windturbine,5,2040
-1,10,electricity,all-week,night,2020,all-year,R1,0.13330000000,windturbine,0,2045
-2,10,electricity,all-week,night,2025,all-year,R1,0.13330000000,windturbine,0,2045
-3,10,electricity,all-week,night,2030,all-year,R1,0.26670000000,windturbine,0,2045
-4,10,electricity,all-week,night,2035,all-year,R1,0.26670000000,windturbine,0,2045
-5,10,electricity,all-week,night,2040,all-year,R1,0.26670000000,windturbine,0,2045
-1,10,electricity,all-week,morning,2020,all-year,R1,0.20000000000,windturbine,1,2045
-2,10,electricity,all-week,morning,2025,all-year,R1,0.20000000000,windturbine,1,2045
-3,10,electricity,all-week,morning,2030,all-year,R1,0.40000000000,windturbine,1,2045
-4,10,electricity,all-week,morning,2035,all-year,R1,0.40000000000,windturbine,1,2045
-5,10,electricity,all-week,morning,2040,all-year,R1,0.40000000000,windturbine,1,2045
-1,10,electricity,all-week,afternoon,2020,all-year,R1,0.13330000000,windturbine,2,2045
-2,10,electricity,all-week,afternoon,2025,all-year,R1,0.13330000000,windturbine,2,2045
-3,10,electricity,all-week,afternoon,2030,all-year,R1,0.26670000000,windturbine,2,2045
-4,10,electricity,all-week,afternoon,2035,all-year,R1,0.26670000000,windturbine,2,2045
-5,10,electricity,all-week,afternoon,2040,all-year,R1,0.26670000000,windturbine,2,2045
-1,10,electricity,all-week,early-peak,2020,all-year,R1,0.20000000000,windturbine,3,2045
-2,10,electricity,all-week,early-peak,2025,all-year,R1,0.20000000000,windturbine,3,2045
-3,10,electricity,all-week,early-peak,2030,all-year,R1,0.40000000000,windturbine,3,2045
-4,10,electricity,all-week,early-peak,2035,all-year,R1,0.40000000000,windturbine,3,2045
-5,10,electricity,all-week,early-peak,2040,all-year,R1,0.40000000000,windturbine,3,2045
-1,10,electricity,all-week,late-peak,2020,all-year,R1,0.40000000000,windturbine,4,2045
-2,10,electricity,all-week,late-peak,2025,all-year,R1,0.40000000000,windturbine,4,2045
-3,10,electricity,all-week,late-peak,2030,all-year,R1,0.80000000000,windturbine,4,2045
-4,10,electricity,all-week,late-peak,2035,all-year,R1,0.80000000000,windturbine,4,2045
-5,10,electricity,all-week,late-peak,2040,all-year,R1,0.80000000000,windturbine,4,2045
-1,10,electricity,all-week,evening,2020,all-year,R1,0.26670000000,windturbine,5,2045
-2,10,electricity,all-week,evening,2025,all-year,R1,0.26670000000,windturbine,5,2045
-3,10,electricity,all-week,evening,2030,all-year,R1,0.53330000000,windturbine,5,2045
-4,10,electricity,all-week,evening,2035,all-year,R1,0.53330000000,windturbine,5,2045
-5,10,electricity,all-week,evening,2040,all-year,R1,0.53330000000,windturbine,5,2045
-2,10,electricity,all-week,night,2025,all-year,R1,0.13330000000,windturbine,0,2050
-3,10,electricity,all-week,night,2030,all-year,R1,0.26670000000,windturbine,0,2050
-4,10,electricity,all-week,night,2035,all-year,R1,0.26670000000,windturbine,0,2050
-5,10,electricity,all-week,night,2040,all-year,R1,0.26670000000,windturbine,0,2050
-6,10,electricity,all-week,night,2045,all-year,R1,0.26670000000,windturbine,0,2050
-2,10,electricity,all-week,morning,2025,all-year,R1,0.20000000000,windturbine,1,2050
-3,10,electricity,all-week,morning,2030,all-year,R1,0.40000000000,windturbine,1,2050
-4,10,electricity,all-week,morning,2035,all-year,R1,0.40000000000,windturbine,1,2050
-5,10,electricity,all-week,morning,2040,all-year,R1,0.40000000000,windturbine,1,2050
-6,10,electricity,all-week,morning,2045,all-year,R1,0.40000000000,windturbine,1,2050
-2,10,electricity,all-week,afternoon,2025,all-year,R1,0.13330000000,windturbine,2,2050
-3,10,electricity,all-week,afternoon,2030,all-year,R1,0.26670000000,windturbine,2,2050
-4,10,electricity,all-week,afternoon,2035,all-year,R1,0.26670000000,windturbine,2,2050
-5,10,electricity,all-week,afternoon,2040,all-year,R1,0.26670000000,windturbine,2,2050
-6,10,electricity,all-week,afternoon,2045,all-year,R1,0.26670000000,windturbine,2,2050
-2,10,electricity,all-week,early-peak,2025,all-year,R1,0.20000000000,windturbine,3,2050
-3,10,electricity,all-week,early-peak,2030,all-year,R1,0.40000000000,windturbine,3,2050
-4,10,electricity,all-week,early-peak,2035,all-year,R1,0.40000000000,windturbine,3,2050
-5,10,electricity,all-week,early-peak,2040,all-year,R1,0.40000000000,windturbine,3,2050
-6,10,electricity,all-week,early-peak,2045,all-year,R1,0.40000000000,windturbine,3,2050
-2,10,electricity,all-week,late-peak,2025,all-year,R1,0.40000000000,windturbine,4,2050
-3,10,electricity,all-week,late-peak,2030,all-year,R1,0.80000000000,windturbine,4,2050
-4,10,electricity,all-week,late-peak,2035,all-year,R1,0.80000000000,windturbine,4,2050
-5,10,electricity,all-week,late-peak,2040,all-year,R1,0.80000000000,windturbine,4,2050
-6,10,electricity,all-week,late-peak,2045,all-year,R1,0.80000000000,windturbine,4,2050
-2,10,electricity,all-week,evening,2025,all-year,R1,0.26670000000,windturbine,5,2050
-3,10,electricity,all-week,evening,2030,all-year,R1,0.53330000000,windturbine,5,2050
-4,10,electricity,all-week,evening,2035,all-year,R1,0.53330000000,windturbine,5,2050
-5,10,electricity,all-week,evening,2040,all-year,R1,0.53330000000,windturbine,5,2050
-6,10,electricity,all-week,evening,2045,all-year,R1,0.53330000000,windturbine,5,2050
+asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year
+0,10,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,0,MUS$2010/PJ,2025
+1,10,electricity,all-week,afternoon,2020,all-year,R1,0.21110000000,windturbine,0,MUS$2010/PJ,2025
+0,6,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,0,MUS$2010/kt,2025
+0,10,electricity,all-week,early-peak,2020,all-year,R1,0.40000000000,gasCCGT,1,MUS$2010/PJ,2025
+1,10,electricity,all-week,early-peak,2020,all-year,R1,0.31670000000,windturbine,1,MUS$2010/PJ,2025
+0,6,CO2f,all-week,early-peak,2020,all-year,R1,36.66800000000,gasCCGT,1,MUS$2010/kt,2025
+0,10,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,2,MUS$2010/PJ,2025
+1,10,electricity,all-week,evening,2020,all-year,R1,0.42220000000,windturbine,2,MUS$2010/PJ,2025
+0,6,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,2,MUS$2010/kt,2025
+0,10,electricity,all-week,late-peak,2020,all-year,R1,0.80000000000,gasCCGT,3,MUS$2010/PJ,2025
+1,10,electricity,all-week,late-peak,2020,all-year,R1,0.63330000000,windturbine,3,MUS$2010/PJ,2025
+0,6,CO2f,all-week,late-peak,2020,all-year,R1,73.33600000000,gasCCGT,3,MUS$2010/kt,2025
+0,10,electricity,all-week,morning,2020,all-year,R1,0.40000000000,gasCCGT,4,MUS$2010/PJ,2025
+1,10,electricity,all-week,morning,2020,all-year,R1,0.31670000000,windturbine,4,MUS$2010/PJ,2025
+0,6,CO2f,all-week,morning,2020,all-year,R1,36.66800000000,gasCCGT,4,MUS$2010/kt,2025
+0,10,electricity,all-week,night,2020,all-year,R1,0.21110000000,gasCCGT,5,MUS$2010/PJ,2025
+1,10,electricity,all-week,night,2020,all-year,R1,0.21110000000,windturbine,5,MUS$2010/PJ,2025
+0,6,CO2f,all-week,night,2020,all-year,R1,19.35260000000,gasCCGT,5,MUS$2010/kt,2025
+1,10,electricity,all-week,afternoon,2020,all-year,R1,0.33330000000,windturbine,0,MUS$2010/PJ,2030
+2,10,electricity,all-week,afternoon,2025,all-year,R1,0.33330000000,windturbine,0,MUS$2010/PJ,2030
+1,10,electricity,all-week,early-peak,2020,all-year,R1,0.50000000000,windturbine,1,MUS$2010/PJ,2030
+2,10,electricity,all-week,early-peak,2025,all-year,R1,0.50000000000,windturbine,1,MUS$2010/PJ,2030
+1,10,electricity,all-week,evening,2020,all-year,R1,0.66670000000,windturbine,2,MUS$2010/PJ,2030
+2,10,electricity,all-week,evening,2025,all-year,R1,0.66670000000,windturbine,2,MUS$2010/PJ,2030
+1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,3,MUS$2010/PJ,2030
+2,10,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,3,MUS$2010/PJ,2030
+1,10,electricity,all-week,morning,2020,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2030
+2,10,electricity,all-week,morning,2025,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2030
+1,10,electricity,all-week,night,2020,all-year,R1,0.33330000000,windturbine,5,MUS$2010/PJ,2030
+2,10,electricity,all-week,night,2025,all-year,R1,0.33330000000,windturbine,5,MUS$2010/PJ,2030
+1,10,electricity,all-week,afternoon,2020,all-year,R1,0.20000000000,windturbine,0,MUS$2010/PJ,2035
+2,10,electricity,all-week,afternoon,2025,all-year,R1,0.20000000000,windturbine,0,MUS$2010/PJ,2035
+3,10,electricity,all-week,afternoon,2030,all-year,R1,0.40000000000,windturbine,0,MUS$2010/PJ,2035
+1,10,electricity,all-week,early-peak,2020,all-year,R1,0.30000000000,windturbine,1,MUS$2010/PJ,2035
+2,10,electricity,all-week,early-peak,2025,all-year,R1,0.30000000000,windturbine,1,MUS$2010/PJ,2035
+3,10,electricity,all-week,early-peak,2030,all-year,R1,0.60000000000,windturbine,1,MUS$2010/PJ,2035
+1,10,electricity,all-week,evening,2020,all-year,R1,0.40000000000,windturbine,2,MUS$2010/PJ,2035
+2,10,electricity,all-week,evening,2025,all-year,R1,0.40000000000,windturbine,2,MUS$2010/PJ,2035
+3,10,electricity,all-week,evening,2030,all-year,R1,0.80000000000,windturbine,2,MUS$2010/PJ,2035
+1,10,electricity,all-week,late-peak,2020,all-year,R1,0.60000000000,windturbine,3,MUS$2010/PJ,2035
+2,10,electricity,all-week,late-peak,2025,all-year,R1,0.60000000000,windturbine,3,MUS$2010/PJ,2035
+3,10,electricity,all-week,late-peak,2030,all-year,R1,1.20000000000,windturbine,3,MUS$2010/PJ,2035
+1,10,electricity,all-week,morning,2020,all-year,R1,0.30000000000,windturbine,4,MUS$2010/PJ,2035
+2,10,electricity,all-week,morning,2025,all-year,R1,0.30000000000,windturbine,4,MUS$2010/PJ,2035
+3,10,electricity,all-week,morning,2030,all-year,R1,0.60000000000,windturbine,4,MUS$2010/PJ,2035
+1,10,electricity,all-week,night,2020,all-year,R1,0.20000000000,windturbine,5,MUS$2010/PJ,2035
+2,10,electricity,all-week,night,2025,all-year,R1,0.20000000000,windturbine,5,MUS$2010/PJ,2035
+3,10,electricity,all-week,night,2030,all-year,R1,0.40000000000,windturbine,5,MUS$2010/PJ,2035
+1,10,electricity,all-week,afternoon,2020,all-year,R1,0.15560000000,windturbine,0,MUS$2010/PJ,2040
+2,10,electricity,all-week,afternoon,2025,all-year,R1,0.15560000000,windturbine,0,MUS$2010/PJ,2040
+3,10,electricity,all-week,afternoon,2030,all-year,R1,0.31110000000,windturbine,0,MUS$2010/PJ,2040
+4,10,electricity,all-week,afternoon,2035,all-year,R1,0.31110000000,windturbine,0,MUS$2010/PJ,2040
+1,10,electricity,all-week,early-peak,2020,all-year,R1,0.23330000000,windturbine,1,MUS$2010/PJ,2040
+2,10,electricity,all-week,early-peak,2025,all-year,R1,0.23330000000,windturbine,1,MUS$2010/PJ,2040
+3,10,electricity,all-week,early-peak,2030,all-year,R1,0.46670000000,windturbine,1,MUS$2010/PJ,2040
+4,10,electricity,all-week,early-peak,2035,all-year,R1,0.46670000000,windturbine,1,MUS$2010/PJ,2040
+1,10,electricity,all-week,evening,2020,all-year,R1,0.31110000000,windturbine,2,MUS$2010/PJ,2040
+2,10,electricity,all-week,evening,2025,all-year,R1,0.31110000000,windturbine,2,MUS$2010/PJ,2040
+3,10,electricity,all-week,evening,2030,all-year,R1,0.62220000000,windturbine,2,MUS$2010/PJ,2040
+4,10,electricity,all-week,evening,2035,all-year,R1,0.62220000000,windturbine,2,MUS$2010/PJ,2040
+1,10,electricity,all-week,late-peak,2020,all-year,R1,0.46670000000,windturbine,3,MUS$2010/PJ,2040
+2,10,electricity,all-week,late-peak,2025,all-year,R1,0.46670000000,windturbine,3,MUS$2010/PJ,2040
+3,10,electricity,all-week,late-peak,2030,all-year,R1,0.93330000000,windturbine,3,MUS$2010/PJ,2040
+4,10,electricity,all-week,late-peak,2035,all-year,R1,0.93330000000,windturbine,3,MUS$2010/PJ,2040
+1,10,electricity,all-week,morning,2020,all-year,R1,0.23330000000,windturbine,4,MUS$2010/PJ,2040
+2,10,electricity,all-week,morning,2025,all-year,R1,0.23330000000,windturbine,4,MUS$2010/PJ,2040
+3,10,electricity,all-week,morning,2030,all-year,R1,0.46670000000,windturbine,4,MUS$2010/PJ,2040
+4,10,electricity,all-week,morning,2035,all-year,R1,0.46670000000,windturbine,4,MUS$2010/PJ,2040
+1,10,electricity,all-week,night,2020,all-year,R1,0.15560000000,windturbine,5,MUS$2010/PJ,2040
+2,10,electricity,all-week,night,2025,all-year,R1,0.15560000000,windturbine,5,MUS$2010/PJ,2040
+3,10,electricity,all-week,night,2030,all-year,R1,0.31110000000,windturbine,5,MUS$2010/PJ,2040
+4,10,electricity,all-week,night,2035,all-year,R1,0.31110000000,windturbine,5,MUS$2010/PJ,2040
+1,10,electricity,all-week,afternoon,2020,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045
+2,10,electricity,all-week,afternoon,2025,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045
+3,10,electricity,all-week,afternoon,2030,all-year,R1,0.26670000000,windturbine,0,MUS$2010/PJ,2045
+4,10,electricity,all-week,afternoon,2035,all-year,R1,0.26670000000,windturbine,0,MUS$2010/PJ,2045
+5,10,electricity,all-week,afternoon,2040,all-year,R1,0.26670000000,windturbine,0,MUS$2010/PJ,2045
+1,10,electricity,all-week,early-peak,2020,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045
+2,10,electricity,all-week,early-peak,2025,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045
+3,10,electricity,all-week,early-peak,2030,all-year,R1,0.40000000000,windturbine,1,MUS$2010/PJ,2045
+4,10,electricity,all-week,early-peak,2035,all-year,R1,0.40000000000,windturbine,1,MUS$2010/PJ,2045
+5,10,electricity,all-week,early-peak,2040,all-year,R1,0.40000000000,windturbine,1,MUS$2010/PJ,2045
+1,10,electricity,all-week,evening,2020,all-year,R1,0.26670000000,windturbine,2,MUS$2010/PJ,2045
+2,10,electricity,all-week,evening,2025,all-year,R1,0.26670000000,windturbine,2,MUS$2010/PJ,2045
+3,10,electricity,all-week,evening,2030,all-year,R1,0.53330000000,windturbine,2,MUS$2010/PJ,2045
+4,10,electricity,all-week,evening,2035,all-year,R1,0.53330000000,windturbine,2,MUS$2010/PJ,2045
+5,10,electricity,all-week,evening,2040,all-year,R1,0.53330000000,windturbine,2,MUS$2010/PJ,2045
+1,10,electricity,all-week,late-peak,2020,all-year,R1,0.40000000000,windturbine,3,MUS$2010/PJ,2045
+2,10,electricity,all-week,late-peak,2025,all-year,R1,0.40000000000,windturbine,3,MUS$2010/PJ,2045
+3,10,electricity,all-week,late-peak,2030,all-year,R1,0.80000000000,windturbine,3,MUS$2010/PJ,2045
+4,10,electricity,all-week,late-peak,2035,all-year,R1,0.80000000000,windturbine,3,MUS$2010/PJ,2045
+5,10,electricity,all-week,late-peak,2040,all-year,R1,0.80000000000,windturbine,3,MUS$2010/PJ,2045
+1,10,electricity,all-week,morning,2020,all-year,R1,0.20000000000,windturbine,4,MUS$2010/PJ,2045
+2,10,electricity,all-week,morning,2025,all-year,R1,0.20000000000,windturbine,4,MUS$2010/PJ,2045
+3,10,electricity,all-week,morning,2030,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
+4,10,electricity,all-week,morning,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
+5,10,electricity,all-week,morning,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
+1,10,electricity,all-week,night,2020,all-year,R1,0.13330000000,windturbine,5,MUS$2010/PJ,2045
+2,10,electricity,all-week,night,2025,all-year,R1,0.13330000000,windturbine,5,MUS$2010/PJ,2045
+3,10,electricity,all-week,night,2030,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
+4,10,electricity,all-week,night,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
+5,10,electricity,all-week,night,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
+2,10,electricity,all-week,afternoon,2025,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050
+3,10,electricity,all-week,afternoon,2030,all-year,R1,0.26670000000,windturbine,0,MUS$2010/PJ,2050
+4,10,electricity,all-week,afternoon,2035,all-year,R1,0.26670000000,windturbine,0,MUS$2010/PJ,2050
+5,10,electricity,all-week,afternoon,2040,all-year,R1,0.26670000000,windturbine,0,MUS$2010/PJ,2050
+6,10,electricity,all-week,afternoon,2045,all-year,R1,0.26670000000,windturbine,0,MUS$2010/PJ,2050
+2,10,electricity,all-week,early-peak,2025,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050
+3,10,electricity,all-week,early-peak,2030,all-year,R1,0.40000000000,windturbine,1,MUS$2010/PJ,2050
+4,10,electricity,all-week,early-peak,2035,all-year,R1,0.40000000000,windturbine,1,MUS$2010/PJ,2050
+5,10,electricity,all-week,early-peak,2040,all-year,R1,0.40000000000,windturbine,1,MUS$2010/PJ,2050
+6,10,electricity,all-week,early-peak,2045,all-year,R1,0.40000000000,windturbine,1,MUS$2010/PJ,2050
+2,10,electricity,all-week,evening,2025,all-year,R1,0.26670000000,windturbine,2,MUS$2010/PJ,2050
+3,10,electricity,all-week,evening,2030,all-year,R1,0.53330000000,windturbine,2,MUS$2010/PJ,2050
+4,10,electricity,all-week,evening,2035,all-year,R1,0.53330000000,windturbine,2,MUS$2010/PJ,2050
+5,10,electricity,all-week,evening,2040,all-year,R1,0.53330000000,windturbine,2,MUS$2010/PJ,2050
+6,10,electricity,all-week,evening,2045,all-year,R1,0.53330000000,windturbine,2,MUS$2010/PJ,2050
+2,10,electricity,all-week,late-peak,2025,all-year,R1,0.40000000000,windturbine,3,MUS$2010/PJ,2050
+3,10,electricity,all-week,late-peak,2030,all-year,R1,0.80000000000,windturbine,3,MUS$2010/PJ,2050
+4,10,electricity,all-week,late-peak,2035,all-year,R1,0.80000000000,windturbine,3,MUS$2010/PJ,2050
+5,10,electricity,all-week,late-peak,2040,all-year,R1,0.80000000000,windturbine,3,MUS$2010/PJ,2050
+6,10,electricity,all-week,late-peak,2045,all-year,R1,0.80000000000,windturbine,3,MUS$2010/PJ,2050
+2,10,electricity,all-week,morning,2025,all-year,R1,0.20000000000,windturbine,4,MUS$2010/PJ,2050
+3,10,electricity,all-week,morning,2030,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
+4,10,electricity,all-week,morning,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
+5,10,electricity,all-week,morning,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
+6,10,electricity,all-week,morning,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
+2,10,electricity,all-week,night,2025,all-year,R1,0.13330000000,windturbine,5,MUS$2010/PJ,2050
+3,10,electricity,all-week,night,2030,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050
+4,10,electricity,all-week,night,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050
+5,10,electricity,all-week,night,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050
+6,10,electricity,all-week,night,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050
diff --git a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/settings.toml b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/settings.toml
index a8133ff74..c566622c6 100644
--- a/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/settings.toml
+++ b/docs/tutorial-code/min-max-timeslice-constraints/1-min-constraint/settings.toml
@@ -57,7 +57,7 @@ forecast = 5  # Optional, defaults to 5
 [sectors.power]
 type = 'default'
 priority = 2
-dispatch_production = 'costed'
+dispatch_production = 'share'
 technodata = '{path}/technodata/power/Technodata.csv'
 technodata_timeslices = '{path}/technodata/power/TechnodataTimeslices.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
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 aada2b7b5..80341f521 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
@@ -2,37 +2,36 @@ agent,capacity,dst_region,installed,region,sector,technology,type,year
 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,2020,R1,residential,heatpump,newcapa,2025
+A1,24.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2025
 A1,1.00000000000,R1,2020,R1,power,gasCCGT,newcapa,2025
-A1,20.54670000000,R1,2020,R1,gas,gassupply1,newcapa,2025
-A1,19.00000000000,R1,2020,R1,residential,heatpump,newcapa,2030
-A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2030
-A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2030
-A1,13.04670000000,R1,2020,R1,gas,gassupply1,newcapa,2030
-A1,10.00000000000,R1,2025,R1,residential,heatpump,newcapa,2035
+A1,30.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2025
+A1,19.00000000000,R1,2020,R1,residential,gasboiler,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2030
+A1,23.43330000000,R1,2020,R1,gas,gassupply1,newcapa,2030
+A1,15.23330000000,R1,2025,R1,gas,gassupply1,newcapa,2030
+A1,10.00000000000,R1,2025,R1,residential,gasboiler,newcapa,2035
 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2035
-A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2035
 A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2035
-A1,5.54670000000,R1,2020,R1,gas,gassupply1,newcapa,2035
+A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2035
+A1,15.23330000000,R1,2025,R1,gas,gassupply1,newcapa,2035
 A1,26.00000000000,R1,2030,R1,residential,heatpump,newcapa,2040
 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2040
-A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2040
 A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2040
 A1,1.00000000000,R1,2035,R1,power,windturbine,newcapa,2040
-A1,5.54670000000,R1,2020,R1,gas,gassupply1,newcapa,2040
+A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2040
+A1,15.23330000000,R1,2025,R1,gas,gassupply1,newcapa,2040
 A1,16.00000000000,R1,2035,R1,residential,heatpump,newcapa,2045
 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2045
-A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2045
 A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2045
 A1,1.00000000000,R1,2035,R1,power,windturbine,newcapa,2045
 A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2045
-A1,5.54670000000,R1,2020,R1,gas,gassupply1,newcapa,2045
+A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2045
+A1,15.23330000000,R1,2025,R1,gas,gassupply1,newcapa,2045
 A1,32.00000000000,R1,2040,R1,residential,heatpump,newcapa,2050
 A1,22.00000000000,R1,2045,R1,residential,heatpump,newcapa,2050
-A1,1.00000000000,R1,2025,R1,power,windturbine,newcapa,2050
 A1,1.00000000000,R1,2030,R1,power,windturbine,newcapa,2050
 A1,1.00000000000,R1,2035,R1,power,windturbine,newcapa,2050
 A1,2.00000000000,R1,2040,R1,power,windturbine,newcapa,2050
 A1,2.00000000000,R1,2045,R1,power,windturbine,newcapa,2050
-A1,5.54670000000,R1,2020,R1,gas,gassupply1,newcapa,2050
+A1,15.93330000000,R1,2020,R1,gas,gassupply1,newcapa,2050
+A1,15.23330000000,R1,2025,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 1994c078f..905507060 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,77 +23,77 @@ 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,12.20640000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,24.95560000000,R1,0,MUS$2010/PJ,2025
 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,5.81000000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,8.42060000000,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,12.20640000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,24.95560000000,R1,1,MUS$2010/PJ,2025
 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,5.81000000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,8.42060000000,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,12.20640000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,24.95560000000,R1,2,MUS$2010/PJ,2025
 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,5.81000000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,8.42060000000,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,12.20640000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,24.95560000000,R1,3,MUS$2010/PJ,2025
 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,5.81000000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,8.42060000000,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,12.20640000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,24.95560000000,R1,4,MUS$2010/PJ,2025
 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,5.81000000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,8.42060000000,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,12.20640000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,24.95560000000,R1,5,MUS$2010/PJ,2025
 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,5.81000000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,8.42060000000,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,0.66670000000,R1,0,MUS$2010/PJ,2030
+electricity,all-week,night,all-year,24.95560000000,R1,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,10.81020000000,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,1.33330000000,R1,1,MUS$2010/PJ,2030
+electricity,all-week,morning,all-year,24.95560000000,R1,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,0.77380000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,10.81020000000,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,1.33330000000,R1,2,MUS$2010/PJ,2030
+electricity,all-week,afternoon,all-year,24.95560000000,R1,2,MUS$2010/PJ,2030
 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,0.77380000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,10.81020000000,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,0.66670000000,R1,3,MUS$2010/PJ,2030
+electricity,all-week,early-peak,all-year,24.95560000000,R1,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,10.81020000000,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,0.66670000000,R1,4,MUS$2010/PJ,2030
+electricity,all-week,late-peak,all-year,24.95560000000,R1,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,10.81020000000,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,0.66670000000,R1,5,MUS$2010/PJ,2030
+electricity,all-week,evening,all-year,24.95560000000,R1,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,10.81020000000,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,0.66670000000,R1,0,MUS$2010/PJ,2035
 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035
-heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2035
+heat,all-week,night,all-year,4.40950000000,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,1.33330000000,R1,1,MUS$2010/PJ,2035
 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2035
-heat,all-week,morning,all-year,0.77380000000,R1,1,MUS$2010/PJ,2035
+heat,all-week,morning,all-year,4.60210000000,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,1.33330000000,R1,2,MUS$2010/PJ,2035
 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2035
-heat,all-week,afternoon,all-year,0.77380000000,R1,2,MUS$2010/PJ,2035
+heat,all-week,afternoon,all-year,4.60210000000,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,0.66670000000,R1,3,MUS$2010/PJ,2035
 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2035
-heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2035
+heat,all-week,early-peak,all-year,4.40950000000,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,0.66670000000,R1,4,MUS$2010/PJ,2035
 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2035
-heat,all-week,late-peak,all-year,0.50720000000,R1,4,MUS$2010/PJ,2035
+heat,all-week,late-peak,all-year,4.40950000000,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,0.66670000000,R1,5,MUS$2010/PJ,2035
 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2035
-heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2035
+heat,all-week,evening,all-year,4.40950000000,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,0.66670000000,R1,0,MUS$2010/PJ,2040
 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2040
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 173adbe8e..e38f32526 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,115 +1,61 @@
-asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,year
-0,10,electricity,all-week,night,2020,all-year,R1,0.20000000000,gasCCGT,0,2020
-0,6,CO2f,all-week,night,2020,all-year,R1,18.33400000000,gasCCGT,0,2020
-0,10,electricity,all-week,morning,2020,all-year,R1,0.40000000000,gasCCGT,1,2020
-0,6,CO2f,all-week,morning,2020,all-year,R1,36.66800000000,gasCCGT,1,2020
-0,10,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,2020
-0,6,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,2020
-0,10,electricity,all-week,early-peak,2020,all-year,R1,0.40000000000,gasCCGT,3,2020
-0,6,CO2f,all-week,early-peak,2020,all-year,R1,36.66800000000,gasCCGT,3,2020
-0,10,electricity,all-week,late-peak,2020,all-year,R1,0.80000000000,gasCCGT,4,2020
-0,6,CO2f,all-week,late-peak,2020,all-year,R1,73.33600000000,gasCCGT,4,2020
-0,10,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,2020
-0,6,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,2020
-0,10,electricity,all-week,night,2020,all-year,R1,0.42220000000,gasCCGT,0,2025
-0,6,CO2f,all-week,night,2020,all-year,R1,38.70510000000,gasCCGT,0,2025
-0,10,electricity,all-week,morning,2020,all-year,R1,0.63330000000,gasCCGT,1,2025
-0,6,CO2f,all-week,morning,2020,all-year,R1,58.05770000000,gasCCGT,1,2025
-0,10,electricity,all-week,afternoon,2020,all-year,R1,0.60000000000,gasCCGT,2,2025
-0,6,CO2f,all-week,afternoon,2020,all-year,R1,55.00200000000,gasCCGT,2,2025
-0,10,electricity,all-week,early-peak,2020,all-year,R1,0.63330000000,gasCCGT,3,2025
-0,6,CO2f,all-week,early-peak,2020,all-year,R1,58.05770000000,gasCCGT,3,2025
-0,10,electricity,all-week,late-peak,2020,all-year,R1,1.26670000000,gasCCGT,4,2025
-0,6,CO2f,all-week,late-peak,2020,all-year,R1,116.11530000000,gasCCGT,4,2025
-0,10,electricity,all-week,evening,2020,all-year,R1,1.00000000000,gasCCGT,5,2025
-0,6,CO2f,all-week,evening,2020,all-year,R1,91.67000000000,gasCCGT,5,2025
-4,10,electricity,all-week,night,2025,all-year,R1,0.66670000000,windturbine,0,2030
-4,10,electricity,all-week,morning,2025,all-year,R1,0.50000000000,windturbine,1,2030
-4,10,electricity,all-week,afternoon,2025,all-year,R1,0.50000000000,windturbine,2,2030
-4,10,electricity,all-week,early-peak,2025,all-year,R1,1.00000000000,windturbine,3,2030
-4,10,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,2030
-4,10,electricity,all-week,evening,2025,all-year,R1,1.00000000000,windturbine,5,2030
-5,10,electricity,all-week,night,2025,all-year,R1,0.40000000000,windturbine,0,2035
-6,10,electricity,all-week,night,2030,all-year,R1,0.40000000000,windturbine,0,2035
-5,10,electricity,all-week,morning,2025,all-year,R1,0.50000000000,windturbine,1,2035
-6,10,electricity,all-week,morning,2030,all-year,R1,0.50000000000,windturbine,1,2035
-5,10,electricity,all-week,afternoon,2025,all-year,R1,0.40000000000,windturbine,2,2035
-6,10,electricity,all-week,afternoon,2030,all-year,R1,0.40000000000,windturbine,2,2035
-5,10,electricity,all-week,early-peak,2025,all-year,R1,0.60000000000,windturbine,3,2035
-6,10,electricity,all-week,early-peak,2030,all-year,R1,0.60000000000,windturbine,3,2035
-5,10,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,4,2035
-6,10,electricity,all-week,late-peak,2030,all-year,R1,1.00000000000,windturbine,4,2035
-5,10,electricity,all-week,evening,2025,all-year,R1,0.80000000000,windturbine,5,2035
-6,10,electricity,all-week,evening,2030,all-year,R1,0.80000000000,windturbine,5,2035
-6,10,electricity,all-week,night,2025,all-year,R1,0.31110000000,windturbine,0,2040
-7,10,electricity,all-week,night,2030,all-year,R1,0.31110000000,windturbine,0,2040
-8,10,electricity,all-week,night,2035,all-year,R1,0.31110000000,windturbine,0,2040
-6,10,electricity,all-week,morning,2025,all-year,R1,0.46670000000,windturbine,1,2040
-7,10,electricity,all-week,morning,2030,all-year,R1,0.46670000000,windturbine,1,2040
-8,10,electricity,all-week,morning,2035,all-year,R1,0.46670000000,windturbine,1,2040
-6,10,electricity,all-week,afternoon,2025,all-year,R1,0.31110000000,windturbine,2,2040
-7,10,electricity,all-week,afternoon,2030,all-year,R1,0.31110000000,windturbine,2,2040
-8,10,electricity,all-week,afternoon,2035,all-year,R1,0.31110000000,windturbine,2,2040
-6,10,electricity,all-week,early-peak,2025,all-year,R1,0.46670000000,windturbine,3,2040
-7,10,electricity,all-week,early-peak,2030,all-year,R1,0.46670000000,windturbine,3,2040
-8,10,electricity,all-week,early-peak,2035,all-year,R1,0.46670000000,windturbine,3,2040
-6,10,electricity,all-week,late-peak,2025,all-year,R1,0.93330000000,windturbine,4,2040
-7,10,electricity,all-week,late-peak,2030,all-year,R1,0.93330000000,windturbine,4,2040
-8,10,electricity,all-week,late-peak,2035,all-year,R1,0.93330000000,windturbine,4,2040
-6,10,electricity,all-week,evening,2025,all-year,R1,0.62220000000,windturbine,5,2040
-7,10,electricity,all-week,evening,2030,all-year,R1,0.62220000000,windturbine,5,2040
-8,10,electricity,all-week,evening,2035,all-year,R1,0.62220000000,windturbine,5,2040
-7,10,electricity,all-week,night,2025,all-year,R1,0.21330000000,windturbine,0,2045
-8,10,electricity,all-week,night,2030,all-year,R1,0.21330000000,windturbine,0,2045
-9,10,electricity,all-week,night,2035,all-year,R1,0.21330000000,windturbine,0,2045
-10,10,electricity,all-week,night,2040,all-year,R1,0.42670000000,windturbine,0,2045
-7,10,electricity,all-week,morning,2025,all-year,R1,0.32000000000,windturbine,1,2045
-8,10,electricity,all-week,morning,2030,all-year,R1,0.32000000000,windturbine,1,2045
-9,10,electricity,all-week,morning,2035,all-year,R1,0.32000000000,windturbine,1,2045
-10,10,electricity,all-week,morning,2040,all-year,R1,0.64000000000,windturbine,1,2045
-7,10,electricity,all-week,afternoon,2025,all-year,R1,0.21330000000,windturbine,2,2045
-8,10,electricity,all-week,afternoon,2030,all-year,R1,0.21330000000,windturbine,2,2045
-9,10,electricity,all-week,afternoon,2035,all-year,R1,0.21330000000,windturbine,2,2045
-10,10,electricity,all-week,afternoon,2040,all-year,R1,0.42670000000,windturbine,2,2045
-7,10,electricity,all-week,early-peak,2025,all-year,R1,0.32000000000,windturbine,3,2045
-8,10,electricity,all-week,early-peak,2030,all-year,R1,0.32000000000,windturbine,3,2045
-9,10,electricity,all-week,early-peak,2035,all-year,R1,0.32000000000,windturbine,3,2045
-10,10,electricity,all-week,early-peak,2040,all-year,R1,0.64000000000,windturbine,3,2045
-7,10,electricity,all-week,late-peak,2025,all-year,R1,0.64000000000,windturbine,4,2045
-8,10,electricity,all-week,late-peak,2030,all-year,R1,0.64000000000,windturbine,4,2045
-9,10,electricity,all-week,late-peak,2035,all-year,R1,0.64000000000,windturbine,4,2045
-10,10,electricity,all-week,late-peak,2040,all-year,R1,1.28000000000,windturbine,4,2045
-7,10,electricity,all-week,evening,2025,all-year,R1,0.42670000000,windturbine,5,2045
-8,10,electricity,all-week,evening,2030,all-year,R1,0.42670000000,windturbine,5,2045
-9,10,electricity,all-week,evening,2035,all-year,R1,0.42670000000,windturbine,5,2045
-10,10,electricity,all-week,evening,2040,all-year,R1,0.85330000000,windturbine,5,2045
-8,10,electricity,all-week,night,2025,all-year,R1,0.17140000000,windturbine,0,2050
-9,10,electricity,all-week,night,2030,all-year,R1,0.17140000000,windturbine,0,2050
-10,10,electricity,all-week,night,2035,all-year,R1,0.17140000000,windturbine,0,2050
-11,10,electricity,all-week,night,2040,all-year,R1,0.34290000000,windturbine,0,2050
-12,10,electricity,all-week,night,2045,all-year,R1,0.34290000000,windturbine,0,2050
-8,10,electricity,all-week,morning,2025,all-year,R1,0.25710000000,windturbine,1,2050
-9,10,electricity,all-week,morning,2030,all-year,R1,0.25710000000,windturbine,1,2050
-10,10,electricity,all-week,morning,2035,all-year,R1,0.25710000000,windturbine,1,2050
-11,10,electricity,all-week,morning,2040,all-year,R1,0.51430000000,windturbine,1,2050
-12,10,electricity,all-week,morning,2045,all-year,R1,0.51430000000,windturbine,1,2050
-8,10,electricity,all-week,afternoon,2025,all-year,R1,0.17140000000,windturbine,2,2050
-9,10,electricity,all-week,afternoon,2030,all-year,R1,0.17140000000,windturbine,2,2050
-10,10,electricity,all-week,afternoon,2035,all-year,R1,0.17140000000,windturbine,2,2050
-11,10,electricity,all-week,afternoon,2040,all-year,R1,0.34290000000,windturbine,2,2050
-12,10,electricity,all-week,afternoon,2045,all-year,R1,0.34290000000,windturbine,2,2050
-8,10,electricity,all-week,early-peak,2025,all-year,R1,0.25710000000,windturbine,3,2050
-9,10,electricity,all-week,early-peak,2030,all-year,R1,0.25710000000,windturbine,3,2050
-10,10,electricity,all-week,early-peak,2035,all-year,R1,0.25710000000,windturbine,3,2050
-11,10,electricity,all-week,early-peak,2040,all-year,R1,0.51430000000,windturbine,3,2050
-12,10,electricity,all-week,early-peak,2045,all-year,R1,0.51430000000,windturbine,3,2050
-8,10,electricity,all-week,late-peak,2025,all-year,R1,0.51430000000,windturbine,4,2050
-9,10,electricity,all-week,late-peak,2030,all-year,R1,0.51430000000,windturbine,4,2050
-10,10,electricity,all-week,late-peak,2035,all-year,R1,0.51430000000,windturbine,4,2050
-11,10,electricity,all-week,late-peak,2040,all-year,R1,1.02860000000,windturbine,4,2050
-12,10,electricity,all-week,late-peak,2045,all-year,R1,1.02860000000,windturbine,4,2050
-8,10,electricity,all-week,evening,2025,all-year,R1,0.34290000000,windturbine,5,2050
-9,10,electricity,all-week,evening,2030,all-year,R1,0.34290000000,windturbine,5,2050
-10,10,electricity,all-week,evening,2035,all-year,R1,0.34290000000,windturbine,5,2050
-11,10,electricity,all-week,evening,2040,all-year,R1,0.68570000000,windturbine,5,2050
-12,10,electricity,all-week,evening,2045,all-year,R1,0.68570000000,windturbine,5,2050
+asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year
+3,10,electricity,all-week,afternoon,2030,all-year,R1,0.50000000000,windturbine,0,MUS$2010/PJ,2035
+3,10,electricity,all-week,early-peak,2030,all-year,R1,0.86670000000,windturbine,1,MUS$2010/PJ,2035
+3,10,electricity,all-week,evening,2030,all-year,R1,1.00000000000,windturbine,2,MUS$2010/PJ,2035
+3,10,electricity,all-week,late-peak,2030,all-year,R1,1.00000000000,windturbine,3,MUS$2010/PJ,2035
+3,10,electricity,all-week,morning,2030,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2035
+3,10,electricity,all-week,night,2030,all-year,R1,0.57780000000,windturbine,5,MUS$2010/PJ,2035
+4,10,electricity,all-week,afternoon,2030,all-year,R1,0.46670000000,windturbine,0,MUS$2010/PJ,2040
+5,10,electricity,all-week,afternoon,2035,all-year,R1,0.46670000000,windturbine,0,MUS$2010/PJ,2040
+4,10,electricity,all-week,early-peak,2030,all-year,R1,0.70000000000,windturbine,1,MUS$2010/PJ,2040
+5,10,electricity,all-week,early-peak,2035,all-year,R1,0.70000000000,windturbine,1,MUS$2010/PJ,2040
+4,10,electricity,all-week,evening,2030,all-year,R1,0.93330000000,windturbine,2,MUS$2010/PJ,2040
+5,10,electricity,all-week,evening,2035,all-year,R1,0.93330000000,windturbine,2,MUS$2010/PJ,2040
+4,10,electricity,all-week,late-peak,2030,all-year,R1,1.00000000000,windturbine,3,MUS$2010/PJ,2040
+5,10,electricity,all-week,late-peak,2035,all-year,R1,1.00000000000,windturbine,3,MUS$2010/PJ,2040
+4,10,electricity,all-week,morning,2030,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2040
+5,10,electricity,all-week,morning,2035,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2040
+4,10,electricity,all-week,night,2030,all-year,R1,0.46670000000,windturbine,5,MUS$2010/PJ,2040
+5,10,electricity,all-week,night,2035,all-year,R1,0.46670000000,windturbine,5,MUS$2010/PJ,2040
+5,10,electricity,all-week,afternoon,2030,all-year,R1,0.26670000000,windturbine,0,MUS$2010/PJ,2045
+6,10,electricity,all-week,afternoon,2035,all-year,R1,0.26670000000,windturbine,0,MUS$2010/PJ,2045
+7,10,electricity,all-week,afternoon,2040,all-year,R1,0.53330000000,windturbine,0,MUS$2010/PJ,2045
+5,10,electricity,all-week,early-peak,2030,all-year,R1,0.40000000000,windturbine,1,MUS$2010/PJ,2045
+6,10,electricity,all-week,early-peak,2035,all-year,R1,0.40000000000,windturbine,1,MUS$2010/PJ,2045
+7,10,electricity,all-week,early-peak,2040,all-year,R1,0.80000000000,windturbine,1,MUS$2010/PJ,2045
+5,10,electricity,all-week,evening,2030,all-year,R1,0.53330000000,windturbine,2,MUS$2010/PJ,2045
+6,10,electricity,all-week,evening,2035,all-year,R1,0.53330000000,windturbine,2,MUS$2010/PJ,2045
+7,10,electricity,all-week,evening,2040,all-year,R1,1.06670000000,windturbine,2,MUS$2010/PJ,2045
+5,10,electricity,all-week,late-peak,2030,all-year,R1,0.80000000000,windturbine,3,MUS$2010/PJ,2045
+6,10,electricity,all-week,late-peak,2035,all-year,R1,0.80000000000,windturbine,3,MUS$2010/PJ,2045
+7,10,electricity,all-week,late-peak,2040,all-year,R1,1.60000000000,windturbine,3,MUS$2010/PJ,2045
+5,10,electricity,all-week,morning,2030,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
+6,10,electricity,all-week,morning,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
+7,10,electricity,all-week,morning,2040,all-year,R1,0.80000000000,windturbine,4,MUS$2010/PJ,2045
+5,10,electricity,all-week,night,2030,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
+6,10,electricity,all-week,night,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
+7,10,electricity,all-week,night,2040,all-year,R1,0.53330000000,windturbine,5,MUS$2010/PJ,2045
+6,10,electricity,all-week,afternoon,2030,all-year,R1,0.20000000000,windturbine,0,MUS$2010/PJ,2050
+7,10,electricity,all-week,afternoon,2035,all-year,R1,0.20000000000,windturbine,0,MUS$2010/PJ,2050
+8,10,electricity,all-week,afternoon,2040,all-year,R1,0.40000000000,windturbine,0,MUS$2010/PJ,2050
+9,10,electricity,all-week,afternoon,2045,all-year,R1,0.40000000000,windturbine,0,MUS$2010/PJ,2050
+6,10,electricity,all-week,early-peak,2030,all-year,R1,0.30000000000,windturbine,1,MUS$2010/PJ,2050
+7,10,electricity,all-week,early-peak,2035,all-year,R1,0.30000000000,windturbine,1,MUS$2010/PJ,2050
+8,10,electricity,all-week,early-peak,2040,all-year,R1,0.60000000000,windturbine,1,MUS$2010/PJ,2050
+9,10,electricity,all-week,early-peak,2045,all-year,R1,0.60000000000,windturbine,1,MUS$2010/PJ,2050
+6,10,electricity,all-week,evening,2030,all-year,R1,0.40000000000,windturbine,2,MUS$2010/PJ,2050
+7,10,electricity,all-week,evening,2035,all-year,R1,0.40000000000,windturbine,2,MUS$2010/PJ,2050
+8,10,electricity,all-week,evening,2040,all-year,R1,0.80000000000,windturbine,2,MUS$2010/PJ,2050
+9,10,electricity,all-week,evening,2045,all-year,R1,0.80000000000,windturbine,2,MUS$2010/PJ,2050
+6,10,electricity,all-week,late-peak,2030,all-year,R1,0.60000000000,windturbine,3,MUS$2010/PJ,2050
+7,10,electricity,all-week,late-peak,2035,all-year,R1,0.60000000000,windturbine,3,MUS$2010/PJ,2050
+8,10,electricity,all-week,late-peak,2040,all-year,R1,1.20000000000,windturbine,3,MUS$2010/PJ,2050
+9,10,electricity,all-week,late-peak,2045,all-year,R1,1.20000000000,windturbine,3,MUS$2010/PJ,2050
+6,10,electricity,all-week,morning,2030,all-year,R1,0.30000000000,windturbine,4,MUS$2010/PJ,2050
+7,10,electricity,all-week,morning,2035,all-year,R1,0.30000000000,windturbine,4,MUS$2010/PJ,2050
+8,10,electricity,all-week,morning,2040,all-year,R1,0.60000000000,windturbine,4,MUS$2010/PJ,2050
+9,10,electricity,all-week,morning,2045,all-year,R1,0.60000000000,windturbine,4,MUS$2010/PJ,2050
+6,10,electricity,all-week,night,2030,all-year,R1,0.20000000000,windturbine,5,MUS$2010/PJ,2050
+7,10,electricity,all-week,night,2035,all-year,R1,0.20000000000,windturbine,5,MUS$2010/PJ,2050
+8,10,electricity,all-week,night,2040,all-year,R1,0.40000000000,windturbine,5,MUS$2010/PJ,2050
+9,10,electricity,all-week,night,2045,all-year,R1,0.40000000000,windturbine,5,MUS$2010/PJ,2050
diff --git a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/settings.toml b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/settings.toml
index a8133ff74..c566622c6 100644
--- a/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/settings.toml
+++ b/docs/tutorial-code/min-max-timeslice-constraints/2-max-constraint/settings.toml
@@ -57,7 +57,7 @@ forecast = 5  # Optional, defaults to 5
 [sectors.power]
 type = 'default'
 priority = 2
-dispatch_production = 'costed'
+dispatch_production = 'share'
 technodata = '{path}/technodata/power/Technodata.csv'
 technodata_timeslices = '{path}/technodata/power/TechnodataTimeslices.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
diff --git a/docs/user-guide/min-max-timeslice-constraints.ipynb b/docs/user-guide/min-max-timeslice-constraints.ipynb
index 04115af51..65a3a588e 100644
--- a/docs/user-guide/min-max-timeslice-constraints.ipynb
+++ b/docs/user-guide/min-max-timeslice-constraints.ipynb
@@ -64,7 +64,7 @@
     "[sectors.power]\n",
     "type = 'default'\n",
     "priority = 2\n",
-    "dispatch_production = 'costed'\n",
+    "dispatch_production = 'share'\n",
     "technodata = '{path}/technodata/power/Technodata.csv'\n",
     "commodities_in = '{path}/technodata/power/CommIn.csv'\n",
     "commodities_out = '{path}/technodata/power/CommOut.csv'\n",
@@ -193,11 +193,11 @@
     "power_supply = pd.read_csv(\n",
     "    \"../tutorial-code/min-max-timeslice-constraints/2-max-constraint/Results/Power_Supply.csv\"\n",
     ")\n",
-    "windturbine_electricity_supply_2030 = (\n",
+    "windturbine_electricity_supply_2035 = (\n",
     "    power_supply[\n",
     "        (power_supply.technology == \"windturbine\")\n",
     "        & (power_supply.commodity == \"electricity\")\n",
-    "        & (power_supply.year == 2030)\n",
+    "        & (power_supply.year == 2035)\n",
     "    ]\n",
     "    .groupby([\"timeslice\", \"technology\"])\n",
     "    .sum()\n",
@@ -205,12 +205,12 @@
     ")\n",
     "\n",
     "ax = sns.barplot(\n",
-    "    data=windturbine_electricity_supply_2030,\n",
+    "    data=windturbine_electricity_supply_2035,\n",
     "    x=\"timeslice\",\n",
     "    y=\"supply\",\n",
     "    hue=\"technology\",\n",
     ")\n",
-    "ax.set_title(\"Electricity supply from windturbine in 2030\")"
+    "ax.set_title(\"Electricity supply from windturbine in 2035\")"
    ]
   },
   {
diff --git a/src/muse/data/example/default_timeslice/settings.toml b/src/muse/data/example/default_timeslice/settings.toml
index a8133ff74..c566622c6 100644
--- a/src/muse/data/example/default_timeslice/settings.toml
+++ b/src/muse/data/example/default_timeslice/settings.toml
@@ -57,7 +57,7 @@ forecast = 5  # Optional, defaults to 5
 [sectors.power]
 type = 'default'
 priority = 2
-dispatch_production = 'costed'
+dispatch_production = 'share'
 technodata = '{path}/technodata/power/Technodata.csv'
 technodata_timeslices = '{path}/technodata/power/TechnodataTimeslices.csv'
 commodities_in = '{path}/technodata/power/CommIn.csv'
diff --git a/tests/example_outputs/default_timeslice/MCAPrices.csv b/tests/example_outputs/default_timeslice/MCAPrices.csv
index 557f60617..c15a7d52b 100644
--- a/tests/example_outputs/default_timeslice/MCAPrices.csv
+++ b/tests/example_outputs/default_timeslice/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,0.66670000000,R1,0,MUS$2010/PJ,2025
+electricity,all-week,night,all-year,6.43650000000,R1,0,MUS$2010/PJ,2025
 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2025
-heat,all-week,night,all-year,2.15580000000,R1,0,MUS$2010/PJ,2025
+heat,all-week,night,all-year,6.00150000000,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,0.66670000000,R1,1,MUS$2010/PJ,2025
+electricity,all-week,morning,all-year,6.43650000000,R1,1,MUS$2010/PJ,2025
 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2025
-heat,all-week,morning,all-year,2.15580000000,R1,1,MUS$2010/PJ,2025
+heat,all-week,morning,all-year,6.00150000000,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,0.66670000000,R1,2,MUS$2010/PJ,2025
+electricity,all-week,afternoon,all-year,6.43650000000,R1,2,MUS$2010/PJ,2025
 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2025
-heat,all-week,afternoon,all-year,2.15580000000,R1,2,MUS$2010/PJ,2025
+heat,all-week,afternoon,all-year,6.00150000000,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,0.66670000000,R1,3,MUS$2010/PJ,2025
+electricity,all-week,early-peak,all-year,6.43650000000,R1,3,MUS$2010/PJ,2025
 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2025
-heat,all-week,early-peak,all-year,2.15580000000,R1,3,MUS$2010/PJ,2025
+heat,all-week,early-peak,all-year,6.00150000000,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,3.09610000000,R1,4,MUS$2010/PJ,2025
+electricity,all-week,late-peak,all-year,6.43650000000,R1,4,MUS$2010/PJ,2025
 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2025
-heat,all-week,late-peak,all-year,3.77510000000,R1,4,MUS$2010/PJ,2025
+heat,all-week,late-peak,all-year,6.00150000000,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,0.66670000000,R1,5,MUS$2010/PJ,2025
+electricity,all-week,evening,all-year,6.43650000000,R1,5,MUS$2010/PJ,2025
 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2025
-heat,all-week,evening,all-year,2.15580000000,R1,5,MUS$2010/PJ,2025
+heat,all-week,evening,all-year,6.00150000000,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,0.66670000000,R1,0,MUS$2010/PJ,2030
 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2030
-heat,all-week,night,all-year,0.50720000000,R1,0,MUS$2010/PJ,2030
+heat,all-week,night,all-year,2.81510000000,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,0.66670000000,R1,1,MUS$2010/PJ,2030
 gas,all-week,morning,all-year,0.47220000000,R1,1,MUS$2010/PJ,2030
-heat,all-week,morning,all-year,0.50720000000,R1,1,MUS$2010/PJ,2030
+heat,all-week,morning,all-year,2.81510000000,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,0.66670000000,R1,2,MUS$2010/PJ,2030
 gas,all-week,afternoon,all-year,0.47220000000,R1,2,MUS$2010/PJ,2030
-heat,all-week,afternoon,all-year,0.50720000000,R1,2,MUS$2010/PJ,2030
+heat,all-week,afternoon,all-year,2.81510000000,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,0.66670000000,R1,3,MUS$2010/PJ,2030
 gas,all-week,early-peak,all-year,0.47220000000,R1,3,MUS$2010/PJ,2030
-heat,all-week,early-peak,all-year,0.50720000000,R1,3,MUS$2010/PJ,2030
+heat,all-week,early-peak,all-year,2.81510000000,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,0.66670000000,R1,4,MUS$2010/PJ,2030
 gas,all-week,late-peak,all-year,0.47220000000,R1,4,MUS$2010/PJ,2030
-heat,all-week,late-peak,all-year,1.47890000000,R1,4,MUS$2010/PJ,2030
+heat,all-week,late-peak,all-year,2.81510000000,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,0.66670000000,R1,5,MUS$2010/PJ,2030
 gas,all-week,evening,all-year,0.47220000000,R1,5,MUS$2010/PJ,2030
-heat,all-week,evening,all-year,0.50720000000,R1,5,MUS$2010/PJ,2030
+heat,all-week,evening,all-year,2.81510000000,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,0.66670000000,R1,0,MUS$2010/PJ,2035
 gas,all-week,night,all-year,0.47220000000,R1,0,MUS$2010/PJ,2035
diff --git a/tests/example_outputs/default_timeslice/Power_Supply.csv b/tests/example_outputs/default_timeslice/Power_Supply.csv
new file mode 100644
index 000000000..ae10e4c77
--- /dev/null
+++ b/tests/example_outputs/default_timeslice/Power_Supply.csv
@@ -0,0 +1,133 @@
+asset,comm_usage,commodity,day,hour,installed,month,region,supply,technology,timeslice,units_prices,year
+0,10,electricity,all-week,afternoon,2020,all-year,R1,0.21110000000,gasCCGT,0,MUS$2010/PJ,2025
+1,10,electricity,all-week,afternoon,2020,all-year,R1,0.21110000000,windturbine,0,MUS$2010/PJ,2025
+0,6,CO2f,all-week,afternoon,2020,all-year,R1,19.35260000000,gasCCGT,0,MUS$2010/kt,2025
+0,10,electricity,all-week,early-peak,2020,all-year,R1,0.31670000000,gasCCGT,1,MUS$2010/PJ,2025
+1,10,electricity,all-week,early-peak,2020,all-year,R1,0.31670000000,windturbine,1,MUS$2010/PJ,2025
+0,6,CO2f,all-week,early-peak,2020,all-year,R1,29.02880000000,gasCCGT,1,MUS$2010/kt,2025
+0,10,electricity,all-week,evening,2020,all-year,R1,0.42220000000,gasCCGT,2,MUS$2010/PJ,2025
+1,10,electricity,all-week,evening,2020,all-year,R1,0.42220000000,windturbine,2,MUS$2010/PJ,2025
+0,6,CO2f,all-week,evening,2020,all-year,R1,38.70510000000,gasCCGT,2,MUS$2010/kt,2025
+0,10,electricity,all-week,late-peak,2020,all-year,R1,0.63330000000,gasCCGT,3,MUS$2010/PJ,2025
+1,10,electricity,all-week,late-peak,2020,all-year,R1,0.63330000000,windturbine,3,MUS$2010/PJ,2025
+0,6,CO2f,all-week,late-peak,2020,all-year,R1,58.05770000000,gasCCGT,3,MUS$2010/kt,2025
+0,10,electricity,all-week,morning,2020,all-year,R1,0.31670000000,gasCCGT,4,MUS$2010/PJ,2025
+1,10,electricity,all-week,morning,2020,all-year,R1,0.31670000000,windturbine,4,MUS$2010/PJ,2025
+0,6,CO2f,all-week,morning,2020,all-year,R1,29.02880000000,gasCCGT,4,MUS$2010/kt,2025
+0,10,electricity,all-week,night,2020,all-year,R1,0.21110000000,gasCCGT,5,MUS$2010/PJ,2025
+1,10,electricity,all-week,night,2020,all-year,R1,0.21110000000,windturbine,5,MUS$2010/PJ,2025
+0,6,CO2f,all-week,night,2020,all-year,R1,19.35260000000,gasCCGT,5,MUS$2010/kt,2025
+1,10,electricity,all-week,afternoon,2020,all-year,R1,0.33330000000,windturbine,0,MUS$2010/PJ,2030
+2,10,electricity,all-week,afternoon,2025,all-year,R1,0.33330000000,windturbine,0,MUS$2010/PJ,2030
+1,10,electricity,all-week,early-peak,2020,all-year,R1,0.50000000000,windturbine,1,MUS$2010/PJ,2030
+2,10,electricity,all-week,early-peak,2025,all-year,R1,0.50000000000,windturbine,1,MUS$2010/PJ,2030
+1,10,electricity,all-week,evening,2020,all-year,R1,0.66670000000,windturbine,2,MUS$2010/PJ,2030
+2,10,electricity,all-week,evening,2025,all-year,R1,0.66670000000,windturbine,2,MUS$2010/PJ,2030
+1,10,electricity,all-week,late-peak,2020,all-year,R1,1.00000000000,windturbine,3,MUS$2010/PJ,2030
+2,10,electricity,all-week,late-peak,2025,all-year,R1,1.00000000000,windturbine,3,MUS$2010/PJ,2030
+1,10,electricity,all-week,morning,2020,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2030
+2,10,electricity,all-week,morning,2025,all-year,R1,0.50000000000,windturbine,4,MUS$2010/PJ,2030
+1,10,electricity,all-week,night,2020,all-year,R1,0.33330000000,windturbine,5,MUS$2010/PJ,2030
+2,10,electricity,all-week,night,2025,all-year,R1,0.33330000000,windturbine,5,MUS$2010/PJ,2030
+1,10,electricity,all-week,afternoon,2020,all-year,R1,0.20000000000,windturbine,0,MUS$2010/PJ,2035
+2,10,electricity,all-week,afternoon,2025,all-year,R1,0.20000000000,windturbine,0,MUS$2010/PJ,2035
+3,10,electricity,all-week,afternoon,2030,all-year,R1,0.40000000000,windturbine,0,MUS$2010/PJ,2035
+1,10,electricity,all-week,early-peak,2020,all-year,R1,0.30000000000,windturbine,1,MUS$2010/PJ,2035
+2,10,electricity,all-week,early-peak,2025,all-year,R1,0.30000000000,windturbine,1,MUS$2010/PJ,2035
+3,10,electricity,all-week,early-peak,2030,all-year,R1,0.60000000000,windturbine,1,MUS$2010/PJ,2035
+1,10,electricity,all-week,evening,2020,all-year,R1,0.40000000000,windturbine,2,MUS$2010/PJ,2035
+2,10,electricity,all-week,evening,2025,all-year,R1,0.40000000000,windturbine,2,MUS$2010/PJ,2035
+3,10,electricity,all-week,evening,2030,all-year,R1,0.80000000000,windturbine,2,MUS$2010/PJ,2035
+1,10,electricity,all-week,late-peak,2020,all-year,R1,0.60000000000,windturbine,3,MUS$2010/PJ,2035
+2,10,electricity,all-week,late-peak,2025,all-year,R1,0.60000000000,windturbine,3,MUS$2010/PJ,2035
+3,10,electricity,all-week,late-peak,2030,all-year,R1,1.20000000000,windturbine,3,MUS$2010/PJ,2035
+1,10,electricity,all-week,morning,2020,all-year,R1,0.30000000000,windturbine,4,MUS$2010/PJ,2035
+2,10,electricity,all-week,morning,2025,all-year,R1,0.30000000000,windturbine,4,MUS$2010/PJ,2035
+3,10,electricity,all-week,morning,2030,all-year,R1,0.60000000000,windturbine,4,MUS$2010/PJ,2035
+1,10,electricity,all-week,night,2020,all-year,R1,0.20000000000,windturbine,5,MUS$2010/PJ,2035
+2,10,electricity,all-week,night,2025,all-year,R1,0.20000000000,windturbine,5,MUS$2010/PJ,2035
+3,10,electricity,all-week,night,2030,all-year,R1,0.40000000000,windturbine,5,MUS$2010/PJ,2035
+1,10,electricity,all-week,afternoon,2020,all-year,R1,0.15560000000,windturbine,0,MUS$2010/PJ,2040
+2,10,electricity,all-week,afternoon,2025,all-year,R1,0.15560000000,windturbine,0,MUS$2010/PJ,2040
+3,10,electricity,all-week,afternoon,2030,all-year,R1,0.31110000000,windturbine,0,MUS$2010/PJ,2040
+4,10,electricity,all-week,afternoon,2035,all-year,R1,0.31110000000,windturbine,0,MUS$2010/PJ,2040
+1,10,electricity,all-week,early-peak,2020,all-year,R1,0.23330000000,windturbine,1,MUS$2010/PJ,2040
+2,10,electricity,all-week,early-peak,2025,all-year,R1,0.23330000000,windturbine,1,MUS$2010/PJ,2040
+3,10,electricity,all-week,early-peak,2030,all-year,R1,0.46670000000,windturbine,1,MUS$2010/PJ,2040
+4,10,electricity,all-week,early-peak,2035,all-year,R1,0.46670000000,windturbine,1,MUS$2010/PJ,2040
+1,10,electricity,all-week,evening,2020,all-year,R1,0.31110000000,windturbine,2,MUS$2010/PJ,2040
+2,10,electricity,all-week,evening,2025,all-year,R1,0.31110000000,windturbine,2,MUS$2010/PJ,2040
+3,10,electricity,all-week,evening,2030,all-year,R1,0.62220000000,windturbine,2,MUS$2010/PJ,2040
+4,10,electricity,all-week,evening,2035,all-year,R1,0.62220000000,windturbine,2,MUS$2010/PJ,2040
+1,10,electricity,all-week,late-peak,2020,all-year,R1,0.46670000000,windturbine,3,MUS$2010/PJ,2040
+2,10,electricity,all-week,late-peak,2025,all-year,R1,0.46670000000,windturbine,3,MUS$2010/PJ,2040
+3,10,electricity,all-week,late-peak,2030,all-year,R1,0.93330000000,windturbine,3,MUS$2010/PJ,2040
+4,10,electricity,all-week,late-peak,2035,all-year,R1,0.93330000000,windturbine,3,MUS$2010/PJ,2040
+1,10,electricity,all-week,morning,2020,all-year,R1,0.23330000000,windturbine,4,MUS$2010/PJ,2040
+2,10,electricity,all-week,morning,2025,all-year,R1,0.23330000000,windturbine,4,MUS$2010/PJ,2040
+3,10,electricity,all-week,morning,2030,all-year,R1,0.46670000000,windturbine,4,MUS$2010/PJ,2040
+4,10,electricity,all-week,morning,2035,all-year,R1,0.46670000000,windturbine,4,MUS$2010/PJ,2040
+1,10,electricity,all-week,night,2020,all-year,R1,0.15560000000,windturbine,5,MUS$2010/PJ,2040
+2,10,electricity,all-week,night,2025,all-year,R1,0.15560000000,windturbine,5,MUS$2010/PJ,2040
+3,10,electricity,all-week,night,2030,all-year,R1,0.31110000000,windturbine,5,MUS$2010/PJ,2040
+4,10,electricity,all-week,night,2035,all-year,R1,0.31110000000,windturbine,5,MUS$2010/PJ,2040
+1,10,electricity,all-week,afternoon,2020,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045
+2,10,electricity,all-week,afternoon,2025,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2045
+3,10,electricity,all-week,afternoon,2030,all-year,R1,0.26670000000,windturbine,0,MUS$2010/PJ,2045
+4,10,electricity,all-week,afternoon,2035,all-year,R1,0.26670000000,windturbine,0,MUS$2010/PJ,2045
+5,10,electricity,all-week,afternoon,2040,all-year,R1,0.26670000000,windturbine,0,MUS$2010/PJ,2045
+1,10,electricity,all-week,early-peak,2020,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045
+2,10,electricity,all-week,early-peak,2025,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2045
+3,10,electricity,all-week,early-peak,2030,all-year,R1,0.40000000000,windturbine,1,MUS$2010/PJ,2045
+4,10,electricity,all-week,early-peak,2035,all-year,R1,0.40000000000,windturbine,1,MUS$2010/PJ,2045
+5,10,electricity,all-week,early-peak,2040,all-year,R1,0.40000000000,windturbine,1,MUS$2010/PJ,2045
+1,10,electricity,all-week,evening,2020,all-year,R1,0.26670000000,windturbine,2,MUS$2010/PJ,2045
+2,10,electricity,all-week,evening,2025,all-year,R1,0.26670000000,windturbine,2,MUS$2010/PJ,2045
+3,10,electricity,all-week,evening,2030,all-year,R1,0.53330000000,windturbine,2,MUS$2010/PJ,2045
+4,10,electricity,all-week,evening,2035,all-year,R1,0.53330000000,windturbine,2,MUS$2010/PJ,2045
+5,10,electricity,all-week,evening,2040,all-year,R1,0.53330000000,windturbine,2,MUS$2010/PJ,2045
+1,10,electricity,all-week,late-peak,2020,all-year,R1,0.40000000000,windturbine,3,MUS$2010/PJ,2045
+2,10,electricity,all-week,late-peak,2025,all-year,R1,0.40000000000,windturbine,3,MUS$2010/PJ,2045
+3,10,electricity,all-week,late-peak,2030,all-year,R1,0.80000000000,windturbine,3,MUS$2010/PJ,2045
+4,10,electricity,all-week,late-peak,2035,all-year,R1,0.80000000000,windturbine,3,MUS$2010/PJ,2045
+5,10,electricity,all-week,late-peak,2040,all-year,R1,0.80000000000,windturbine,3,MUS$2010/PJ,2045
+1,10,electricity,all-week,morning,2020,all-year,R1,0.20000000000,windturbine,4,MUS$2010/PJ,2045
+2,10,electricity,all-week,morning,2025,all-year,R1,0.20000000000,windturbine,4,MUS$2010/PJ,2045
+3,10,electricity,all-week,morning,2030,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
+4,10,electricity,all-week,morning,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
+5,10,electricity,all-week,morning,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2045
+1,10,electricity,all-week,night,2020,all-year,R1,0.13330000000,windturbine,5,MUS$2010/PJ,2045
+2,10,electricity,all-week,night,2025,all-year,R1,0.13330000000,windturbine,5,MUS$2010/PJ,2045
+3,10,electricity,all-week,night,2030,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
+4,10,electricity,all-week,night,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
+5,10,electricity,all-week,night,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2045
+2,10,electricity,all-week,afternoon,2025,all-year,R1,0.13330000000,windturbine,0,MUS$2010/PJ,2050
+3,10,electricity,all-week,afternoon,2030,all-year,R1,0.26670000000,windturbine,0,MUS$2010/PJ,2050
+4,10,electricity,all-week,afternoon,2035,all-year,R1,0.26670000000,windturbine,0,MUS$2010/PJ,2050
+5,10,electricity,all-week,afternoon,2040,all-year,R1,0.26670000000,windturbine,0,MUS$2010/PJ,2050
+6,10,electricity,all-week,afternoon,2045,all-year,R1,0.26670000000,windturbine,0,MUS$2010/PJ,2050
+2,10,electricity,all-week,early-peak,2025,all-year,R1,0.20000000000,windturbine,1,MUS$2010/PJ,2050
+3,10,electricity,all-week,early-peak,2030,all-year,R1,0.40000000000,windturbine,1,MUS$2010/PJ,2050
+4,10,electricity,all-week,early-peak,2035,all-year,R1,0.40000000000,windturbine,1,MUS$2010/PJ,2050
+5,10,electricity,all-week,early-peak,2040,all-year,R1,0.40000000000,windturbine,1,MUS$2010/PJ,2050
+6,10,electricity,all-week,early-peak,2045,all-year,R1,0.40000000000,windturbine,1,MUS$2010/PJ,2050
+2,10,electricity,all-week,evening,2025,all-year,R1,0.26670000000,windturbine,2,MUS$2010/PJ,2050
+3,10,electricity,all-week,evening,2030,all-year,R1,0.53330000000,windturbine,2,MUS$2010/PJ,2050
+4,10,electricity,all-week,evening,2035,all-year,R1,0.53330000000,windturbine,2,MUS$2010/PJ,2050
+5,10,electricity,all-week,evening,2040,all-year,R1,0.53330000000,windturbine,2,MUS$2010/PJ,2050
+6,10,electricity,all-week,evening,2045,all-year,R1,0.53330000000,windturbine,2,MUS$2010/PJ,2050
+2,10,electricity,all-week,late-peak,2025,all-year,R1,0.40000000000,windturbine,3,MUS$2010/PJ,2050
+3,10,electricity,all-week,late-peak,2030,all-year,R1,0.80000000000,windturbine,3,MUS$2010/PJ,2050
+4,10,electricity,all-week,late-peak,2035,all-year,R1,0.80000000000,windturbine,3,MUS$2010/PJ,2050
+5,10,electricity,all-week,late-peak,2040,all-year,R1,0.80000000000,windturbine,3,MUS$2010/PJ,2050
+6,10,electricity,all-week,late-peak,2045,all-year,R1,0.80000000000,windturbine,3,MUS$2010/PJ,2050
+2,10,electricity,all-week,morning,2025,all-year,R1,0.20000000000,windturbine,4,MUS$2010/PJ,2050
+3,10,electricity,all-week,morning,2030,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
+4,10,electricity,all-week,morning,2035,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
+5,10,electricity,all-week,morning,2040,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
+6,10,electricity,all-week,morning,2045,all-year,R1,0.40000000000,windturbine,4,MUS$2010/PJ,2050
+2,10,electricity,all-week,night,2025,all-year,R1,0.13330000000,windturbine,5,MUS$2010/PJ,2050
+3,10,electricity,all-week,night,2030,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050
+4,10,electricity,all-week,night,2035,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050
+5,10,electricity,all-week,night,2040,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050
+6,10,electricity,all-week,night,2045,all-year,R1,0.26670000000,windturbine,5,MUS$2010/PJ,2050