diff --git a/docs/tutorial-code/new-decision-metric/Results/MCAMetric_Consumption.csv b/docs/tutorial-code/new-decision-metric/Results/MCAMetric_Consumption.csv
deleted file mode 100644
index 94ed7168e..000000000
--- a/docs/tutorial-code/new-decision-metric/Results/MCAMetric_Consumption.csv
+++ /dev/null
@@ -1,301 +0,0 @@
-agent,asset,category,comm_usage,commodity,consumption,day,dst_region,hour,installed,month,region,sector,technology,timeslice,units_prices,year
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2020
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2020
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.16000000000,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2020
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.74000000000,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2020
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.93333333333,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2020
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,1.93333333333,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2020
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,night,2020,all-year,R1,residential,gasboiler,0,MUS$2010/PJ,2025
-A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2025
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,morning,2020,all-year,R1,residential,gasboiler,1,MUS$2010/PJ,2025
-A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2025
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.32222222222,all-week,R1,afternoon,2020,all-year,R1,residential,gasboiler,2,MUS$2010/PJ,2025
-A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.42222222222,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2025
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.48333333333,all-week,R1,early-peak,2020,all-year,R1,residential,gasboiler,3,MUS$2010/PJ,2025
-A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.63333333333,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2025
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.96666666667,all-week,R1,late-peak,2020,all-year,R1,residential,gasboiler,4,MUS$2010/PJ,2025
-A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2025
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.64444444444,all-week,R1,evening,2020,all-year,R1,residential,gasboiler,5,MUS$2010/PJ,2025
-A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.84444444444,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2025
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.17151351351,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2025
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22822822823,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2025
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09129129129,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2025
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25727027027,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2025
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34234234234,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2025
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13693693694,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2025
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.17151351351,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2025
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22822822823,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2025
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09129129129,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2025
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25727027027,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2025
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34234234234,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2025
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13693693694,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2025
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2025
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2025
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2025
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.34302702703,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2025
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.45645645646,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2025
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.18258258258,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2025
-A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,all-week,R1,night,2020,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
-A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2030
-A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,all-week,R1,morning,2020,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
-A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2030
-A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.43678160920,all-week,R1,afternoon,2020,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
-A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22988505747,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2030
-A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.65517241379,all-week,R1,early-peak,2020,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
-A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.34482758621,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2030
-A1,1,newcapa,CONSUMABLE|ENERGY,electricity,1.26666666667,all-week,R1,late-peak,2020,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
-A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.66666666667,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2030
-A1,1,newcapa,CONSUMABLE|ENERGY,electricity,0.87356321839,all-week,R1,evening,2020,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
-A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.45977011494,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2030
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08946428571,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2030
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.23809523810,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2030
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09523809524,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2030
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.26839285714,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2030
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.11904761905,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2030
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.13419642857,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2030
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.35714285714,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2030
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.14285714286,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2030
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.40258928571,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2030
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.17857142857,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2030
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08946428571,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2030
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.23809523810,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2030
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09523809524,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2030
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.26839285714,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2030
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.11904761905,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2030
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.13419642857,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2030
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.35714285714,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2030
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.14285714286,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2030
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.40258928571,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2030
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.17857142857,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2030
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2030
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2030
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2030
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2030
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2030
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.17892857143,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2030
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.47619047619,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2030
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.19047619048,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2030
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.53678571429,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2030
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23809523810,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2030
-A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,all-week,R1,night,2025,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
-A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2035
-A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,all-week,R1,morning,2025,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
-A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2035
-A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.22222222222,all-week,R1,afternoon,2025,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
-A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2035
-A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.33333333333,all-week,R1,early-peak,2025,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
-A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2035
-A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.66666666667,all-week,R1,late-peak,2025,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
-A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2035
-A1,2,newcapa,CONSUMABLE|ENERGY,electricity,0.44444444444,all-week,R1,evening,2025,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
-A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2035
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2035
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2035
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2035
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.11111111111,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.17777777778,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2035
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2035
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2035
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2035
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.16666666667,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2035
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2035
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2035
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2035
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.11111111111,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.17777777778,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2035
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2035
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2035
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2035
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.16666666667,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2035
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2035
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2035
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2035
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.53333333333,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2035
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.16700000000,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2035
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.17777777778,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2035
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2035
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.35555555556,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2035
-A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,night,2030,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
-A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2040
-A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,morning,2030,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
-A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2040
-A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.57777777778,all-week,R1,afternoon,2030,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
-A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2040
-A1,3,newcapa,CONSUMABLE|ENERGY,electricity,0.86666666667,all-week,R1,early-peak,2030,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
-A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2040
-A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.73333333333,all-week,R1,late-peak,2030,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
-A1,4,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2040
-A1,3,newcapa,CONSUMABLE|ENERGY,electricity,1.15555555556,all-week,R1,evening,2030,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
-A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2040
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08553658537,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2040
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22764227642,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09105691057,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2040
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25660975610,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2040
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.11382113821,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.18211382114,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
-A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11382113821,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2040
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12830487805,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2040
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34146341463,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13658536585,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2040
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.38491463415,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2040
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.17073170732,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.27317073171,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
-A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.17073170732,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2040
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08553658537,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2040
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22764227642,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.09105691057,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2040
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25660975610,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2040
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.11382113821,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.18211382114,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
-A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11382113821,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2040
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12830487805,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2040
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.34146341463,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13658536585,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2040
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.38491463415,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2040
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.17073170732,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.27317073171,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
-A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.17073170732,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2040
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2040
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2040
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2040
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.53333333333,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
-A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2040
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.17107317073,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2040
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.45528455285,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.18211382114,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2040
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.51321951220,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2040
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.22764227642,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.36422764228,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
-A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.22764227642,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2040
-A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,night,2035,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
-A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2045
-A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,morning,2035,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
-A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2045
-A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.35555555556,all-week,R1,afternoon,2035,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
-A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2045
-A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.53333333333,all-week,R1,early-peak,2035,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
-A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2045
-A1,4,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,late-peak,2035,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
-A1,5,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2045
-A1,4,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,evening,2035,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
-A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2045
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2045
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,night,2020,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,night,2020,all-year,R1,power,windturbine,0,MUS$2010/kt,2045
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2045
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.11111111111,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.17777777778,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
-A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11111111111,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
-A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,night,2040,all-year,R1,power,solarPV,0,MUS$2010/kt,2045
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2045
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,morning,2020,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,morning,2020,all-year,R1,power,windturbine,1,MUS$2010/kt,2045
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2045
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.16666666667,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
-A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.16666666667,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
-A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,morning,2040,all-year,R1,power,solarPV,1,MUS$2010/kt,2045
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08350000000,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2045
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,afternoon,2020,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.08888888889,all-week,R1,afternoon,2020,all-year,R1,power,windturbine,2,MUS$2010/kt,2045
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2045
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.11111111111,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.17777777778,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
-A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11111111111,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
-A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.15555555556,all-week,R1,afternoon,2040,all-year,R1,power,solarPV,2,MUS$2010/kt,2045
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.12525000000,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2045
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,early-peak,2020,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.13333333333,all-week,R1,early-peak,2020,all-year,R1,power,windturbine,3,MUS$2010/kt,2045
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.37575000000,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2045
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.16666666667,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.26666666667,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
-A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.16666666667,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
-A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.23333333333,all-week,R1,early-peak,2040,all-year,R1,power,solarPV,3,MUS$2010/kt,2045
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2045
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2020,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.26666666667,all-week,R1,late-peak,2020,all-year,R1,power,windturbine,4,MUS$2010/kt,2045
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2045
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.53333333333,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
-A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
-A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.46666666667,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,4,MUS$2010/kt,2045
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.16700000000,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2045
-A1,1,newcapa,CONSUMABLE|ENERGY,solar,0.44444444444,all-week,R1,evening,2020,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
-A1,2,newcapa,CONSUMABLE|ENERGY,wind,0.17777777778,all-week,R1,evening,2020,all-year,R1,power,windturbine,5,MUS$2010/kt,2045
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.50100000000,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2045
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.35555555556,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
-A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.22222222222,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
-A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.31111111111,all-week,R1,evening,2040,all-year,R1,power,solarPV,5,MUS$2010/kt,2045
-A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,night,2040,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
-A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,all-week,R1,night,2045,all-year,R1,residential,heatpump,0,MUS$2010/PJ,2050
-A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,morning,2040,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
-A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,all-week,R1,morning,2045,all-year,R1,residential,heatpump,1,MUS$2010/PJ,2050
-A1,5,newcapa,CONSUMABLE|ENERGY,electricity,0.71111111111,all-week,R1,afternoon,2040,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
-A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.48888888889,all-week,R1,afternoon,2045,all-year,R1,residential,heatpump,2,MUS$2010/PJ,2050
-A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.06666666667,all-week,R1,early-peak,2040,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
-A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.73333333333,all-week,R1,early-peak,2045,all-year,R1,residential,heatpump,3,MUS$2010/PJ,2050
-A1,5,newcapa,CONSUMABLE|ENERGY,electricity,2.13333333333,all-week,R1,late-peak,2040,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
-A1,6,newcapa,CONSUMABLE|ENERGY,electricity,1.46666666667,all-week,R1,late-peak,2045,all-year,R1,residential,heatpump,4,MUS$2010/PJ,2050
-A1,5,newcapa,CONSUMABLE|ENERGY,electricity,1.42222222222,all-week,R1,evening,2040,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
-A1,6,newcapa,CONSUMABLE|ENERGY,electricity,0.97777777778,all-week,R1,evening,2045,all-year,R1,residential,heatpump,5,MUS$2010/PJ,2050
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08671153846,all-week,R1,night,2020,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2050
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.26013461538,all-week,R1,night,2025,all-year,R1,power,gasCCGT,0,MUS$2010/PJ,2050
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.11538461538,all-week,R1,night,2025,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.18461538462,all-week,R1,night,2030,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
-A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11538461538,all-week,R1,night,2035,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
-A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.16153846154,all-week,R1,night,2040,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
-A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.23076923077,all-week,R1,night,2045,all-year,R1,power,solarPV,0,MUS$2010/kt,2050
-A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.18461538462,all-week,R1,night,2045,all-year,R1,power,windturbine,0,MUS$2010/kt,2050
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.13006730769,all-week,R1,morning,2020,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2050
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.39020192308,all-week,R1,morning,2025,all-year,R1,power,gasCCGT,1,MUS$2010/PJ,2050
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.17307692308,all-week,R1,morning,2025,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.27692307692,all-week,R1,morning,2030,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
-A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.17307692308,all-week,R1,morning,2035,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
-A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.24230769231,all-week,R1,morning,2040,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
-A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.34615384615,all-week,R1,morning,2045,all-year,R1,power,solarPV,1,MUS$2010/kt,2050
-A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.27692307692,all-week,R1,morning,2045,all-year,R1,power,windturbine,1,MUS$2010/kt,2050
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.08671153846,all-week,R1,afternoon,2020,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2050
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.26013461538,all-week,R1,afternoon,2025,all-year,R1,power,gasCCGT,2,MUS$2010/PJ,2050
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.11538461538,all-week,R1,afternoon,2025,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.18461538462,all-week,R1,afternoon,2030,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
-A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.11538461538,all-week,R1,afternoon,2035,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
-A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.16153846154,all-week,R1,afternoon,2040,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
-A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.23076923077,all-week,R1,afternoon,2045,all-year,R1,power,solarPV,2,MUS$2010/kt,2050
-A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.18461538462,all-week,R1,afternoon,2045,all-year,R1,power,windturbine,2,MUS$2010/kt,2050
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.13006730769,all-week,R1,early-peak,2020,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2050
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.39020192308,all-week,R1,early-peak,2025,all-year,R1,power,gasCCGT,3,MUS$2010/PJ,2050
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.17307692308,all-week,R1,early-peak,2025,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.27692307692,all-week,R1,early-peak,2030,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
-A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.17307692308,all-week,R1,early-peak,2035,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
-A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.24230769231,all-week,R1,early-peak,2040,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
-A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.34615384615,all-week,R1,early-peak,2045,all-year,R1,power,solarPV,3,MUS$2010/kt,2050
-A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.27692307692,all-week,R1,early-peak,2045,all-year,R1,power,windturbine,3,MUS$2010/kt,2050
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.25050000000,all-week,R1,late-peak,2020,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2050
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.75150000000,all-week,R1,late-peak,2025,all-year,R1,power,gasCCGT,4,MUS$2010/PJ,2050
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,late-peak,2025,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.53333333333,all-week,R1,late-peak,2030,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
-A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.33333333333,all-week,R1,late-peak,2035,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
-A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.46666666667,all-week,R1,late-peak,2040,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
-A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.66666666667,all-week,R1,late-peak,2045,all-year,R1,power,solarPV,4,MUS$2010/kt,2050
-A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.53333333333,all-week,R1,late-peak,2045,all-year,R1,power,windturbine,4,MUS$2010/kt,2050
-A1,0,newcapa,CONSUMABLE|ENERGY,gas,0.17342307692,all-week,R1,evening,2020,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2050
-A1,3,newcapa,CONSUMABLE|ENERGY,gas,0.52026923077,all-week,R1,evening,2025,all-year,R1,power,gasCCGT,5,MUS$2010/PJ,2050
-A1,4,newcapa,CONSUMABLE|ENERGY,solar,0.23076923077,all-week,R1,evening,2025,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
-A1,5,newcapa,CONSUMABLE|ENERGY,solar,0.36923076923,all-week,R1,evening,2030,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
-A1,6,newcapa,CONSUMABLE|ENERGY,solar,0.23076923077,all-week,R1,evening,2035,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
-A1,7,newcapa,CONSUMABLE|ENERGY,solar,0.32307692308,all-week,R1,evening,2040,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
-A1,9,newcapa,CONSUMABLE|ENERGY,solar,0.46153846154,all-week,R1,evening,2045,all-year,R1,power,solarPV,5,MUS$2010/kt,2050
-A1,10,newcapa,CONSUMABLE|ENERGY,wind,0.36923076923,all-week,R1,evening,2045,all-year,R1,power,windturbine,5,MUS$2010/kt,2050
diff --git a/docs/tutorial-code/new-decision-metric/Results/MCAMetric_Supply.csv b/docs/tutorial-code/new-decision-metric/Results/MCAMetric_Supply.csv
deleted file mode 100644
index cdf8c23d2..000000000
--- a/docs/tutorial-code/new-decision-metric/Results/MCAMetric_Supply.csv
+++ /dev/null
@@ -1,421 +0,0 @@
-agent,asset,category,comm_usage,commodity,day,dst_region,hour,installed,month,region,sector,supply,technology,timeslice,units_prices,year
-A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.00000000000,gasboiler,0,MUS$2010/PJ,2020
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,64.71000000000,gasboiler,0,MUS$2010/kt,2020
-A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.50000000000,gasboiler,1,MUS$2010/PJ,2020
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,97.06500000000,gasboiler,1,MUS$2010/kt,2020
-A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.00000000000,gasboiler,2,MUS$2010/PJ,2020
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,64.71000000000,gasboiler,2,MUS$2010/kt,2020
-A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.50000000000,gasboiler,3,MUS$2010/PJ,2020
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,97.06500000000,gasboiler,3,MUS$2010/kt,2020
-A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,1.66666666667,gasboiler,4,MUS$2010/PJ,2020
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,107.85000000000,gasboiler,4,MUS$2010/kt,2020
-A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,1.66666666667,gasboiler,5,MUS$2010/PJ,2020
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,107.85000000000,gasboiler,5,MUS$2010/kt,2020
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,1.16000000000,gassupply1,0,MUS$2010/PJ,2020
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,1.74000000000,gassupply1,1,MUS$2010/PJ,2020
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,1.16000000000,gassupply1,2,MUS$2010/PJ,2020
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,1.74000000000,gassupply1,3,MUS$2010/PJ,2020
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.93333333333,gassupply1,4,MUS$2010/PJ,2020
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,1.93333333333,gassupply1,5,MUS$2010/PJ,2020
-A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,0.27777777778,gasboiler,0,MUS$2010/PJ,2025
-A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.05555555556,heatpump,0,MUS$2010/PJ,2025
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,residential,17.97500000000,gasboiler,0,MUS$2010/kt,2025
-A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,0.41666666667,gasboiler,1,MUS$2010/PJ,2025
-A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.58333333333,heatpump,1,MUS$2010/PJ,2025
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,residential,26.96250000000,gasboiler,1,MUS$2010/kt,2025
-A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,0.27777777778,gasboiler,2,MUS$2010/PJ,2025
-A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.05555555556,heatpump,2,MUS$2010/PJ,2025
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,residential,17.97500000000,gasboiler,2,MUS$2010/kt,2025
-A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,0.41666666667,gasboiler,3,MUS$2010/PJ,2025
-A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.58333333333,heatpump,3,MUS$2010/PJ,2025
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,residential,26.96250000000,gasboiler,3,MUS$2010/kt,2025
-A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,0.83333333333,gasboiler,4,MUS$2010/PJ,2025
-A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2025
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,residential,53.92500000000,gasboiler,4,MUS$2010/kt,2025
-A1,0,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,0.55555555556,gasboiler,5,MUS$2010/PJ,2025
-A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.11111111111,heatpump,5,MUS$2010/PJ,2025
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,residential,35.95000000000,gasboiler,5,MUS$2010/kt,2025
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.10270270270,gasCCGT,0,MUS$2010/PJ,2025
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22822822823,solarPV,0,MUS$2010/PJ,2025
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.09129129129,windturbine,0,MUS$2010/PJ,2025
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,9.41475675676,gasCCGT,0,MUS$2010/kt,2025
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.15405405405,gasCCGT,1,MUS$2010/PJ,2025
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.34234234234,solarPV,1,MUS$2010/PJ,2025
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13693693694,windturbine,1,MUS$2010/PJ,2025
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,14.12213513514,gasCCGT,1,MUS$2010/kt,2025
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.10270270270,gasCCGT,2,MUS$2010/PJ,2025
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22822822823,solarPV,2,MUS$2010/PJ,2025
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.09129129129,windturbine,2,MUS$2010/PJ,2025
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,9.41475675676,gasCCGT,2,MUS$2010/kt,2025
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.15405405405,gasCCGT,3,MUS$2010/PJ,2025
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.34234234234,solarPV,3,MUS$2010/PJ,2025
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13693693694,windturbine,3,MUS$2010/PJ,2025
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,14.12213513514,gasCCGT,3,MUS$2010/kt,2025
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.30000000000,gasCCGT,4,MUS$2010/PJ,2025
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2025
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2025
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,27.50100000000,gasCCGT,4,MUS$2010/kt,2025
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.20540540541,gasCCGT,5,MUS$2010/PJ,2025
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.45645645646,solarPV,5,MUS$2010/PJ,2025
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.18258258258,windturbine,5,MUS$2010/PJ,2025
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,18.82951351351,gasCCGT,5,MUS$2010/kt,2025
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.49373573574,gassupply1,0,MUS$2010/PJ,2025
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.74060360360,gassupply1,1,MUS$2010/PJ,2025
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.49373573574,gassupply1,2,MUS$2010/PJ,2025
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.74060360360,gassupply1,3,MUS$2010/PJ,2025
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.46766666667,gassupply1,4,MUS$2010/PJ,2025
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.98747147147,gassupply1,5,MUS$2010/PJ,2025
-A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2020,all-year,R1,residential,1.09195402299,heatpump,0,MUS$2010/PJ,2030
-A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.57471264368,heatpump,0,MUS$2010/PJ,2030
-A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2020,all-year,R1,residential,1.63793103448,heatpump,1,MUS$2010/PJ,2030
-A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.86206896552,heatpump,1,MUS$2010/PJ,2030
-A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2020,all-year,R1,residential,1.09195402299,heatpump,2,MUS$2010/PJ,2030
-A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.57471264368,heatpump,2,MUS$2010/PJ,2030
-A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2020,all-year,R1,residential,1.63793103448,heatpump,3,MUS$2010/PJ,2030
-A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.86206896552,heatpump,3,MUS$2010/PJ,2030
-A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2020,all-year,R1,residential,3.16666666667,heatpump,4,MUS$2010/PJ,2030
-A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.66666666667,heatpump,4,MUS$2010/PJ,2030
-A1,1,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2020,all-year,R1,residential,2.18390804598,heatpump,5,MUS$2010/PJ,2030
-A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.14942528736,heatpump,5,MUS$2010/PJ,2030
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05357142857,gasCCGT,0,MUS$2010/PJ,2030
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.23809523810,solarPV,0,MUS$2010/PJ,2030
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.09523809524,windturbine,0,MUS$2010/PJ,2030
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.16071428571,gasCCGT,0,MUS$2010/PJ,2030
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.11904761905,solarPV,0,MUS$2010/PJ,2030
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.91089285714,gasCCGT,0,MUS$2010/kt,2030
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,14.73267857143,gasCCGT,0,MUS$2010/kt,2030
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.08035714286,gasCCGT,1,MUS$2010/PJ,2030
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.35714285714,solarPV,1,MUS$2010/PJ,2030
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.14285714286,windturbine,1,MUS$2010/PJ,2030
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.24107142857,gasCCGT,1,MUS$2010/PJ,2030
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.17857142857,solarPV,1,MUS$2010/PJ,2030
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,7.36633928571,gasCCGT,1,MUS$2010/kt,2030
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,22.09901785714,gasCCGT,1,MUS$2010/kt,2030
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05357142857,gasCCGT,2,MUS$2010/PJ,2030
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.23809523810,solarPV,2,MUS$2010/PJ,2030
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.09523809524,windturbine,2,MUS$2010/PJ,2030
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.16071428571,gasCCGT,2,MUS$2010/PJ,2030
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.11904761905,solarPV,2,MUS$2010/PJ,2030
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.91089285714,gasCCGT,2,MUS$2010/kt,2030
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,14.73267857143,gasCCGT,2,MUS$2010/kt,2030
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.08035714286,gasCCGT,3,MUS$2010/PJ,2030
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.35714285714,solarPV,3,MUS$2010/PJ,2030
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.14285714286,windturbine,3,MUS$2010/PJ,2030
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.24107142857,gasCCGT,3,MUS$2010/PJ,2030
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.17857142857,solarPV,3,MUS$2010/PJ,2030
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,7.36633928571,gasCCGT,3,MUS$2010/kt,2030
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,22.09901785714,gasCCGT,3,MUS$2010/kt,2030
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2030
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2030
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2030
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2030
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2030
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2030
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2030
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10714285714,gasCCGT,5,MUS$2010/PJ,2030
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.47619047619,solarPV,5,MUS$2010/PJ,2030
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.19047619048,windturbine,5,MUS$2010/PJ,2030
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.32142857143,gasCCGT,5,MUS$2010/PJ,2030
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.23809523810,solarPV,5,MUS$2010/PJ,2030
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.82178571429,gasCCGT,5,MUS$2010/kt,2030
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,29.46535714286,gasCCGT,5,MUS$2010/kt,2030
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2020,all-year,R1,gas,0.35785714286,gassupply1,0,MUS$2010/PJ,2030
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2020,all-year,R1,gas,0.53678571429,gassupply1,1,MUS$2010/PJ,2030
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2020,all-year,R1,gas,0.35785714286,gassupply1,2,MUS$2010/PJ,2030
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2020,all-year,R1,gas,0.53678571429,gassupply1,3,MUS$2010/PJ,2030
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2020,all-year,R1,gas,1.00200000000,gassupply1,4,MUS$2010/PJ,2030
-A1,0,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2020,all-year,R1,gas,0.71571428571,gassupply1,5,MUS$2010/PJ,2030
-A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2025,all-year,R1,residential,0.55555555556,heatpump,0,MUS$2010/PJ,2035
-A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2035
-A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2025,all-year,R1,residential,0.83333333333,heatpump,1,MUS$2010/PJ,2035
-A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.16666666667,heatpump,1,MUS$2010/PJ,2035
-A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2025,all-year,R1,residential,0.55555555556,heatpump,2,MUS$2010/PJ,2035
-A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.44444444444,heatpump,2,MUS$2010/PJ,2035
-A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2025,all-year,R1,residential,0.83333333333,heatpump,3,MUS$2010/PJ,2035
-A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.16666666667,heatpump,3,MUS$2010/PJ,2035
-A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2025,all-year,R1,residential,1.66666666667,heatpump,4,MUS$2010/PJ,2035
-A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.33333333333,heatpump,4,MUS$2010/PJ,2035
-A1,2,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2025,all-year,R1,residential,1.11111111111,heatpump,5,MUS$2010/PJ,2035
-A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.88888888889,heatpump,5,MUS$2010/PJ,2035
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05000000000,gasCCGT,0,MUS$2010/PJ,2035
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2035
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.08888888889,windturbine,0,MUS$2010/PJ,2035
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2035
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.11111111111,solarPV,0,MUS$2010/PJ,2035
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.17777777778,solarPV,0,MUS$2010/PJ,2035
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.58350000000,gasCCGT,0,MUS$2010/kt,2035
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2035
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07500000000,gasCCGT,1,MUS$2010/PJ,2035
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2035
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13333333333,windturbine,1,MUS$2010/PJ,2035
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2035
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.16666666667,solarPV,1,MUS$2010/PJ,2035
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.26666666667,solarPV,1,MUS$2010/PJ,2035
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,6.87525000000,gasCCGT,1,MUS$2010/kt,2035
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2035
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05000000000,gasCCGT,2,MUS$2010/PJ,2035
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2035
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.08888888889,windturbine,2,MUS$2010/PJ,2035
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2035
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.11111111111,solarPV,2,MUS$2010/PJ,2035
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.17777777778,solarPV,2,MUS$2010/PJ,2035
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.58350000000,gasCCGT,2,MUS$2010/kt,2035
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2035
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07500000000,gasCCGT,3,MUS$2010/PJ,2035
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2035
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13333333333,windturbine,3,MUS$2010/PJ,2035
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2035
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.16666666667,solarPV,3,MUS$2010/PJ,2035
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.26666666667,solarPV,3,MUS$2010/PJ,2035
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,6.87525000000,gasCCGT,3,MUS$2010/kt,2035
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2035
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2035
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2035
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2035
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2035
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2035
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.53333333333,solarPV,4,MUS$2010/PJ,2035
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2035
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2035
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10000000000,gasCCGT,5,MUS$2010/PJ,2035
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2035
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.17777777778,windturbine,5,MUS$2010/PJ,2035
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2035
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.22222222222,solarPV,5,MUS$2010/PJ,2035
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.35555555556,solarPV,5,MUS$2010/PJ,2035
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.16700000000,gasCCGT,5,MUS$2010/kt,2035
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2035
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.33400000000,gassupply1,0,MUS$2010/PJ,2035
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.50100000000,gassupply1,1,MUS$2010/PJ,2035
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.33400000000,gassupply1,2,MUS$2010/PJ,2035
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.50100000000,gassupply1,3,MUS$2010/PJ,2035
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,1.00200000000,gassupply1,4,MUS$2010/PJ,2035
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.66800000000,gassupply1,5,MUS$2010/PJ,2035
-A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2030,all-year,R1,residential,1.44444444444,heatpump,0,MUS$2010/PJ,2040
-A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2040
-A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2030,all-year,R1,residential,2.16666666667,heatpump,1,MUS$2010/PJ,2040
-A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.33333333333,heatpump,1,MUS$2010/PJ,2040
-A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2030,all-year,R1,residential,1.44444444444,heatpump,2,MUS$2010/PJ,2040
-A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.88888888889,heatpump,2,MUS$2010/PJ,2040
-A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2030,all-year,R1,residential,2.16666666667,heatpump,3,MUS$2010/PJ,2040
-A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.33333333333,heatpump,3,MUS$2010/PJ,2040
-A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2030,all-year,R1,residential,4.33333333333,heatpump,4,MUS$2010/PJ,2040
-A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.66666666667,heatpump,4,MUS$2010/PJ,2040
-A1,3,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2030,all-year,R1,residential,2.88888888889,heatpump,5,MUS$2010/PJ,2040
-A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.77777777778,heatpump,5,MUS$2010/PJ,2040
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05121951220,gasCCGT,0,MUS$2010/PJ,2040
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22764227642,solarPV,0,MUS$2010/PJ,2040
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.09105691057,windturbine,0,MUS$2010/PJ,2040
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15365853659,gasCCGT,0,MUS$2010/PJ,2040
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.11382113821,solarPV,0,MUS$2010/PJ,2040
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.18211382114,solarPV,0,MUS$2010/PJ,2040
-A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.11382113821,solarPV,0,MUS$2010/PJ,2040
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.69529268293,gasCCGT,0,MUS$2010/kt,2040
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,14.08587804878,gasCCGT,0,MUS$2010/kt,2040
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07682926829,gasCCGT,1,MUS$2010/PJ,2040
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.34146341463,solarPV,1,MUS$2010/PJ,2040
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13658536585,windturbine,1,MUS$2010/PJ,2040
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23048780488,gasCCGT,1,MUS$2010/PJ,2040
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.17073170732,solarPV,1,MUS$2010/PJ,2040
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.27317073171,solarPV,1,MUS$2010/PJ,2040
-A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.17073170732,solarPV,1,MUS$2010/PJ,2040
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,7.04293902439,gasCCGT,1,MUS$2010/kt,2040
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,21.12881707317,gasCCGT,1,MUS$2010/kt,2040
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05121951220,gasCCGT,2,MUS$2010/PJ,2040
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22764227642,solarPV,2,MUS$2010/PJ,2040
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.09105691057,windturbine,2,MUS$2010/PJ,2040
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15365853659,gasCCGT,2,MUS$2010/PJ,2040
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.11382113821,solarPV,2,MUS$2010/PJ,2040
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.18211382114,solarPV,2,MUS$2010/PJ,2040
-A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.11382113821,solarPV,2,MUS$2010/PJ,2040
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.69529268293,gasCCGT,2,MUS$2010/kt,2040
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,14.08587804878,gasCCGT,2,MUS$2010/kt,2040
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07682926829,gasCCGT,3,MUS$2010/PJ,2040
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.34146341463,solarPV,3,MUS$2010/PJ,2040
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13658536585,windturbine,3,MUS$2010/PJ,2040
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23048780488,gasCCGT,3,MUS$2010/PJ,2040
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.17073170732,solarPV,3,MUS$2010/PJ,2040
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.27317073171,solarPV,3,MUS$2010/PJ,2040
-A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.17073170732,solarPV,3,MUS$2010/PJ,2040
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,7.04293902439,gasCCGT,3,MUS$2010/kt,2040
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,21.12881707317,gasCCGT,3,MUS$2010/kt,2040
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2040
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2040
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2040
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2040
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2040
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.53333333333,solarPV,4,MUS$2010/PJ,2040
-A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2040
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2040
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2040
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10243902439,gasCCGT,5,MUS$2010/PJ,2040
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.45528455285,solarPV,5,MUS$2010/PJ,2040
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.18211382114,windturbine,5,MUS$2010/PJ,2040
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30731707317,gasCCGT,5,MUS$2010/PJ,2040
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.22764227642,solarPV,5,MUS$2010/PJ,2040
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.36422764228,solarPV,5,MUS$2010/PJ,2040
-A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.22764227642,solarPV,5,MUS$2010/PJ,2040
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.39058536585,gasCCGT,5,MUS$2010/kt,2040
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,28.17175609756,gasCCGT,5,MUS$2010/kt,2040
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.34214634146,gassupply1,0,MUS$2010/PJ,2040
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.51321951220,gassupply1,1,MUS$2010/PJ,2040
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.34214634146,gassupply1,2,MUS$2010/PJ,2040
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.51321951220,gassupply1,3,MUS$2010/PJ,2040
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,1.00200000000,gassupply1,4,MUS$2010/PJ,2040
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.68429268293,gassupply1,5,MUS$2010/PJ,2040
-A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2035,all-year,R1,residential,0.88888888889,heatpump,0,MUS$2010/PJ,2045
-A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2045
-A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2035,all-year,R1,residential,1.33333333333,heatpump,1,MUS$2010/PJ,2045
-A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.66666666667,heatpump,1,MUS$2010/PJ,2045
-A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2035,all-year,R1,residential,0.88888888889,heatpump,2,MUS$2010/PJ,2045
-A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.77777777778,heatpump,2,MUS$2010/PJ,2045
-A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2035,all-year,R1,residential,1.33333333333,heatpump,3,MUS$2010/PJ,2045
-A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.66666666667,heatpump,3,MUS$2010/PJ,2045
-A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2035,all-year,R1,residential,2.66666666667,heatpump,4,MUS$2010/PJ,2045
-A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.33333333333,heatpump,4,MUS$2010/PJ,2045
-A1,4,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2035,all-year,R1,residential,1.77777777778,heatpump,5,MUS$2010/PJ,2045
-A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.55555555556,heatpump,5,MUS$2010/PJ,2045
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05000000000,gasCCGT,0,MUS$2010/PJ,2045
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.22222222222,solarPV,0,MUS$2010/PJ,2045
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.08888888889,windturbine,0,MUS$2010/PJ,2045
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15000000000,gasCCGT,0,MUS$2010/PJ,2045
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.11111111111,solarPV,0,MUS$2010/PJ,2045
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.17777777778,solarPV,0,MUS$2010/PJ,2045
-A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.11111111111,solarPV,0,MUS$2010/PJ,2045
-A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.15555555556,solarPV,0,MUS$2010/PJ,2045
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.58350000000,gasCCGT,0,MUS$2010/kt,2045
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,13.75050000000,gasCCGT,0,MUS$2010/kt,2045
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07500000000,gasCCGT,1,MUS$2010/PJ,2045
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.33333333333,solarPV,1,MUS$2010/PJ,2045
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.13333333333,windturbine,1,MUS$2010/PJ,2045
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.22500000000,gasCCGT,1,MUS$2010/PJ,2045
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.16666666667,solarPV,1,MUS$2010/PJ,2045
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.26666666667,solarPV,1,MUS$2010/PJ,2045
-A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.16666666667,solarPV,1,MUS$2010/PJ,2045
-A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.23333333333,solarPV,1,MUS$2010/PJ,2045
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,6.87525000000,gasCCGT,1,MUS$2010/kt,2045
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,20.62575000000,gasCCGT,1,MUS$2010/kt,2045
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05000000000,gasCCGT,2,MUS$2010/PJ,2045
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.22222222222,solarPV,2,MUS$2010/PJ,2045
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.08888888889,windturbine,2,MUS$2010/PJ,2045
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15000000000,gasCCGT,2,MUS$2010/PJ,2045
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.11111111111,solarPV,2,MUS$2010/PJ,2045
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.17777777778,solarPV,2,MUS$2010/PJ,2045
-A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.11111111111,solarPV,2,MUS$2010/PJ,2045
-A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.15555555556,solarPV,2,MUS$2010/PJ,2045
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.58350000000,gasCCGT,2,MUS$2010/kt,2045
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,13.75050000000,gasCCGT,2,MUS$2010/kt,2045
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07500000000,gasCCGT,3,MUS$2010/PJ,2045
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.33333333333,solarPV,3,MUS$2010/PJ,2045
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.13333333333,windturbine,3,MUS$2010/PJ,2045
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.22500000000,gasCCGT,3,MUS$2010/PJ,2045
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.16666666667,solarPV,3,MUS$2010/PJ,2045
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.26666666667,solarPV,3,MUS$2010/PJ,2045
-A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.16666666667,solarPV,3,MUS$2010/PJ,2045
-A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.23333333333,solarPV,3,MUS$2010/PJ,2045
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,6.87525000000,gasCCGT,3,MUS$2010/kt,2045
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,20.62575000000,gasCCGT,3,MUS$2010/kt,2045
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2045
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2045
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.26666666667,windturbine,4,MUS$2010/PJ,2045
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2045
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2045
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.53333333333,solarPV,4,MUS$2010/PJ,2045
-A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2045
-A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.46666666667,solarPV,4,MUS$2010/PJ,2045
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2045
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2045
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10000000000,gasCCGT,5,MUS$2010/PJ,2045
-A1,1,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.44444444444,solarPV,5,MUS$2010/PJ,2045
-A1,2,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.17777777778,windturbine,5,MUS$2010/PJ,2045
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.30000000000,gasCCGT,5,MUS$2010/PJ,2045
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.22222222222,solarPV,5,MUS$2010/PJ,2045
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.35555555556,solarPV,5,MUS$2010/PJ,2045
-A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.22222222222,solarPV,5,MUS$2010/PJ,2045
-A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.31111111111,solarPV,5,MUS$2010/PJ,2045
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.16700000000,gasCCGT,5,MUS$2010/kt,2045
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,27.50100000000,gasCCGT,5,MUS$2010/kt,2045
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.33400000000,gassupply1,0,MUS$2010/PJ,2045
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.50100000000,gassupply1,1,MUS$2010/PJ,2045
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.33400000000,gassupply1,2,MUS$2010/PJ,2045
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.50100000000,gassupply1,3,MUS$2010/PJ,2045
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,1.00200000000,gassupply1,4,MUS$2010/PJ,2045
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.66800000000,gassupply1,5,MUS$2010/PJ,2045
-A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2040,all-year,R1,residential,1.77777777778,heatpump,0,MUS$2010/PJ,2050
-A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,night,2045,all-year,R1,residential,1.22222222222,heatpump,0,MUS$2010/PJ,2050
-A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2040,all-year,R1,residential,2.66666666667,heatpump,1,MUS$2010/PJ,2050
-A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,morning,2045,all-year,R1,residential,1.83333333333,heatpump,1,MUS$2010/PJ,2050
-A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2040,all-year,R1,residential,1.77777777778,heatpump,2,MUS$2010/PJ,2050
-A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,afternoon,2045,all-year,R1,residential,1.22222222222,heatpump,2,MUS$2010/PJ,2050
-A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2040,all-year,R1,residential,2.66666666667,heatpump,3,MUS$2010/PJ,2050
-A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,early-peak,2045,all-year,R1,residential,1.83333333333,heatpump,3,MUS$2010/PJ,2050
-A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2040,all-year,R1,residential,5.33333333333,heatpump,4,MUS$2010/PJ,2050
-A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,late-peak,2045,all-year,R1,residential,3.66666666667,heatpump,4,MUS$2010/PJ,2050
-A1,5,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2040,all-year,R1,residential,3.55555555556,heatpump,5,MUS$2010/PJ,2050
-A1,6,newcapa,PRODUCT|ENERGY,heat,all-week,R1,evening,2045,all-year,R1,residential,2.44444444444,heatpump,5,MUS$2010/PJ,2050
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2020,all-year,R1,power,0.05192307692,gasCCGT,0,MUS$2010/PJ,2050
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.15576923077,gasCCGT,0,MUS$2010/PJ,2050
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2025,all-year,R1,power,0.11538461538,solarPV,0,MUS$2010/PJ,2050
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2030,all-year,R1,power,0.18461538462,solarPV,0,MUS$2010/PJ,2050
-A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2035,all-year,R1,power,0.11538461538,solarPV,0,MUS$2010/PJ,2050
-A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2040,all-year,R1,power,0.16153846154,solarPV,0,MUS$2010/PJ,2050
-A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.23076923077,solarPV,0,MUS$2010/PJ,2050
-A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,night,2045,all-year,R1,power,0.18461538462,windturbine,0,MUS$2010/PJ,2050
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2020,all-year,R1,power,4.75978846154,gasCCGT,0,MUS$2010/kt,2050
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,night,2025,all-year,R1,power,14.27936538462,gasCCGT,0,MUS$2010/kt,2050
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2020,all-year,R1,power,0.07788461538,gasCCGT,1,MUS$2010/PJ,2050
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.23365384615,gasCCGT,1,MUS$2010/PJ,2050
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2025,all-year,R1,power,0.17307692308,solarPV,1,MUS$2010/PJ,2050
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2030,all-year,R1,power,0.27692307692,solarPV,1,MUS$2010/PJ,2050
-A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2035,all-year,R1,power,0.17307692308,solarPV,1,MUS$2010/PJ,2050
-A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2040,all-year,R1,power,0.24230769231,solarPV,1,MUS$2010/PJ,2050
-A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.34615384615,solarPV,1,MUS$2010/PJ,2050
-A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,morning,2045,all-year,R1,power,0.27692307692,windturbine,1,MUS$2010/PJ,2050
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2020,all-year,R1,power,7.13968269231,gasCCGT,1,MUS$2010/kt,2050
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,morning,2025,all-year,R1,power,21.41904807692,gasCCGT,1,MUS$2010/kt,2050
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2020,all-year,R1,power,0.05192307692,gasCCGT,2,MUS$2010/PJ,2050
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.15576923077,gasCCGT,2,MUS$2010/PJ,2050
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2025,all-year,R1,power,0.11538461538,solarPV,2,MUS$2010/PJ,2050
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2030,all-year,R1,power,0.18461538462,solarPV,2,MUS$2010/PJ,2050
-A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2035,all-year,R1,power,0.11538461538,solarPV,2,MUS$2010/PJ,2050
-A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2040,all-year,R1,power,0.16153846154,solarPV,2,MUS$2010/PJ,2050
-A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.23076923077,solarPV,2,MUS$2010/PJ,2050
-A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,afternoon,2045,all-year,R1,power,0.18461538462,windturbine,2,MUS$2010/PJ,2050
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2020,all-year,R1,power,4.75978846154,gasCCGT,2,MUS$2010/kt,2050
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,afternoon,2025,all-year,R1,power,14.27936538462,gasCCGT,2,MUS$2010/kt,2050
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2020,all-year,R1,power,0.07788461538,gasCCGT,3,MUS$2010/PJ,2050
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.23365384615,gasCCGT,3,MUS$2010/PJ,2050
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2025,all-year,R1,power,0.17307692308,solarPV,3,MUS$2010/PJ,2050
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2030,all-year,R1,power,0.27692307692,solarPV,3,MUS$2010/PJ,2050
-A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2035,all-year,R1,power,0.17307692308,solarPV,3,MUS$2010/PJ,2050
-A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2040,all-year,R1,power,0.24230769231,solarPV,3,MUS$2010/PJ,2050
-A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.34615384615,solarPV,3,MUS$2010/PJ,2050
-A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,early-peak,2045,all-year,R1,power,0.27692307692,windturbine,3,MUS$2010/PJ,2050
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2020,all-year,R1,power,7.13968269231,gasCCGT,3,MUS$2010/kt,2050
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,early-peak,2025,all-year,R1,power,21.41904807692,gasCCGT,3,MUS$2010/kt,2050
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2020,all-year,R1,power,0.15000000000,gasCCGT,4,MUS$2010/PJ,2050
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.45000000000,gasCCGT,4,MUS$2010/PJ,2050
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2025,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2050
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2030,all-year,R1,power,0.53333333333,solarPV,4,MUS$2010/PJ,2050
-A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2035,all-year,R1,power,0.33333333333,solarPV,4,MUS$2010/PJ,2050
-A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2040,all-year,R1,power,0.46666666667,solarPV,4,MUS$2010/PJ,2050
-A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.66666666667,solarPV,4,MUS$2010/PJ,2050
-A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,late-peak,2045,all-year,R1,power,0.53333333333,windturbine,4,MUS$2010/PJ,2050
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2020,all-year,R1,power,13.75050000000,gasCCGT,4,MUS$2010/kt,2050
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,late-peak,2025,all-year,R1,power,41.25150000000,gasCCGT,4,MUS$2010/kt,2050
-A1,0,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2020,all-year,R1,power,0.10384615385,gasCCGT,5,MUS$2010/PJ,2050
-A1,3,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.31153846154,gasCCGT,5,MUS$2010/PJ,2050
-A1,4,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2025,all-year,R1,power,0.23076923077,solarPV,5,MUS$2010/PJ,2050
-A1,5,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2030,all-year,R1,power,0.36923076923,solarPV,5,MUS$2010/PJ,2050
-A1,6,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2035,all-year,R1,power,0.23076923077,solarPV,5,MUS$2010/PJ,2050
-A1,7,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2040,all-year,R1,power,0.32307692308,solarPV,5,MUS$2010/PJ,2050
-A1,9,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.46153846154,solarPV,5,MUS$2010/PJ,2050
-A1,10,newcapa,PRODUCT|ENERGY,electricity,all-week,R1,evening,2045,all-year,R1,power,0.36923076923,windturbine,5,MUS$2010/PJ,2050
-A1,0,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2020,all-year,R1,power,9.51957692308,gasCCGT,5,MUS$2010/kt,2050
-A1,3,newcapa,PRODUCT|ENVIRONMENTAL,CO2f,all-week,R1,evening,2025,all-year,R1,power,28.55873076923,gasCCGT,5,MUS$2010/kt,2050
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,night,2030,all-year,R1,gas,0.34684615385,gassupply1,0,MUS$2010/PJ,2050
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,morning,2030,all-year,R1,gas,0.52026923077,gassupply1,1,MUS$2010/PJ,2050
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,afternoon,2030,all-year,R1,gas,0.34684615385,gassupply1,2,MUS$2010/PJ,2050
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,early-peak,2030,all-year,R1,gas,0.52026923077,gassupply1,3,MUS$2010/PJ,2050
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,late-peak,2030,all-year,R1,gas,1.00200000000,gassupply1,4,MUS$2010/PJ,2050
-A1,1,newcapa,PRODUCT|ENERGY,gas,all-week,R1,evening,2030,all-year,R1,gas,0.69369230769,gassupply1,5,MUS$2010/PJ,2050
diff --git a/docs/tutorial-code/new-decision-metric/settings.toml b/docs/tutorial-code/new-decision-metric/settings.toml
index 73e22677f..90694b9e0 100644
--- a/docs/tutorial-code/new-decision-metric/settings.toml
+++ b/docs/tutorial-code/new-decision-metric/settings.toml
@@ -23,16 +23,6 @@ quantity = "capacity"
 sink = "aggregate"
 filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 
-[[outputs]]
-quantity = "timeslice_consumption"
-sink = "aggregate"
-filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-
-[[outputs]]
-quantity = "timeslice_supply"
-sink = "aggregate"
-filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
-
 [carbon_budget_control]
 budget = []
 
diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py
index 10068afdf..f4c552dd2 100644
--- a/src/muse/outputs/mca.py
+++ b/src/muse/outputs/mca.py
@@ -16,7 +16,7 @@ def quantity(
 or an xarray xr.DataArray.
 """
 
-from collections.abc import Hashable, Iterable, Mapping, MutableMapping, Sequence
+from collections.abc import Mapping, MutableMapping
 from operator import attrgetter
 from pathlib import Path
 from typing import (
@@ -35,7 +35,7 @@ def quantity(
 from muse.outputs.sector import market_quantity
 from muse.registration import registrator
 from muse.sectors import AbstractSector
-from muse.timeslices import QuantityType, convert_timeslice, drop_timeslice
+from muse.timeslices import QuantityType, convert_timeslice
 from muse.utilities import multiindex_to_coords
 
 OUTPUT_QUANTITY_SIGNATURE = Callable[
@@ -233,463 +233,6 @@ def _aggregate_sectors(
     return pd.concat(alldata, sort=True)
 
 
-@register_output_quantity
-class AggregateResources:
-    """Aggregates a set of commodities."""
-
-    def __init__(
-        self,
-        commodities: Union[str, Iterable[Hashable]] = (),
-        metric: str = "consumption",
-    ):
-        if isinstance(commodities, str):
-            commodities = [commodities]
-        else:
-            commodities = list(commodities)
-        self.commodities: Sequence[Hashable] = commodities
-        self.metric = metric
-        self.aggregate: Optional[xr.DataArray] = None
-
-    def __call__(
-        self,
-        market: xr.Dataset,
-        sectors: list[AbstractSector],
-        year: Optional[int] = None,
-    ) -> Optional[xr.DataArray]:
-        if len(self.commodities) == 0:
-            return None
-        if year is None:
-            year = int(market.year.min())
-        quantity = cast(xr.DataArray, market[self.metric]).sel(
-            year=year, commodity=self.commodities, drop=True
-        )
-        if self.aggregate is None:
-            self.aggregate = quantity
-        else:
-            self.aggregate += quantity
-        return self.aggregate
-
-
-@register_output_quantity(name=["finite_resources"])
-class FiniteResources(AggregateResources):
-    """Aggregates a set of commodities."""
-
-    def __init__(
-        self,
-        limits_path: Union[str, Path, xr.DataArray],
-        commodities: Union[str, Iterable[Hashable]] = (),
-        metric: str = "consumption",
-    ):
-        from muse.readers.csv import read_finite_resources
-
-        super().__init__(commodities=commodities, metric=metric)
-        if isinstance(limits_path, str):
-            limits_path = Path(limits_path)
-        if isinstance(limits_path, Path):
-            limits_path = read_finite_resources(limits_path)
-
-        self.limits = limits_path
-
-    def __call__(
-        self,
-        market: xr.Dataset,
-        sectors: list[AbstractSector],
-        year: Optional[int] = None,
-    ) -> Optional[xr.DataArray]:
-        if len(self.commodities) == 0:
-            return None
-        if year is None:
-            year = int(market.year.min())
-
-        limits = self.limits
-        if "year" in self.limits.dims:
-            limits = limits.interp(year=year)
-
-        aggregate = super().__call__(market, sectors, year=year)
-        if aggregate is None:
-            return None
-        aggregate = aggregate.sum([u for u in aggregate.dims if u not in limits.dims])
-        assert aggregate is not None
-        limits = limits.sum([u for u in limits.dims if u not in aggregate.dims])
-        return aggregate <= limits.assign_coords(timeslice=aggregate.timeslice)
-
-
-@register_output_quantity(name=["timeslice_supply"])
-def metric_supply(
-    market: xr.Dataset, sectors: list[AbstractSector], **kwargs
-) -> pd.DataFrame:
-    """Current timeslice supply across all sectors."""
-    market_out = market.copy(deep=True)
-    return _aggregate_sectors(sectors, market_out, op=sector_supply)
-
-
-def sector_supply(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.DataFrame:
-    """Sector supply with agent annotations."""
-    from muse.production import supply
-
-    data_sector: list[xr.DataArray] = []
-    techs = getattr(sector, "technologies", [])
-    agents = sorted(getattr(sector, "agents", []), key=attrgetter("name"))
-
-    if len(techs) > 0:
-        for a in agents:
-            output_year = a.year - a.forecast
-            capacity = a.filter_input(a.assets.capacity, year=output_year).fillna(0.0)
-            technologies = a.filter_input(techs, year=output_year).fillna(0.0)
-            agent_market = market.sel(year=output_year).copy()
-            agent_market["consumption"] = drop_timeslice(
-                agent_market.consumption * a.quantity
-            )
-            included = [
-                i
-                for i in agent_market["commodity"].values
-                if i in technologies.enduse.values
-            ]
-            excluded = [
-                i for i in agent_market["commodity"].values if i not in included
-            ]
-            agent_market.loc[dict(commodity=excluded)] = 0
-
-            result = convert_timeslice(
-                supply(
-                    agent_market,
-                    capacity,
-                    technologies,
-                ),
-                agent_market["consumption"].timeslice,
-                QuantityType.EXTENSIVE,
-            )
-
-            if "year" in result.dims:
-                data_agent = result.sel(year=output_year)
-            else:
-                data_agent = result
-                data_agent["year"] = output_year
-            if "dst_region" not in data_agent.coords:
-                data_agent["dst_region"] = a.region
-            data_agent["agent"] = a.name
-            data_agent["category"] = a.category
-            data_agent["sector"] = getattr(sector, "name", "unnamed")
-
-            a = multiindex_to_coords(data_agent, "timeslice").to_dataframe("supply")
-            a["comm_usage"] = a["comm_usage"].apply(lambda x: x.name)
-            if not a.empty:
-                data_sector.append(a[a["supply"] != 0])
-
-    if len(data_sector) > 0:
-        output = pd.concat(data_sector, sort=True).reset_index()
-    else:
-        output = pd.DataFrame()
-    return output
-
-
-@register_output_quantity(name=["yearly_supply"])
-def metricy_supply(
-    market: xr.Dataset, sectors: list[AbstractSector], **kwargs
-) -> pd.DataFrame:
-    """Current yearlysupply across all sectors."""
-    market_out = market.copy(deep=True)
-    return _aggregate_sectors(sectors, market_out, op=sectory_supply)
-
-
-def sectory_supply(
-    sector: AbstractSector, market: xr.Dataset, **kwargs
-) -> pd.DataFrame:
-    """Sector supply with agent annotations."""
-    from muse.production import supply
-
-    def capacity(agents):
-        """Aggregates capacity across agents.
-
-        The capacities are aggregated leaving only two
-        dimensions: asset (technology, installation date,
-        region), year.
-        """
-        from muse.utilities import filter_input, reduce_assets
-
-        traded = [
-            u.assets.capacity for u in agents if "dst_region" in u.assets.capacity.dims
-        ]
-        nontraded = [
-            u.assets.capacity
-            for u in agents
-            if "dst_region" not in u.assets.capacity.dims
-        ]
-        if not traded:
-            full_list = [
-                list(nontraded[i].year.values)
-                for i in range(len(nontraded))
-                if "year" in nontraded[i].dims
-            ]
-            flat_list = [item for sublist in full_list for item in sublist]
-            years = sorted(list(set(flat_list)))
-            nontraded = [
-                filter_input(u.assets.capacity, year=years)
-                for u in agents
-                if "dst_region" not in u.assets.capacity.dims
-            ]
-
-            return reduce_assets(nontraded)
-
-        if not nontraded:
-            full_list = [
-                list(traded[i].year.values)
-                for i in range(len(traded))
-                if "year" in traded[i].dims
-            ]
-            flat_list = [item for sublist in full_list for item in sublist]
-            years = sorted(list(set(flat_list)))
-            traded = [
-                filter_input(u.assets.capacity, year=years)
-                for u in agents
-                if "dst_region" in u.assets.capacity.dims
-            ]
-            return reduce_assets(traded)
-        traded_results = reduce_assets(traded)
-        nontraded_results = reduce_assets(nontraded)
-        return reduce_assets(
-            [
-                traded_results,
-                nontraded_results
-                * (nontraded_results.region == traded_results.dst_region),
-            ]
-        )
-
-    data_sector: list[xr.DataArray] = []
-    techs = getattr(sector, "technologies", [])
-    agents = sorted(getattr(sector, "agents", []), key=attrgetter("name"))
-
-    if len(techs) > 0:
-        if "dst_region" in techs.dims:
-            output_year = agents[0].year - agents[0].forecast
-            years = market.year.values
-            capacity = (
-                capacity(agents)
-                .interp(year=years, method="linear")
-                .sel(year=output_year)
-            )
-            agent_market = market.sel(year=output_year).copy()
-            agent_market["consumption"] = agent_market.consumption
-            technologies = techs.sel(year=output_year)
-            result = supply(
-                agent_market,
-                capacity,
-                technologies,
-            )
-
-            if "year" in result.dims:
-                data_agent = result.sel(year=output_year)
-            else:
-                data_agent = result
-                data_agent["year"] = output_year
-
-            data_agent["agent"] = agents[0].name
-            data_agent["category"] = agents[0].category
-            data_agent["sector"] = getattr(sector, "name", "unnamed")
-
-            a = data_agent.to_dataframe("supply")
-            a["comm_usage"] = a["comm_usage"].apply(lambda x: x.name)
-            if len(a) > 0 and len(a.technology.values) > 0:
-                b = a.reset_index()
-                b = b[b["supply"] != 0]
-                data_sector.append(b)
-        else:
-            for agent in agents:
-                output_year = agent.year - agent.forecast
-                capacity = agent.filter_input(
-                    agent.assets.capacity, year=output_year
-                ).fillna(0.0)
-                technologies = techs.sel(year=output_year, region=agent.region)
-                agent_market = market.sel(year=output_year).copy()
-                agent_market["consumption"] = agent_market.consumption * agent.quantity
-                included = [
-                    i
-                    for i in agent_market["commodity"].values
-                    if i in technologies.enduse.values
-                ]
-                excluded = [
-                    i for i in agent_market["commodity"].values if i not in included
-                ]
-                agent_market.loc[dict(commodity=excluded)] = 0
-
-                result = supply(
-                    agent_market,
-                    capacity,
-                    technologies,
-                )
-
-                if "year" in result.dims:
-                    data_agent = result.sel(year=output_year)
-                else:
-                    data_agent = result
-                    data_agent["year"] = output_year
-                if "dst_region" not in data_agent.coords:
-                    data_agent["dst_region"] = agent.region
-                data_agent["agent"] = agent.name
-                data_agent["category"] = agent.category
-                data_agent["sector"] = getattr(sector, "name", "unnamed")
-
-                a = data_agent.to_dataframe("supply")
-                a["comm_usage"] = a["comm_usage"].apply(lambda x: x.name)
-                if len(a) > 0 and len(a.technology.values) > 0:
-                    b = a.reset_index()
-                    b = b[b["supply"] != 0]
-                    data_sector.append(b)
-
-    if len(data_sector) > 0:
-        output = pd.concat(data_sector, sort=True).reset_index()
-    else:
-        output = pd.DataFrame()
-    return output
-
-
-@register_output_quantity(name=["timeslice_consumption"])
-def metric_consumption(
-    market: xr.Dataset, sectors: list[AbstractSector], **kwargs
-) -> pd.DataFrame:
-    """Current timeslice consumption across all sectors."""
-    return _aggregate_sectors(sectors, market, op=sector_consumption)
-
-
-def sector_consumption(
-    sector: AbstractSector, market: xr.Dataset, **kwargs
-) -> pd.DataFrame:
-    """Sector fuel consumption with agent annotations."""
-    from muse.production import supply
-    from muse.quantities import consumption
-
-    data_sector: list[xr.DataArray] = []
-    techs = getattr(sector, "technologies", [])
-    agents = sorted(getattr(sector, "agents", []), key=attrgetter("name"))
-
-    agent_market = market
-    if len(techs) > 0:
-        for a in agents:
-            output_year = a.year - a.forecast
-            capacity = a.filter_input(a.assets.capacity, year=output_year).fillna(0.0)
-            technologies = a.filter_input(techs, year=output_year).fillna(0.0)
-            agent_market = market.sel(year=output_year).copy()
-            agent_market["consumption"] = drop_timeslice(
-                agent_market.consumption * a.quantity
-            )
-            included = [
-                i
-                for i in agent_market["commodity"].values
-                if i in technologies.enduse.values
-            ]
-            excluded = [
-                i for i in agent_market["commodity"].values if i not in included
-            ]
-            agent_market.loc[dict(commodity=excluded)] = 0
-
-            production = convert_timeslice(
-                supply(
-                    agent_market,
-                    capacity,
-                    technologies,
-                ),
-                agent_market["consumption"].timeslice,
-                QuantityType.EXTENSIVE,
-            )
-            prices = a.filter_input(market.prices, year=output_year)
-            result = consumption(
-                technologies=technologies, production=production, prices=prices
-            )
-            if "year" in result.dims:
-                data_agent = result.sel(year=output_year)
-            else:
-                data_agent = result
-                data_agent["year"] = output_year
-            if "dst_region" not in data_agent.coords:
-                data_agent["dst_region"] = a.region
-            data_agent["agent"] = a.name
-            data_agent["category"] = a.category
-            data_agent["sector"] = getattr(sector, "name", "unnamed")
-
-            a = multiindex_to_coords(data_agent, "timeslice").to_dataframe(
-                "consumption"
-            )
-            a["comm_usage"] = a["comm_usage"].apply(lambda x: x.name)
-            if not a.empty:
-                data_sector.append(a[a["consumption"] != 0])
-
-    if len(data_sector) > 0:
-        output = pd.concat(data_sector, sort=True).reset_index()
-    else:
-        output = pd.DataFrame()
-    return output
-
-
-@register_output_quantity(name=["yearly_consumption"])
-def metricy_consumption(
-    market: xr.Dataset, sectors: list[AbstractSector], **kwargs
-) -> pd.DataFrame:
-    """Current yearly consumption across all sectors."""
-    return _aggregate_sectors(sectors, market, op=sectory_consumption)
-
-
-def sectory_consumption(
-    sector: AbstractSector, market: xr.Dataset, **kwargs
-) -> pd.DataFrame:
-    """Sector fuel consumption with agent annotations."""
-    from muse.production import supply
-    from muse.quantities import consumption
-
-    data_sector: list[xr.DataArray] = []
-    techs = getattr(sector, "technologies", [])
-    agents = sorted(getattr(sector, "agents", []), key=attrgetter("name"))
-
-    agent_market = market
-    if len(techs) > 0:
-        for a in agents:
-            output_year = a.year - a.forecast
-            capacity = a.filter_input(a.assets.capacity, year=output_year).fillna(0.0)
-            technologies = a.filter_input(techs, year=output_year).fillna(0.0)
-            agent_market = market.sel(year=output_year).copy()
-            agent_market["consumption"] = agent_market.consumption * a.quantity
-            included = [
-                i
-                for i in agent_market["commodity"].values
-                if i in technologies.enduse.values
-            ]
-            excluded = [
-                i for i in agent_market["commodity"].values if i not in included
-            ]
-            agent_market.loc[dict(commodity=excluded)] = 0
-
-            production = supply(
-                agent_market,
-                capacity,
-                technologies,
-            )
-
-            prices = a.filter_input(market.prices, year=output_year)
-            result = consumption(
-                technologies=technologies, production=production, prices=prices
-            )
-            if "year" in result.dims:
-                data_agent = result.sel(year=output_year)
-            else:
-                data_agent = result
-                data_agent["year"] = output_year
-            if "dst_region" not in data_agent.coords:
-                data_agent["dst_region"] = a.region
-            data_agent["agent"] = a.name
-            data_agent["category"] = a.category
-            data_agent["sector"] = getattr(sector, "name", "unnamed")
-            a = data_agent.to_dataframe("consumption")
-            a["comm_usage"] = a["comm_usage"].apply(lambda x: x.name)
-            if len(a) > 0 and len(a.technology.values) > 0:
-                b = a.reset_index()
-                b = b[b["consumption"] != 0]
-                data_sector.append(b)
-    if len(data_sector) > 0:
-        output = pd.concat(data_sector, sort=True).reset_index()
-    else:
-        output = pd.DataFrame()
-    return output
-
-
 @register_output_quantity(name=["fuel_costs"])
 def metric_fuel_costs(
     market: xr.Dataset, sectors: list[AbstractSector], **kwargs
diff --git a/tests/test_outputs.py b/tests/test_outputs.py
index bedcf4d22..dd4fa5d51 100644
--- a/tests/test_outputs.py
+++ b/tests/test_outputs.py
@@ -333,64 +333,6 @@ def dummy(market, **kwargs):
     )
 
 
-def test_aggregate_resources(market):
-    from muse.outputs.mca import AggregateResources
-
-    commodity = str(market.commodity.isel(commodity=0).values)
-    output = AggregateResources(commodity)
-    a = output(market, []).copy()
-    assert (
-        a == market.consumption.sel(year=2010, commodity=commodity, drop=True)
-    ).all()
-    b = output(market, []).copy()
-    assert (b == 2 * a).all()
-
-
-def test_finite_resources_quantity(limits_path):
-    from muse import examples
-    from muse.outputs.mca import FiniteResources
-
-    market = examples.mca_market()[["consumption"]]
-
-    output = FiniteResources(limits_path=limits_path, commodities="gas")
-    result = output(market, [])
-    assert set(result.dims) == {"region", "timeslice", "commodity"}
-    assert result.all()
-
-    market.consumption.loc[dict(commodity="gas")] = 3.0
-    result = output(market, [])
-    assert result.all()
-
-    result = output(market, [])
-    assert not result.all()
-
-
-def test_finite_resources_in_sim(tmp_path, limits_path):
-    from toml import dump, load
-
-    from muse import examples
-    from muse.mca import MCA
-    from muse.outputs.sinks import FiniteResourceException
-    from muse.readers.toml import read_settings
-
-    examples.copy_model("default", path=tmp_path)
-    toml = load(tmp_path / "model" / "settings.toml")
-    toml["outputs"].append(
-        dict(
-            quantity="finite_resources",
-            limits_path=str(limits_path.resolve()),
-            early_exit=True,
-            commodities="gas",
-        )
-    )
-    with open(tmp_path / "model" / "settings.toml", "w") as fileobj:
-        dump(toml, fileobj)
-
-    mca = MCA.factory(read_settings(tmp_path / "model" / "settings.toml"))
-    with raises(FiniteResourceException):
-        mca.run()
-
-
 def test_register_output_quantity_cache():
     from muse.outputs.cache import OUTPUT_QUANTITIES, register_cached_quantity