diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 69566f86f..53704daed 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.8", "3.9"]
+        # Test with the earliest and the latest python versions supported
+        python-version: ["3.9", "3.12"]
 
     steps:
       - uses: actions/checkout@v4
@@ -26,10 +27,7 @@ jobs:
           cache: pip
 
       - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip==22.1.2
-          pip install -U setuptools==62.6.0 wheel xlrd==1.2.0
-          pip install -e .[all]
+        run: pip install -e .[all]
 
       # The unit tests, with coverage under linux
       - name: Unit tests (linux)
@@ -60,7 +58,8 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
-        python-version: ["3.8", "3.9"]
+        # Test with the earliest and the latest python versions supported
+        python-version: ["3.9", "3.12"]
 
     steps:
       - uses: actions/checkout@v4
@@ -70,10 +69,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip==22.1.2
-          pip install -U setuptools==62.6.0 wheel xlrd==1.2.0
-          pip install -e .[all]
+        run: pip install -e .[all]
 
       # The regression tests (with non coverage)
       - name: Regression tests
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
index b7ff0af9a..c4d14b92c 100644
--- a/.github/workflows/documentation.yml
+++ b/.github/workflows/documentation.yml
@@ -13,14 +13,12 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: 3.9
+          python-version: 3.12
       - name: Install dependencies
         run: |
           sudo apt update -y
           sudo apt install -y pandoc graphviz latexmk texlive-latex-recommended \
                   texlive-latex-extra texlive-fonts-recommended
-          python -m pip install --upgrade pip
-          python -m pip install --upgrade setuptools==62.6.0 wheel
           python -m pip install -e .[doc,dev]
       - name: Generate results for default model
         run: |
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 338d58fe3..8efb5126b 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -20,7 +20,7 @@
         },
         {
             "name": "Model: default_timeslice",
-            "type": "python",
+            "type": "debugpy",
             "request": "launch",
             "module": "muse",
             "args": ["--model", "default_timeslice"]
diff --git a/docs/installation/pipx-based.rst b/docs/installation/pipx-based.rst
index bbcf5e01b..902bb5b63 100644
--- a/docs/installation/pipx-based.rst
+++ b/docs/installation/pipx-based.rst
@@ -6,7 +6,7 @@ pipx-based installation
 To help you installing MUSE in your system we will follow these steps:
 
 - `Launching a terminal`_: Needed to both install and run MUSE.
-- `Installing a compatible Python version`_: At the moment, MUSE works with Python 3.8 and 3.9.
+- `Installing a compatible Python version`_: MUSE works with Python 3.9 to 3.12.
 - `Installing pipx`_: A Python application manager that facilitates installing, keeping applications updated and run them in their own isolated environments.
 - `Installing MUSE itself`_
 
@@ -67,7 +67,7 @@ Once you have launched the Terminal, the window that opens will show the command
 Installing a compatible Python version
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-MUSE needs Python to run but, for now, it only works with versions 3.8 and 3.9, so the next step is to install a suitable version of Python.
+MUSE needs Python to run and it works with versions 3.9 to 3.12, so the next step is to install a suitable version of Python.
 
 .. note::
 
@@ -92,7 +92,7 @@ The first thing will be to check if you already have a suitable python version i
 
     python --version
 
-If the output is ``Python 3.8.X`` or ``Python 3.9.X``, where ``X`` is any number, then **you have a version of Python compatible with MUSE and you can skip this section altogether**. Move to `Installing pipx`_. In any other case, keep reading.
+If the output is ``Python 3.Y.X`` or ``Python 3.Y.X``, where ``X`` is any number and ``Y`` is 9, 10, 11 or 12, then **you have a version of Python compatible with MUSE and you can skip this section altogether**. Move to `Installing pipx`_. In any other case, keep reading.
 
 There are multiple ways of installing Python, as well as multiple distributions. Here we have opted for the one that we believe is simplest, requires the smallest downloads and gives the maximum flexibility: using ``pyenv``.
 
diff --git a/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv b/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
index 1def068ec..f307ea6d8 100644
--- a/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCACapacity.csv
@@ -21,47 +21,43 @@
 8,A1,6.90000000000,R1,14,2025,R1,residential,heatpump,retrofit,2035
 9,A1,25.00000000000,R1,15,2030,R1,residential,heatpump,retrofit,2035
 0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2035
-21,A1,10.00000000000,R1,26,2020,R1,power,solarPV,retrofit,2035
-22,A1,2.40000000000,R1,27,2025,R1,power,solarPV,retrofit,2035
-23,A1,6.00000000000,R1,28,2030,R1,power,solarPV,retrofit,2035
-48,A1,6.75000000000,R1,78,2020,R1,power,windturbine,retrofit,2035
+10,A1,10.00000000000,R1,11,2020,R1,power,solarPV,retrofit,2035
+11,A1,2.40000000000,R1,12,2025,R1,power,solarPV,retrofit,2035
+12,A1,6.00000000000,R1,13,2030,R1,power,solarPV,retrofit,2035
+37,A1,6.75000000000,R1,55,2020,R1,power,windturbine,retrofit,2035
 0,A1,2.79440000000,R1,0,2025,R1,gas,gassupply1,retrofit,2035
 1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2035
 2,A1,0.91000000000,R1,0,2035,R1,residential,gasboiler,retrofit,2040
 6,A1,25.00000000000,R1,7,2030,R1,residential,heatpump,retrofit,2040
 7,A1,16.09000000000,R1,8,2035,R1,residential,heatpump,retrofit,2040
 0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2040
-1,A1,0.72440000000,R1,1,2035,R1,power,gasCCGT,retrofit,2040
-20,A1,10.00000000000,R1,24,2020,R1,power,solarPV,retrofit,2040
-21,A1,2.40000000000,R1,25,2025,R1,power,solarPV,retrofit,2040
-22,A1,6.00000000000,R1,26,2030,R1,power,solarPV,retrofit,2040
-23,A1,10.00000000000,R1,27,2035,R1,power,solarPV,retrofit,2040
-44,A1,6.75000000000,R1,72,2020,R1,power,windturbine,retrofit,2040
-45,A1,6.75000000000,R1,73,2035,R1,power,windturbine,retrofit,2040
+9,A1,10.00000000000,R1,12,2020,R1,power,solarPV,retrofit,2040
+10,A1,2.40000000000,R1,13,2025,R1,power,solarPV,retrofit,2040
+11,A1,6.00000000000,R1,14,2030,R1,power,solarPV,retrofit,2040
+12,A1,9.19000000000,R1,15,2035,R1,power,solarPV,retrofit,2040
+43,A1,6.75000000000,R1,72,2020,R1,power,windturbine,retrofit,2040
 0,A1,2.79440000000,R1,0,2025,R1,gas,gassupply1,retrofit,2040
 1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2040
 2,A1,0.91000000000,R1,0,2035,R1,residential,gasboiler,retrofit,2045
 4,A1,16.09000000000,R1,7,2035,R1,residential,heatpump,retrofit,2045
 5,A1,31.00000000000,R1,8,2040,R1,residential,heatpump,retrofit,2045
 2,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2045
-3,A1,0.72440000000,R1,1,2035,R1,power,gasCCGT,retrofit,2045
-20,A1,10.00000000000,R1,22,2020,R1,power,solarPV,retrofit,2045
-21,A1,2.40000000000,R1,23,2025,R1,power,solarPV,retrofit,2045
-22,A1,6.00000000000,R1,24,2030,R1,power,solarPV,retrofit,2045
-23,A1,10.00000000000,R1,25,2035,R1,power,solarPV,retrofit,2045
-48,A1,6.75000000000,R1,77,2020,R1,power,windturbine,retrofit,2045
-49,A1,6.75000000000,R1,78,2035,R1,power,windturbine,retrofit,2045
+10,A1,10.00000000000,R1,13,2020,R1,power,solarPV,retrofit,2045
+11,A1,2.40000000000,R1,14,2025,R1,power,solarPV,retrofit,2045
+12,A1,6.00000000000,R1,15,2030,R1,power,solarPV,retrofit,2045
+13,A1,9.19000000000,R1,16,2035,R1,power,solarPV,retrofit,2045
+14,A1,6.00000000000,R1,17,2040,R1,power,solarPV,retrofit,2045
+50,A1,6.75000000000,R1,91,2020,R1,power,windturbine,retrofit,2045
 0,A1,2.79440000000,R1,0,2025,R1,gas,gassupply1,retrofit,2045
 1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2045
 0,A1,31.00000000000,R1,0,2040,R1,residential,heatpump,retrofit,2050
 1,A1,23.00000000000,R1,1,2045,R1,residential,heatpump,retrofit,2050
 0,A1,3.00000000000,R1,0,2025,R1,power,gasCCGT,retrofit,2050
-1,A1,0.72440000000,R1,1,2035,R1,power,gasCCGT,retrofit,2050
-14,A1,2.40000000000,R1,22,2025,R1,power,solarPV,retrofit,2050
-15,A1,6.00000000000,R1,23,2030,R1,power,solarPV,retrofit,2050
-16,A1,10.00000000000,R1,24,2035,R1,power,solarPV,retrofit,2050
-17,A1,16.91000000000,R1,25,2045,R1,power,solarPV,retrofit,2050
-42,A1,6.75000000000,R1,77,2035,R1,power,windturbine,retrofit,2050
-43,A1,3.56000000000,R1,78,2045,R1,power,windturbine,retrofit,2050
+6,A1,2.40000000000,R1,13,2025,R1,power,solarPV,retrofit,2050
+7,A1,6.00000000000,R1,14,2030,R1,power,solarPV,retrofit,2050
+8,A1,9.19000000000,R1,15,2035,R1,power,solarPV,retrofit,2050
+9,A1,6.00000000000,R1,16,2040,R1,power,solarPV,retrofit,2050
+10,A1,16.91000000000,R1,17,2045,R1,power,solarPV,retrofit,2050
+46,A1,6.75000000000,R1,91,2045,R1,power,windturbine,retrofit,2050
 0,A1,2.79440000000,R1,0,2025,R1,gas,gassupply1,retrofit,2050
 1,A1,7.50000000000,R1,1,2030,R1,gas,gassupply1,retrofit,2050
diff --git a/docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Consumption.csv b/docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Consumption.csv
index c6cacd793..3cbf732a6 100644
--- a/docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Consumption.csv
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Consumption.csv
@@ -1,319 +1,295 @@
 ,agent,asset,category,comm_usage,commodity,consumption,dst_region,index,installed,region,sector,technology,timeslice,units_prices,year
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.16000000000,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-1,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.74000000000,R1,9,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.16000000000,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.74000000000,R1,25,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,3.48000000000,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,2.32000000000,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.32222222222,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R1,4,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.48333333333,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R1,20,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.32222222222,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R1,36,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.48333333333,R1,49,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R1,52,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.96666666667,R1,65,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.26666666667,R1,68,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.64444444444,R1,81,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.84444444444,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08350000000,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22222222222,R1,9,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.15000000000,R1,13,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12525000000,R1,26,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-4,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33333333333,R1,34,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-5,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22500000000,R1,38,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08350000000,R1,51,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22222222222,R1,59,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.15000000000,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12525000000,R1,76,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33333333333,R1,84,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22500000000,R1,88,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25050000000,R1,101,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.66666666667,R1,109,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.45000000000,R1,113,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.16700000000,R1,126,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.44444444444,R1,134,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.30000000000,R1,138,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R1,0,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.26422222222,R1,5,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15333333333,R1,8,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R1,16,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-4,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.39633333333,R1,21,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-5,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.23000000000,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R1,32,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.26422222222,R1,37,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15333333333,R1,40,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R1,48,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.39633333333,R1,53,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.23000000000,R1,56,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.26666666667,R1,64,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.79266666667,R1,69,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.46000000000,R1,72,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.84444444444,R1,80,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.52844444444,R1,85,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30666666667,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22222222222,R1,4,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.15000000000,R1,8,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25050000000,R1,11,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05333333333,R1,19,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33333333333,R1,29,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22500000000,R1,33,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37575000000,R1,36,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-7,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.08000000000,R1,44,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22222222222,R1,54,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.15000000000,R1,58,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25050000000,R1,61,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05333333333,R1,69,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33333333333,R1,79,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22500000000,R1,83,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37575000000,R1,86,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.08000000000,R1,94,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.66666666667,R1,104,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.45000000000,R1,108,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.75150000000,R1,111,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16000000000,R1,119,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.44444444444,R1,129,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.30000000000,R1,133,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50100000000,R1,136,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10666666667,R1,144,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.26422222222,R1,1,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15333333333,R1,4,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,8,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.39633333333,R1,21,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-4,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.23000000000,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-5,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R1,28,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.26422222222,R1,41,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15333333333,R1,44,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.39633333333,R1,61,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.23000000000,R1,64,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R1,68,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.79266666667,R1,81,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.46000000000,R1,84,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.66666666667,R1,88,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.52844444444,R1,101,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30666666667,R1,104,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.11111111111,R1,108,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22222222222,R1,4,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.15000000000,R1,8,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25050000000,R1,11,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05333333333,R1,19,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13333333333,R1,24,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33333333333,R1,44,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-6,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22500000000,R1,48,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37575000000,R1,51,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-8,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.08000000000,R1,59,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-9,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20000000000,R1,64,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22222222222,R1,84,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.15000000000,R1,88,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25050000000,R1,91,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05333333333,R1,99,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-14,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13333333333,R1,104,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33333333333,R1,124,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22500000000,R1,128,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37575000000,R1,131,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-18,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.08000000000,R1,139,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-19,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20000000000,R1,144,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.66666666667,R1,164,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.45000000000,R1,168,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.75150000000,R1,171,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16000000000,R1,179,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-24,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.40000000000,R1,184,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-25,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.44444444444,R1,204,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-26,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.30000000000,R1,208,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50100000000,R1,211,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-28,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10666666667,R1,219,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-29,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26666666667,R1,224,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,0,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05864444444,R1,5,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.35755555556,R1,8,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R1,16,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-4,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08796666667,R1,21,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-5,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.53633333333,R1,24,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,32,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05864444444,R1,37,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.35755555556,R1,40,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08796666667,R1,53,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.53633333333,R1,56,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.66666666667,R1,64,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17593333333,R1,69,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.07266666667,R1,72,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.11111111111,R1,80,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11728888889,R1,85,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.71511111111,R1,88,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18160523292,R1,4,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.12258353222,R1,8,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20471449881,R1,11,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04358525590,R1,19,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10896313975,R1,24,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.04943476045,R1,26,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18160523292,R1,34,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-7,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.12258353222,R1,38,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27240784938,R1,44,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.18387529833,R1,48,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.30707174821,R1,51,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06537788385,R1,59,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-12,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16344470963,R1,64,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-13,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07415214068,R1,66,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-14,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27240784938,R1,74,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-15,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.18387529833,R1,78,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18160523292,R1,84,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.12258353222,R1,88,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.20471449881,R1,91,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04358525590,R1,99,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-20,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10896313975,R1,104,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-21,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.04943476045,R1,106,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-22,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18160523292,R1,114,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-23,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.12258353222,R1,118,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27240784938,R1,124,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.18387529833,R1,128,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.30707174821,R1,131,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.06537788385,R1,139,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16344470963,R1,144,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.07415214068,R1,146,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-30,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.27240784938,R1,154,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-31,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.18387529833,R1,158,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.54481569875,R1,164,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.36775059666,R1,168,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.61414349642,R1,171,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13075576770,R1,179,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-36,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.32688941925,R1,184,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-37,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.14830428136,R1,186,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-38,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.54481569875,R1,194,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-39,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.36775059666,R1,198,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.36321046584,R1,204,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24516706444,R1,208,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.40942899761,R1,211,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.08717051180,R1,219,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.21792627950,R1,224,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-45,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09886952091,R1,226,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-46,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.36321046584,R1,234,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-47,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24516706444,R1,238,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05864444444,R1,1,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.35755555556,R1,4,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R1,8,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08796666667,R1,17,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-4,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.53633333333,R1,20,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-5,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R1,24,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05864444444,R1,33,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.35755555556,R1,36,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R1,40,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08796666667,R1,49,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.53633333333,R1,52,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R1,56,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17593333333,R1,65,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.07266666667,R1,68,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,2.06666666667,R1,72,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11728888889,R1,81,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.71511111111,R1,84,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.37777777778,R1,88,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20812339786,R1,4,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.14048329356,R1,8,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23460710024,R1,11,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04994961549,R1,19,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.12487403872,R1,24,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05665327013,R1,26,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20812339786,R1,34,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-7,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.14048329356,R1,38,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31218509679,R1,54,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.21072494033,R1,58,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35191065036,R1,61,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07492442323,R1,69,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-12,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18731105807,R1,74,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-13,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08497990520,R1,76,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-14,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31218509679,R1,84,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-15,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.21072494033,R1,88,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20812339786,R1,104,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.14048329356,R1,108,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.23460710024,R1,111,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.04994961549,R1,119,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-20,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.12487403872,R1,124,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-21,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05665327013,R1,126,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-22,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20812339786,R1,134,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-23,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.14048329356,R1,138,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31218509679,R1,154,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.21072494033,R1,158,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.35191065036,R1,161,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.07492442323,R1,169,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.18731105807,R1,174,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08497990520,R1,176,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-30,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.31218509679,R1,184,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-31,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.21072494033,R1,188,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.62437019358,R1,204,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.42144988067,R1,208,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.70382130072,R1,211,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.14984884646,R1,219,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-36,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.37462211615,R1,224,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-37,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.16995981040,R1,226,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-38,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.62437019358,R1,234,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-39,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.42144988067,R1,238,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.41624679572,R1,254,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.28096658711,R1,258,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.46921420048,R1,261,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.09989923097,R1,269,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.24974807743,R1,274,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-45,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11330654026,R1,276,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-46,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.41624679572,R1,284,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-47,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.28096658711,R1,288,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R1,0,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51111111111,R1,4,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R1,12,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.76666666667,R1,16,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R1,24,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51111111111,R1,28,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R1,36,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.76666666667,R1,40,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,2.06666666667,R1,48,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.53333333333,R1,52,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.37777777778,R1,60,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.02222222222,R1,64,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25050000000,R1,1,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05333333333,R1,9,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13333333333,R1,14,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06049111111,R1,16,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22222222222,R1,24,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.15000000000,R1,28,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.37577777778,R1,34,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-7,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07911111111,R1,38,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37575000000,R1,46,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.08000000000,R1,54,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20000000000,R1,59,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09073666667,R1,61,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-12,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33333333333,R1,69,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-13,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22500000000,R1,73,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-14,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.56366666667,R1,79,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-15,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.11866666667,R1,83,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.25050000000,R1,91,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.05333333333,R1,99,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.13333333333,R1,104,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.06049111111,R1,106,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-20,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.22222222222,R1,114,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-21,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.15000000000,R1,118,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-22,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.37577777778,R1,124,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-23,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.07911111111,R1,128,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.37575000000,R1,136,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.08000000000,R1,144,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.20000000000,R1,149,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.09073666667,R1,151,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.33333333333,R1,159,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22500000000,R1,163,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-30,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.56366666667,R1,169,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-31,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.11866666667,R1,173,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-32,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.75150000000,R1,181,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-33,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.16000000000,R1,189,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-34,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.40000000000,R1,194,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-35,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.18147333333,R1,196,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-36,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.66666666667,R1,204,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-37,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.45000000000,R1,208,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-38,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,1.12733333333,R1,214,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-39,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.23733333333,R1,218,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50100000000,R1,226,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.10666666667,R1,234,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.26666666667,R1,239,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.12098222222,R1,241,2035.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.44444444444,R1,249,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-45,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.30000000000,R1,253,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-46,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,solar,0.75155555556,R1,259,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-47,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.15822222222,R1,263,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+0,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
+1,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,R1,9,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
+2,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
+3,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,R1,25,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
+4,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,3.48000000000,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
+5,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,2.32000000000,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
+0,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+1,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,4,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+2,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+3,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,20,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+4,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+5,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,36,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+6,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,R1,49,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+7,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,52,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+8,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,R1,65,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+9,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,R1,68,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+10,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,R1,81,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+11,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+0,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08350000000,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+1,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,R1,9,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+2,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,R1,13,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+3,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.12525000000,R1,26,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+4,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,R1,34,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+5,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,R1,38,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+6,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08350000000,R1,51,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+7,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,R1,59,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+8,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+9,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.12525000000,R1,76,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+10,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,R1,84,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+11,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,R1,88,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+12,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,R1,101,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+13,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,R1,109,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+14,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,R1,113,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+15,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.16700000000,R1,126,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+16,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,R1,134,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+17,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,R1,138,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+0,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,0,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+1,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,R1,5,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+2,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,R1,8,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+3,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,16,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+4,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,R1,21,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+5,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+6,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,32,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+7,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,R1,37,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+8,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,R1,40,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+9,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,48,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+10,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,R1,53,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+11,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,R1,56,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+12,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,R1,64,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+13,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,R1,69,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+14,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,R1,72,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+15,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,R1,80,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+16,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,R1,85,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+17,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+0,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,R1,4,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+1,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,R1,8,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+2,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,R1,11,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+3,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,R1,19,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+4,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,R1,29,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+5,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,R1,33,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+6,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,R1,36,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+7,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,R1,44,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+8,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,R1,54,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+9,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,R1,58,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+10,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,R1,61,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+11,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,R1,69,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+12,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,R1,79,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+13,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,R1,83,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+14,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,R1,86,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+15,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,R1,94,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+16,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,R1,104,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+17,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,R1,108,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+18,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,R1,111,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+19,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,R1,119,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+20,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,R1,129,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+21,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,R1,133,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+22,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,R1,136,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+23,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,R1,144,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+0,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,R1,1,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+1,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,R1,4,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+2,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,R1,8,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+3,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,R1,21,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+4,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+5,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,R1,28,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+6,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,R1,41,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+7,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,R1,44,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+8,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+9,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,R1,61,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+10,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,R1,64,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+11,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,R1,68,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+12,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,R1,81,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+13,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,R1,84,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+14,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,R1,88,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+15,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,R1,101,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+16,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,R1,104,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+17,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,R1,108,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+0,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,R1,4,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+1,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,R1,8,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+2,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,R1,11,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+3,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,R1,19,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+4,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,R1,24,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+5,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,R1,34,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+6,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,R1,38,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+7,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,R1,41,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+8,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,R1,49,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+9,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,R1,54,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+10,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,R1,64,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+11,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,R1,68,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+12,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,R1,71,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+13,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,R1,79,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+14,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,R1,84,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+15,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,R1,94,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+16,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,R1,98,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+17,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,R1,101,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+18,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,R1,109,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+19,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,R1,114,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+20,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,R1,124,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+21,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,R1,128,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+22,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,R1,131,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+23,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,R1,139,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+24,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,R1,144,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+25,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,R1,154,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+26,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,R1,158,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+27,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,R1,161,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+28,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,R1,169,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+29,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,R1,174,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+0,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,R1,0,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+1,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,R1,5,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+2,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,R1,8,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+3,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,R1,16,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+4,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,R1,21,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+5,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,R1,24,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+6,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,R1,32,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+7,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,R1,37,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+8,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,R1,40,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+9,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+10,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,R1,53,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+11,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,R1,56,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+12,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,R1,64,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+13,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,R1,69,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+14,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,R1,72,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+15,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,R1,80,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+16,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,R1,85,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+17,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,R1,88,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+0,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,R1,4,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+1,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,R1,8,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+2,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,R1,11,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+3,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,R1,19,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+4,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,R1,24,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+5,A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,R1,29,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+6,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,R1,39,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+7,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+8,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,R1,46,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+9,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,R1,54,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+10,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,R1,59,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+11,A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,R1,64,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+12,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,R1,74,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+13,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,R1,78,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+14,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,R1,81,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+15,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,R1,89,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+16,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,R1,94,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+17,A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,R1,99,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+18,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,R1,109,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+19,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,R1,113,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+20,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,R1,116,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+21,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,R1,124,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+22,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,R1,129,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+23,A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,R1,134,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+24,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,R1,144,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+25,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,R1,148,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+26,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,R1,151,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+27,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,R1,159,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+28,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,R1,164,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+29,A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.61266666667,R1,169,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+30,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,R1,179,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+31,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,R1,183,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+32,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,R1,186,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+33,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,R1,194,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+34,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,R1,199,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+35,A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.40844444444,R1,204,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+0,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,R1,1,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+1,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,R1,4,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+2,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,R1,8,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+3,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,R1,17,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+4,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,R1,20,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+5,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,R1,24,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+6,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,R1,33,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+7,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,R1,36,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+8,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,R1,40,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+9,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,R1,49,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+10,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,R1,52,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+11,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,R1,56,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+12,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,R1,65,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+13,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,R1,68,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+14,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,R1,72,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+15,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,R1,81,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+16,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,R1,84,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+17,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,R1,88,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+0,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,R1,4,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+1,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,R1,8,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+2,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,R1,11,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+3,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,R1,19,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+4,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,R1,24,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+5,A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,R1,29,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+6,A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,R1,34,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+7,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,R1,49,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+8,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,R1,53,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+9,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,R1,56,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+10,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,R1,64,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+11,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,R1,69,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+12,A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,R1,74,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+13,A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,R1,79,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+14,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.22222222222,R1,94,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+15,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,R1,98,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+16,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,R1,101,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+17,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,R1,109,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+18,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,R1,114,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+19,A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,R1,119,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+20,A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,R1,124,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+21,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.33333333333,R1,139,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+22,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,R1,143,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+23,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,R1,146,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+24,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,R1,154,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+25,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,R1,159,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+26,A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,R1,164,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+27,A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,R1,169,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+28,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.66666666667,R1,184,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+29,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,R1,188,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+30,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,R1,191,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+31,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,R1,199,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+32,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,R1,204,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+33,A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.61266666667,R1,209,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+34,A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,R1,214,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+35,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.44444444444,R1,229,2020.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+36,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,R1,233,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+37,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,R1,236,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+38,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,R1,244,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+39,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,R1,249,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+40,A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.40844444444,R1,254,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+41,A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,R1,259,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+0,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,R1,0,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+1,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,R1,4,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+2,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,R1,12,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+3,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,R1,16,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+4,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,R1,24,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+5,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,R1,28,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+6,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,R1,36,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+7,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,R1,40,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+8,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,R1,48,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+9,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.53333333333,R1,52,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+10,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,R1,60,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+11,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.02222222222,R1,64,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+0,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,R1,1,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+1,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,R1,9,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+2,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,R1,14,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+3,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,R1,19,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+4,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,R1,24,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+5,A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.37577777778,R1,29,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+6,A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,R1,33,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+7,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,R1,41,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+8,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,R1,49,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+9,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,R1,54,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+10,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,R1,59,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+11,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,R1,64,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+12,A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.56366666667,R1,69,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+13,A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,R1,73,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+14,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.25050000000,R1,81,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+15,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.05333333333,R1,89,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+16,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,R1,94,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+17,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.20422222222,R1,99,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+18,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.13333333333,R1,104,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+19,A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.37577777778,R1,109,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+20,A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15000000000,R1,113,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+21,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.37575000000,R1,121,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+22,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.08000000000,R1,129,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+23,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,R1,134,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+24,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.30633333333,R1,139,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+25,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.20000000000,R1,144,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+26,A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.56366666667,R1,149,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+27,A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22500000000,R1,153,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+28,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.75150000000,R1,161,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+29,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.16000000000,R1,169,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+30,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,R1,174,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+31,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.61266666667,R1,179,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+32,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.40000000000,R1,184,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+33,A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,solar,1.12733333333,R1,189,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+34,A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.45000000000,R1,193,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+35,A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.50100000000,R1,201,2025.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+36,A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.10666666667,R1,209,2025.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+37,A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,R1,214,2030.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+38,A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.40844444444,R1,219,2035.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+39,A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.26666666667,R1,224,2040.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+40,A1,5.00000000000,retrofit,CONSUMABLE|ENERGY,solar,0.75155555556,R1,229,2045.00000000000,R1,power,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+41,A1,6.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.30000000000,R1,233,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
diff --git a/docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Supply.csv b/docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Supply.csv
index 93ccbd1ef..33284fc1d 100644
--- a/docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Supply.csv
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCAMetric_Supply.csv
@@ -1,481 +1,439 @@
 ,agent,asset,category,comm_usage,commodity,dst_region,index,installed,region,sector,supply,technology,timeslice,units_prices,year
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,4,2020.00000000000,R1,residential,1.00000000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-1,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,6,2020.00000000000,R1,residential,64.71000000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2020.00000000000,R1,residential,1.50000000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,14,2020.00000000000,R1,residential,97.06500000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,20,2020.00000000000,R1,residential,1.00000000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2020.00000000000,R1,residential,64.71000000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2020.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,28,2020.00000000000,R1,residential,1.50000000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,30,2020.00000000000,R1,residential,97.06500000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,36,2020.00000000000,R1,residential,3.00000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,38,2020.00000000000,R1,residential,194.13000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2020.00000000000,R1,residential,2.00000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,46,2020.00000000000,R1,residential,129.42000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,1.16000000000,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-1,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2020.00000000000,R1,gas,1.74000000000,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,1.16000000000,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2020.00000000000,R1,gas,1.74000000000,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,3.48000000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2020.00000000000,R1,gas,2.32000000000,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-4,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2020.00000000000,R1,residential,0.83333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2020.00000000000,R1,residential,3.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-14,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,76,2020.00000000000,R1,residential,53.92500000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2020.00000000000,R1,residential,0.55555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-17,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2020.00000000000,R1,residential,35.95000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.05000000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2020.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2020.00000000000,R1,power,0.15000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,10,2020.00000000000,R1,power,4.58350000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,25,2020.00000000000,R1,power,0.07500000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,26,2020.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,27,2020.00000000000,R1,power,0.22500000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,35,2020.00000000000,R1,power,6.87525000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2020.00000000000,R1,power,0.05000000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,51,2020.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,52,2020.00000000000,R1,power,0.15000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2020.00000000000,R1,power,4.58350000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2020.00000000000,R1,power,0.07500000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,76,2020.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,77,2020.00000000000,R1,power,0.22500000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,85,2020.00000000000,R1,power,6.87525000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,100,2020.00000000000,R1,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,101,2020.00000000000,R1,power,0.66666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,102,2020.00000000000,R1,power,0.45000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-19,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,110,2020.00000000000,R1,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,125,2020.00000000000,R1,power,0.10000000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,126,2020.00000000000,R1,power,0.44444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,127,2020.00000000000,R1,power,0.30000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-23,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,135,2020.00000000000,R1,power,9.16700000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.40572222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-1,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,0.60858333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,0.40572222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,0.60858333333,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2020.00000000000,R1,gas,1.21716666667,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2020.00000000000,R1,gas,0.81144444444,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,13,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,26,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,29,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,45,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,58,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,61,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2020.00000000000,R1,residential,3.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2025.00000000000,R1,residential,0.68333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2025.00000000000,R1,residential,1.15000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,77,2025.00000000000,R1,residential,44.21850000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2025.00000000000,R1,residential,0.45555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2025.00000000000,R1,residential,0.76666666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,93,2025.00000000000,R1,residential,29.47900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2020.00000000000,R1,power,0.15000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2025.00000000000,R1,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2025.00000000000,R1,power,0.05333333333,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-4,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2025.00000000000,R1,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,25,2020.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-6,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,26,2020.00000000000,R1,power,0.22500000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,27,2025.00000000000,R1,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-8,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,28,2025.00000000000,R1,power,0.08000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-9,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,37,2025.00000000000,R1,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2020.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,51,2020.00000000000,R1,power,0.15000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,52,2025.00000000000,R1,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,53,2025.00000000000,R1,power,0.05333333333,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,62,2025.00000000000,R1,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2020.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,76,2020.00000000000,R1,power,0.22500000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,77,2025.00000000000,R1,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-18,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,78,2025.00000000000,R1,power,0.08000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-19,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,87,2025.00000000000,R1,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,100,2020.00000000000,R1,power,0.66666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,101,2020.00000000000,R1,power,0.45000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,102,2025.00000000000,R1,power,0.45000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,103,2025.00000000000,R1,power,0.16000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-24,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,112,2025.00000000000,R1,power,41.25150000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-25,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,125,2020.00000000000,R1,power,0.44444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-26,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,126,2020.00000000000,R1,power,0.30000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,127,2025.00000000000,R1,power,0.30000000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-28,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,128,2025.00000000000,R1,power,0.10666666667,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,137,2025.00000000000,R1,power,27.50100000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.37500000000,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2025.00000000000,R1,gas,0.13972222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2020.00000000000,R1,gas,0.56250000000,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2025.00000000000,R1,gas,0.20958333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,0.37500000000,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2025.00000000000,R1,gas,0.13972222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2020.00000000000,R1,gas,0.56250000000,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2025.00000000000,R1,gas,0.20958333333,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,12,2020.00000000000,R1,gas,1.12500000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,13,2025.00000000000,R1,gas,0.41916666667,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,15,2020.00000000000,R1,gas,0.75000000000,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,16,2025.00000000000,R1,gas,0.27944444444,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,11,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,15,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,32,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,35,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,50,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,51,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,52,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,55,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,70,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,71,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,75,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2025.00000000000,R1,residential,0.68333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,91,2025.00000000000,R1,residential,1.15000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,92,2030.00000000000,R1,residential,4.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-19,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,95,2025.00000000000,R1,residential,44.21850000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,110,2025.00000000000,R1,residential,0.45555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,111,2025.00000000000,R1,residential,0.76666666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,112,2030.00000000000,R1,residential,2.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-23,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,115,2025.00000000000,R1,residential,29.47900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2020.00000000000,R1,power,0.15000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2025.00000000000,R1,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2025.00000000000,R1,power,0.05333333333,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2030.00000000000,R1,power,0.13333333333,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-5,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,18,2025.00000000000,R1,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,40,2020.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,41,2020.00000000000,R1,power,0.22500000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,42,2025.00000000000,R1,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,43,2025.00000000000,R1,power,0.08000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,44,2030.00000000000,R1,power,0.20000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,58,2025.00000000000,R1,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,80,2020.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,81,2020.00000000000,R1,power,0.15000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,82,2025.00000000000,R1,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,83,2025.00000000000,R1,power,0.05333333333,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,84,2030.00000000000,R1,power,0.13333333333,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,98,2025.00000000000,R1,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2020.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2020.00000000000,R1,power,0.22500000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,122,2025.00000000000,R1,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2025.00000000000,R1,power,0.08000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,124,2030.00000000000,R1,power,0.20000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-23,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,138,2025.00000000000,R1,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,160,2020.00000000000,R1,power,0.66666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,161,2020.00000000000,R1,power,0.45000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,162,2025.00000000000,R1,power,0.45000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,163,2025.00000000000,R1,power,0.16000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,164,2030.00000000000,R1,power,0.40000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-29,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,178,2025.00000000000,R1,power,41.25150000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,200,2020.00000000000,R1,power,0.44444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,201,2020.00000000000,R1,power,0.30000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,202,2025.00000000000,R1,power,0.30000000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,203,2025.00000000000,R1,power,0.10666666667,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,204,2030.00000000000,R1,power,0.26666666667,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-35,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,218,2025.00000000000,R1,power,27.50100000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2025.00000000000,R1,gas,0.13972222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2030.00000000000,R1,gas,0.37500000000,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2025.00000000000,R1,gas,0.20958333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2030.00000000000,R1,gas,0.56250000000,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2025.00000000000,R1,gas,0.13972222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.37500000000,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2025.00000000000,R1,gas,0.20958333333,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2030.00000000000,R1,gas,0.56250000000,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2025.00000000000,R1,gas,0.41916666667,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2030.00000000000,R1,gas,1.12500000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2025.00000000000,R1,gas,0.27944444444,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,11,2030.00000000000,R1,gas,0.75000000000,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,13,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,26,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,29,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,45,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,58,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-15,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,61,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2030.00000000000,R1,residential,4.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2035.00000000000,R1,residential,0.15166666667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2035.00000000000,R1,residential,2.68166666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,77,2035.00000000000,R1,residential,9.81435000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2030.00000000000,R1,residential,2.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2035.00000000000,R1,residential,0.10111111111,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2035.00000000000,R1,residential,1.78777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-23,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,93,2035.00000000000,R1,residential,6.54290000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.18160523292,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2020.00000000000,R1,power,0.12258353222,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2025.00000000000,R1,power,0.12258353222,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2025.00000000000,R1,power,0.04358525590,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2030.00000000000,R1,power,0.10896313975,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,5,2035.00000000000,R1,power,0.02960165297,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,6,2035.00000000000,R1,power,0.18160523292,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-7,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,7,2035.00000000000,R1,power,0.12258353222,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,18,2025.00000000000,R1,power,11.23723239857,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-9,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,21,2035.00000000000,R1,power,2.71358352736,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,40,2020.00000000000,R1,power,0.27240784938,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,41,2020.00000000000,R1,power,0.18387529833,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,42,2025.00000000000,R1,power,0.18387529833,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,43,2025.00000000000,R1,power,0.06537788385,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-14,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,44,2030.00000000000,R1,power,0.16344470963,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-15,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,45,2035.00000000000,R1,power,0.04440247945,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-16,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,46,2035.00000000000,R1,power,0.27240784938,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-17,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,47,2035.00000000000,R1,power,0.18387529833,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,58,2025.00000000000,R1,power,16.85584859785,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-19,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,61,2035.00000000000,R1,power,4.07037529104,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,80,2020.00000000000,R1,power,0.18160523292,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,81,2020.00000000000,R1,power,0.12258353222,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,82,2025.00000000000,R1,power,0.12258353222,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,83,2025.00000000000,R1,power,0.04358525590,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-24,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,84,2030.00000000000,R1,power,0.10896313975,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-25,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,85,2035.00000000000,R1,power,0.02960165297,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-26,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,86,2035.00000000000,R1,power,0.18160523292,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-27,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,87,2035.00000000000,R1,power,0.12258353222,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-28,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,98,2025.00000000000,R1,power,11.23723239857,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,101,2035.00000000000,R1,power,2.71358352736,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2020.00000000000,R1,power,0.27240784938,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2020.00000000000,R1,power,0.18387529833,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,122,2025.00000000000,R1,power,0.18387529833,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2025.00000000000,R1,power,0.06537788385,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,124,2030.00000000000,R1,power,0.16344470963,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-35,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,125,2035.00000000000,R1,power,0.04440247945,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-36,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,126,2035.00000000000,R1,power,0.27240784938,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-37,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,127,2035.00000000000,R1,power,0.18387529833,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,138,2025.00000000000,R1,power,16.85584859785,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-39,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,141,2035.00000000000,R1,power,4.07037529104,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,160,2020.00000000000,R1,power,0.54481569875,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,161,2020.00000000000,R1,power,0.36775059666,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,162,2025.00000000000,R1,power,0.36775059666,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,163,2025.00000000000,R1,power,0.13075576770,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,164,2030.00000000000,R1,power,0.32688941925,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-45,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,165,2035.00000000000,R1,power,0.08880495890,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-46,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,166,2035.00000000000,R1,power,0.54481569875,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-47,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,167,2035.00000000000,R1,power,0.36775059666,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-48,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,178,2025.00000000000,R1,power,33.71169719570,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-49,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,181,2035.00000000000,R1,power,8.14075058207,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-50,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,200,2020.00000000000,R1,power,0.36321046584,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-51,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,201,2020.00000000000,R1,power,0.24516706444,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-52,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,202,2025.00000000000,R1,power,0.24516706444,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-53,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,203,2025.00000000000,R1,power,0.08717051180,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-54,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,204,2030.00000000000,R1,power,0.21792627950,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-55,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,205,2035.00000000000,R1,power,0.05920330593,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-56,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,206,2035.00000000000,R1,power,0.36321046584,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-57,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,207,2035.00000000000,R1,power,0.24516706444,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,218,2025.00000000000,R1,power,22.47446479714,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-59,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,221,2035.00000000000,R1,power,5.42716705472,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2025.00000000000,R1,gas,0.08490838260,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2030.00000000000,R1,gas,0.22788532110,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2025.00000000000,R1,gas,0.12736257390,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2030.00000000000,R1,gas,0.34182798165,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2025.00000000000,R1,gas,0.08490838260,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.22788532110,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2025.00000000000,R1,gas,0.12736257390,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2030.00000000000,R1,gas,0.34182798165,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2025.00000000000,R1,gas,0.25472514781,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2030.00000000000,R1,gas,0.68365596330,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2025.00000000000,R1,gas,0.16981676521,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,11,2030.00000000000,R1,gas,0.45577064220,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,26,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-7,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-11,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,58,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2035.00000000000,R1,residential,0.15166666667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2035.00000000000,R1,residential,2.68166666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2040.00000000000,R1,residential,5.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-19,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,76,2035.00000000000,R1,residential,9.81435000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2035.00000000000,R1,residential,0.10111111111,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2035.00000000000,R1,residential,1.78777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2040.00000000000,R1,residential,3.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-23,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2035.00000000000,R1,residential,6.54290000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.20812339786,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2020.00000000000,R1,power,0.14048329356,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2025.00000000000,R1,power,0.14048329356,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2025.00000000000,R1,power,0.04994961549,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2030.00000000000,R1,power,0.12487403872,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,5,2035.00000000000,R1,power,0.03392411385,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,6,2035.00000000000,R1,power,0.20812339786,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-7,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,7,2035.00000000000,R1,power,0.14048329356,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2025.00000000000,R1,power,12.87810352029,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-9,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,25,2035.00000000000,R1,power,3.10982351675,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2020.00000000000,R1,power,0.31218509679,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,51,2020.00000000000,R1,power,0.21072494033,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,52,2025.00000000000,R1,power,0.21072494033,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,53,2025.00000000000,R1,power,0.07492442323,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-14,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,54,2030.00000000000,R1,power,0.18731105807,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-15,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,55,2035.00000000000,R1,power,0.05088617078,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-16,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,56,2035.00000000000,R1,power,0.31218509679,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-17,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,57,2035.00000000000,R1,power,0.21072494033,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,72,2025.00000000000,R1,power,19.31715528043,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-19,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,75,2035.00000000000,R1,power,4.66473527513,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,100,2020.00000000000,R1,power,0.20812339786,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,101,2020.00000000000,R1,power,0.14048329356,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,102,2025.00000000000,R1,power,0.14048329356,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,103,2025.00000000000,R1,power,0.04994961549,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-24,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,104,2030.00000000000,R1,power,0.12487403872,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-25,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,105,2035.00000000000,R1,power,0.03392411385,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-26,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,106,2035.00000000000,R1,power,0.20812339786,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-27,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,107,2035.00000000000,R1,power,0.14048329356,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-28,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,122,2025.00000000000,R1,power,12.87810352029,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,125,2035.00000000000,R1,power,3.10982351675,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,150,2020.00000000000,R1,power,0.31218509679,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,151,2020.00000000000,R1,power,0.21072494033,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,152,2025.00000000000,R1,power,0.21072494033,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,153,2025.00000000000,R1,power,0.07492442323,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,154,2030.00000000000,R1,power,0.18731105807,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-35,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,155,2035.00000000000,R1,power,0.05088617078,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-36,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,156,2035.00000000000,R1,power,0.31218509679,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-37,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,157,2035.00000000000,R1,power,0.21072494033,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-38,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,172,2025.00000000000,R1,power,19.31715528043,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-39,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,175,2035.00000000000,R1,power,4.66473527513,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,200,2020.00000000000,R1,power,0.62437019358,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,201,2020.00000000000,R1,power,0.42144988067,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,202,2025.00000000000,R1,power,0.42144988067,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,203,2025.00000000000,R1,power,0.14984884646,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,204,2030.00000000000,R1,power,0.37462211615,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-45,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,205,2035.00000000000,R1,power,0.10177234155,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-46,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,206,2035.00000000000,R1,power,0.62437019358,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-47,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,207,2035.00000000000,R1,power,0.42144988067,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-48,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,222,2025.00000000000,R1,power,38.63431056086,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-49,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,225,2035.00000000000,R1,power,9.32947055025,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-50,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,250,2020.00000000000,R1,power,0.41624679572,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-51,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,251,2020.00000000000,R1,power,0.28096658711,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-52,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,252,2025.00000000000,R1,power,0.28096658711,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-53,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,253,2025.00000000000,R1,power,0.09989923097,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-54,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,254,2030.00000000000,R1,power,0.24974807743,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-55,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,255,2035.00000000000,R1,power,0.06784822770,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-56,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,256,2035.00000000000,R1,power,0.41624679572,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-57,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,257,2035.00000000000,R1,power,0.28096658711,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-58,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,272,2025.00000000000,R1,power,25.75620704057,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-59,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,275,2035.00000000000,R1,power,6.21964703350,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2025.00000000000,R1,gas,0.09498225680,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2030.00000000000,R1,gas,0.25492255801,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2025.00000000000,R1,gas,0.14247338520,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2030.00000000000,R1,gas,0.38238383702,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2025.00000000000,R1,gas,0.09498225680,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.25492255801,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2025.00000000000,R1,gas,0.14247338520,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2030.00000000000,R1,gas,0.38238383702,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2025.00000000000,R1,gas,0.28494677040,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2030.00000000000,R1,gas,0.76476767404,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2025.00000000000,R1,gas,0.18996451360,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,11,2030.00000000000,R1,gas,0.50984511603,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,7,2045.00000000000,R1,residential,1.27777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2045.00000000000,R1,residential,1.91666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2045.00000000000,R1,residential,1.27777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2045.00000000000,R1,residential,1.91666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,54,2040.00000000000,R1,residential,5.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,55,2045.00000000000,R1,residential,3.83333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,66,2040.00000000000,R1,residential,3.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,67,2045.00000000000,R1,residential,2.55555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2025.00000000000,R1,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2025.00000000000,R1,power,0.05333333333,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2030.00000000000,R1,power,0.13333333333,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2035.00000000000,R1,power,0.03622222222,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2035.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,5,2035.00000000000,R1,power,0.15000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-6,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,6,2045.00000000000,R1,power,0.37577777778,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-7,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,7,2045.00000000000,R1,power,0.07911111111,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,18,2025.00000000000,R1,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,21,2035.00000000000,R1,power,3.32049111111,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,45,2025.00000000000,R1,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,46,2025.00000000000,R1,power,0.08000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,47,2030.00000000000,R1,power,0.20000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,48,2035.00000000000,R1,power,0.05433333333,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-14,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,49,2035.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-15,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2035.00000000000,R1,power,0.22500000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-16,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,51,2045.00000000000,R1,power,0.56366666667,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-17,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,52,2045.00000000000,R1,power,0.11866666667,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,63,2025.00000000000,R1,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,66,2035.00000000000,R1,power,4.98073666667,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,90,2025.00000000000,R1,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,91,2025.00000000000,R1,power,0.05333333333,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,92,2030.00000000000,R1,power,0.13333333333,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,93,2035.00000000000,R1,power,0.03622222222,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-24,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,94,2035.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-25,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,95,2035.00000000000,R1,power,0.15000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-26,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,96,2045.00000000000,R1,power,0.37577777778,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-27,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,97,2045.00000000000,R1,power,0.07911111111,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-28,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,108,2025.00000000000,R1,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-29,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,111,2035.00000000000,R1,power,3.32049111111,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,135,2025.00000000000,R1,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,136,2025.00000000000,R1,power,0.08000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,137,2030.00000000000,R1,power,0.20000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,138,2035.00000000000,R1,power,0.05433333333,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,139,2035.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-35,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,140,2035.00000000000,R1,power,0.22500000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-36,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,141,2045.00000000000,R1,power,0.56366666667,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-37,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,142,2045.00000000000,R1,power,0.11866666667,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-38,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,153,2025.00000000000,R1,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-39,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,156,2035.00000000000,R1,power,4.98073666667,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-40,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,180,2025.00000000000,R1,power,0.45000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-41,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,181,2025.00000000000,R1,power,0.16000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-42,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,182,2030.00000000000,R1,power,0.40000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-43,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,183,2035.00000000000,R1,power,0.10866666667,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-44,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,184,2035.00000000000,R1,power,0.66666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-45,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,185,2035.00000000000,R1,power,0.45000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-46,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,186,2045.00000000000,R1,power,1.12733333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-47,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,187,2045.00000000000,R1,power,0.23733333333,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-48,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,198,2025.00000000000,R1,power,41.25150000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-49,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,201,2035.00000000000,R1,power,9.96147333333,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-50,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,225,2025.00000000000,R1,power,0.30000000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-51,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,226,2025.00000000000,R1,power,0.10666666667,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-52,A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,227,2030.00000000000,R1,power,0.26666666667,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-53,A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,228,2035.00000000000,R1,power,0.07244444444,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-54,A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,229,2035.00000000000,R1,power,0.44444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-55,A1,5.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,230,2035.00000000000,R1,power,0.30000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-56,A1,6.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,231,2045.00000000000,R1,power,0.75155555556,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-57,A1,7.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,232,2045.00000000000,R1,power,0.15822222222,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-58,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,243,2025.00000000000,R1,power,27.50100000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-59,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,246,2035.00000000000,R1,power,6.64098222222,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2025.00000000000,R1,gas,0.08441906578,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2030.00000000000,R1,gas,0.22657204533,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2025.00000000000,R1,gas,0.12662859867,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2030.00000000000,R1,gas,0.33985806800,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2025.00000000000,R1,gas,0.08441906578,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.22657204533,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2025.00000000000,R1,gas,0.12662859867,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2030.00000000000,R1,gas,0.33985806800,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2025.00000000000,R1,gas,0.25325719734,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2030.00000000000,R1,gas,0.67971613600,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2025.00000000000,R1,gas,0.16883813156,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,11,2030.00000000000,R1,gas,0.45314409066,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,4,2020.00000000000,R1,residential,1.00000000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
+1,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,6,2020.00000000000,R1,residential,64.71000000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
+2,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,12,2020.00000000000,R1,residential,1.50000000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
+3,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,14,2020.00000000000,R1,residential,97.06500000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
+4,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,20,2020.00000000000,R1,residential,1.00000000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
+5,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,22,2020.00000000000,R1,residential,64.71000000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2020.00000000000
+6,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,28,2020.00000000000,R1,residential,1.50000000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
+7,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,30,2020.00000000000,R1,residential,97.06500000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
+8,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,36,2020.00000000000,R1,residential,3.00000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
+9,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,38,2020.00000000000,R1,residential,194.13000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
+10,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,44,2020.00000000000,R1,residential,2.00000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
+11,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,46,2020.00000000000,R1,residential,129.42000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,1.16000000000,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
+1,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2020.00000000000,R1,gas,1.74000000000,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
+2,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,1.16000000000,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
+3,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2020.00000000000,R1,gas,1.74000000000,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
+4,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,3.48000000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
+5,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2020.00000000000,R1,gas,2.32000000000,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,8,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,9,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+2,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,12,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+3,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,24,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+4,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,25,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+5,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,28,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+6,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,40,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+7,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,41,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+8,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,44,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+9,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,56,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+10,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,57,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+11,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,60,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+12,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,72,2020.00000000000,R1,residential,0.83333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+13,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,73,2020.00000000000,R1,residential,3.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+14,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,76,2020.00000000000,R1,residential,53.92500000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+15,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2020.00000000000,R1,residential,0.55555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+16,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,89,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+17,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,92,2020.00000000000,R1,residential,35.95000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.05000000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+2,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2020.00000000000,R1,power,0.15000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+3,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,10,2020.00000000000,R1,power,4.58350000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+4,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2020.00000000000,R1,power,0.07500000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+5,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,26,2020.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+6,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,27,2020.00000000000,R1,power,0.22500000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+7,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,35,2020.00000000000,R1,power,6.87525000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+8,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,50,2020.00000000000,R1,power,0.05000000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+9,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,51,2020.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+10,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,52,2020.00000000000,R1,power,0.15000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+11,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,60,2020.00000000000,R1,power,4.58350000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+12,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,75,2020.00000000000,R1,power,0.07500000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+13,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,76,2020.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+14,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,77,2020.00000000000,R1,power,0.22500000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+15,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,85,2020.00000000000,R1,power,6.87525000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+16,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,100,2020.00000000000,R1,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+17,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,101,2020.00000000000,R1,power,0.66666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+18,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,102,2020.00000000000,R1,power,0.45000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+19,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,110,2020.00000000000,R1,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+20,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,125,2020.00000000000,R1,power,0.10000000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+21,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,126,2020.00000000000,R1,power,0.44444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+22,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,127,2020.00000000000,R1,power,0.30000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+23,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,135,2020.00000000000,R1,power,9.16700000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.40572222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+1,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,0.60858333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+2,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,0.40572222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+3,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2020.00000000000,R1,gas,0.60858333333,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+4,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,8,2020.00000000000,R1,gas,1.21716666667,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+5,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2020.00000000000,R1,gas,0.81144444444,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,8,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,9,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+2,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,10,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+3,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,13,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+4,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,24,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+5,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,25,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+6,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,26,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+7,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,29,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+8,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,40,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+9,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,41,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+10,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,42,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+11,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,45,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+12,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,56,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+13,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,57,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+14,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,58,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+15,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,61,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+16,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,72,2020.00000000000,R1,residential,3.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+17,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,73,2025.00000000000,R1,residential,0.68333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+18,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,74,2025.00000000000,R1,residential,1.15000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+19,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,77,2025.00000000000,R1,residential,44.21850000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+20,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+21,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,89,2025.00000000000,R1,residential,0.45555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+22,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,90,2025.00000000000,R1,residential,0.76666666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+23,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,93,2025.00000000000,R1,residential,29.47900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.15000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+2,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+3,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2025.00000000000,R1,power,0.05333333333,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+4,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,12,2025.00000000000,R1,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+5,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2020.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+6,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,26,2020.00000000000,R1,power,0.22500000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+7,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,27,2025.00000000000,R1,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+8,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,28,2025.00000000000,R1,power,0.08000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+9,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,37,2025.00000000000,R1,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+10,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,50,2020.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+11,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,51,2020.00000000000,R1,power,0.15000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+12,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,52,2025.00000000000,R1,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+13,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,53,2025.00000000000,R1,power,0.05333333333,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+14,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,62,2025.00000000000,R1,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+15,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,75,2020.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+16,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,76,2020.00000000000,R1,power,0.22500000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+17,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,77,2025.00000000000,R1,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+18,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,78,2025.00000000000,R1,power,0.08000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+19,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,87,2025.00000000000,R1,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+20,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,100,2020.00000000000,R1,power,0.66666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+21,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,101,2020.00000000000,R1,power,0.45000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+22,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,102,2025.00000000000,R1,power,0.45000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+23,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,103,2025.00000000000,R1,power,0.16000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+24,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,112,2025.00000000000,R1,power,41.25150000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+25,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,125,2020.00000000000,R1,power,0.44444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+26,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,126,2020.00000000000,R1,power,0.30000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+27,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,127,2025.00000000000,R1,power,0.30000000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+28,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,128,2025.00000000000,R1,power,0.10666666667,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+29,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,137,2025.00000000000,R1,power,27.50100000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.37500000000,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2025.00000000000,R1,gas,0.13972222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+2,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2020.00000000000,R1,gas,0.56250000000,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+3,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2025.00000000000,R1,gas,0.20958333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+4,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2020.00000000000,R1,gas,0.37500000000,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+5,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,7,2025.00000000000,R1,gas,0.13972222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+6,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,9,2020.00000000000,R1,gas,0.56250000000,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+7,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2025.00000000000,R1,gas,0.20958333333,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+8,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,12,2020.00000000000,R1,gas,1.12500000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+9,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,13,2025.00000000000,R1,gas,0.41916666667,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+10,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,15,2020.00000000000,R1,gas,0.75000000000,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+11,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,16,2025.00000000000,R1,gas,0.27944444444,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,10,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,11,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+2,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,12,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+3,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,15,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+4,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,30,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+5,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,31,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+6,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,32,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+7,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,35,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+8,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,50,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+9,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,51,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+10,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,52,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+11,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,55,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+12,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,70,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+13,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,71,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+14,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,72,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+15,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,75,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+16,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,90,2025.00000000000,R1,residential,0.68333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+17,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,91,2025.00000000000,R1,residential,1.15000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+18,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,92,2030.00000000000,R1,residential,4.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+19,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,95,2025.00000000000,R1,residential,44.21850000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+20,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,110,2025.00000000000,R1,residential,0.45555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+21,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,111,2025.00000000000,R1,residential,0.76666666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+22,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,112,2030.00000000000,R1,residential,2.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+23,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,115,2025.00000000000,R1,residential,29.47900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.15000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+2,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+3,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2025.00000000000,R1,power,0.05333333333,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+4,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,4,2030.00000000000,R1,power,0.13333333333,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+5,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,14,2025.00000000000,R1,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+6,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,30,2020.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+7,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,31,2020.00000000000,R1,power,0.22500000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+8,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,32,2025.00000000000,R1,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+9,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,33,2025.00000000000,R1,power,0.08000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+10,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,34,2030.00000000000,R1,power,0.20000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+11,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,44,2025.00000000000,R1,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+12,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+13,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,61,2020.00000000000,R1,power,0.15000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+14,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,62,2025.00000000000,R1,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+15,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,63,2025.00000000000,R1,power,0.05333333333,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+16,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,64,2030.00000000000,R1,power,0.13333333333,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+17,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,74,2025.00000000000,R1,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+18,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,90,2020.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+19,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,91,2020.00000000000,R1,power,0.22500000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+20,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,92,2025.00000000000,R1,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+21,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,93,2025.00000000000,R1,power,0.08000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+22,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,94,2030.00000000000,R1,power,0.20000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+23,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,104,2025.00000000000,R1,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+24,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,120,2020.00000000000,R1,power,0.66666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+25,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,121,2020.00000000000,R1,power,0.45000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+26,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,122,2025.00000000000,R1,power,0.45000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+27,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,123,2025.00000000000,R1,power,0.16000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+28,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,124,2030.00000000000,R1,power,0.40000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+29,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,134,2025.00000000000,R1,power,41.25150000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+30,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,150,2020.00000000000,R1,power,0.44444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+31,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,151,2020.00000000000,R1,power,0.30000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+32,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,152,2025.00000000000,R1,power,0.30000000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+33,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,153,2025.00000000000,R1,power,0.10666666667,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+34,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,154,2030.00000000000,R1,power,0.26666666667,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+35,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,164,2025.00000000000,R1,power,27.50100000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2025.00000000000,R1,gas,0.13972222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2030.00000000000,R1,gas,0.37500000000,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+2,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2025.00000000000,R1,gas,0.20958333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+3,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2030.00000000000,R1,gas,0.56250000000,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+4,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2025.00000000000,R1,gas,0.13972222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+5,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2030.00000000000,R1,gas,0.37500000000,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+6,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2025.00000000000,R1,gas,0.20958333333,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+7,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,7,2030.00000000000,R1,gas,0.56250000000,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+8,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,8,2025.00000000000,R1,gas,0.41916666667,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+9,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,9,2030.00000000000,R1,gas,1.12500000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+10,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2025.00000000000,R1,gas,0.27944444444,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+11,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,11,2030.00000000000,R1,gas,0.75000000000,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,8,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,9,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+2,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,10,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+3,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,13,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+4,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,24,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+5,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,25,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+6,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,26,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+7,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,29,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+8,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,40,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+9,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,41,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+10,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,42,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+11,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,45,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+12,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,56,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+13,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,57,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+14,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,58,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+15,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,61,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+16,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,72,2030.00000000000,R1,residential,4.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+17,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,73,2035.00000000000,R1,residential,0.15166666667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+18,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,74,2035.00000000000,R1,residential,2.68166666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+19,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,77,2035.00000000000,R1,residential,9.81435000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+20,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2030.00000000000,R1,residential,2.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+21,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,89,2035.00000000000,R1,residential,0.10111111111,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+22,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,90,2035.00000000000,R1,residential,1.78777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+23,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,93,2035.00000000000,R1,residential,6.54290000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.15000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+2,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+3,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2025.00000000000,R1,power,0.05333333333,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+4,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,4,2030.00000000000,R1,power,0.13333333333,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+5,A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,5,2035.00000000000,R1,power,0.20422222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+6,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,16,2025.00000000000,R1,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+7,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,35,2020.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+8,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,36,2020.00000000000,R1,power,0.22500000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+9,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,37,2025.00000000000,R1,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+10,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,38,2025.00000000000,R1,power,0.08000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+11,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,39,2030.00000000000,R1,power,0.20000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+12,A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,40,2035.00000000000,R1,power,0.30633333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+13,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,51,2025.00000000000,R1,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+14,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,70,2020.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+15,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,71,2020.00000000000,R1,power,0.15000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+16,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,72,2025.00000000000,R1,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+17,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,73,2025.00000000000,R1,power,0.05333333333,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+18,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,74,2030.00000000000,R1,power,0.13333333333,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+19,A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,75,2035.00000000000,R1,power,0.20422222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+20,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,86,2025.00000000000,R1,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+21,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,105,2020.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+22,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,106,2020.00000000000,R1,power,0.22500000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+23,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,107,2025.00000000000,R1,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+24,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,108,2025.00000000000,R1,power,0.08000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+25,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,109,2030.00000000000,R1,power,0.20000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+26,A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,110,2035.00000000000,R1,power,0.30633333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+27,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,121,2025.00000000000,R1,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+28,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,140,2020.00000000000,R1,power,0.66666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+29,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,141,2020.00000000000,R1,power,0.45000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+30,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,142,2025.00000000000,R1,power,0.45000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+31,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,143,2025.00000000000,R1,power,0.16000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+32,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,144,2030.00000000000,R1,power,0.40000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+33,A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,145,2035.00000000000,R1,power,0.61266666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+34,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,156,2025.00000000000,R1,power,41.25150000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+35,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,175,2020.00000000000,R1,power,0.44444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+36,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,176,2020.00000000000,R1,power,0.30000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+37,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,177,2025.00000000000,R1,power,0.30000000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+38,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,178,2025.00000000000,R1,power,0.10666666667,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+39,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,179,2030.00000000000,R1,power,0.26666666667,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+40,A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,180,2035.00000000000,R1,power,0.40844444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+41,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,191,2025.00000000000,R1,power,27.50100000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2025.00000000000,R1,gas,0.08391778497,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2030.00000000000,R1,gas,0.22522665947,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+2,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2025.00000000000,R1,gas,0.12587667746,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+3,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2030.00000000000,R1,gas,0.33783998921,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+4,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2025.00000000000,R1,gas,0.08391778497,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+5,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2030.00000000000,R1,gas,0.22522665947,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+6,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2025.00000000000,R1,gas,0.12587667746,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+7,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,7,2030.00000000000,R1,gas,0.33783998921,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+8,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,8,2025.00000000000,R1,gas,0.25175335492,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+9,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,9,2030.00000000000,R1,gas,0.67567997841,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+10,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2025.00000000000,R1,gas,0.16783556995,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+11,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,11,2030.00000000000,R1,gas,0.45045331894,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,8,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,9,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+2,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,10,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+3,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,12,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+4,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,24,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+5,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,25,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+6,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,26,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+7,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,28,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+8,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,40,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+9,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,41,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+10,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,42,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+11,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,44,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+12,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,56,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+13,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,57,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+14,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,58,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+15,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,60,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+16,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,72,2035.00000000000,R1,residential,0.15166666667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+17,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,73,2035.00000000000,R1,residential,2.68166666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+18,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,74,2040.00000000000,R1,residential,5.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+19,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,76,2035.00000000000,R1,residential,9.81435000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+20,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2035.00000000000,R1,residential,0.10111111111,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+21,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,89,2035.00000000000,R1,residential,1.78777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+22,A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,90,2040.00000000000,R1,residential,3.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+23,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,92,2035.00000000000,R1,residential,6.54290000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.15000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+2,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2025.00000000000,R1,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+3,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2025.00000000000,R1,power,0.05333333333,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+4,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,4,2030.00000000000,R1,power,0.13333333333,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+5,A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,5,2035.00000000000,R1,power,0.20422222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+6,A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,6,2040.00000000000,R1,power,0.13333333333,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+7,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,20,2025.00000000000,R1,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+8,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,45,2020.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+9,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,46,2020.00000000000,R1,power,0.22500000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+10,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,47,2025.00000000000,R1,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+11,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2025.00000000000,R1,power,0.08000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+12,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2030.00000000000,R1,power,0.20000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+13,A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,50,2035.00000000000,R1,power,0.30633333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+14,A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,51,2040.00000000000,R1,power,0.20000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+15,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,65,2025.00000000000,R1,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+16,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,90,2020.00000000000,R1,power,0.22222222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+17,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,91,2020.00000000000,R1,power,0.15000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+18,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,92,2025.00000000000,R1,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+19,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,93,2025.00000000000,R1,power,0.05333333333,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+20,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,94,2030.00000000000,R1,power,0.13333333333,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+21,A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,95,2035.00000000000,R1,power,0.20422222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+22,A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,96,2040.00000000000,R1,power,0.13333333333,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+23,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,110,2025.00000000000,R1,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+24,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,135,2020.00000000000,R1,power,0.33333333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+25,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,136,2020.00000000000,R1,power,0.22500000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+26,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,137,2025.00000000000,R1,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+27,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,138,2025.00000000000,R1,power,0.08000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+28,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,139,2030.00000000000,R1,power,0.20000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+29,A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,140,2035.00000000000,R1,power,0.30633333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+30,A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,141,2040.00000000000,R1,power,0.20000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+31,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,155,2025.00000000000,R1,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+32,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,180,2020.00000000000,R1,power,0.66666666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+33,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,181,2020.00000000000,R1,power,0.45000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+34,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,182,2025.00000000000,R1,power,0.45000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+35,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,183,2025.00000000000,R1,power,0.16000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+36,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,184,2030.00000000000,R1,power,0.40000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+37,A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,185,2035.00000000000,R1,power,0.61266666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+38,A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,186,2040.00000000000,R1,power,0.40000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+39,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,200,2025.00000000000,R1,power,41.25150000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+40,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,225,2020.00000000000,R1,power,0.44444444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+41,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,226,2020.00000000000,R1,power,0.30000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+42,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,227,2025.00000000000,R1,power,0.30000000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+43,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,228,2025.00000000000,R1,power,0.10666666667,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+44,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,229,2030.00000000000,R1,power,0.26666666667,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+45,A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,230,2035.00000000000,R1,power,0.40844444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+46,A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,231,2040.00000000000,R1,power,0.26666666667,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+47,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,245,2025.00000000000,R1,power,27.50100000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2025.00000000000,R1,gas,0.08391778497,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2030.00000000000,R1,gas,0.22522665947,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+2,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2025.00000000000,R1,gas,0.12587667746,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+3,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2030.00000000000,R1,gas,0.33783998921,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+4,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2025.00000000000,R1,gas,0.08391778497,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+5,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2030.00000000000,R1,gas,0.22522665947,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+6,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2025.00000000000,R1,gas,0.12587667746,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+7,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,7,2030.00000000000,R1,gas,0.33783998921,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+8,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,8,2025.00000000000,R1,gas,0.25175335492,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+9,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,9,2030.00000000000,R1,gas,0.67567997841,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+10,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2025.00000000000,R1,gas,0.16783556995,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+11,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,11,2030.00000000000,R1,gas,0.45045331894,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,6,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,7,2045.00000000000,R1,residential,1.27777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+2,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,18,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+3,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,19,2045.00000000000,R1,residential,1.91666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+4,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,30,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+5,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,31,2045.00000000000,R1,residential,1.27777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+6,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,42,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+7,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,43,2045.00000000000,R1,residential,1.91666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+8,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,54,2040.00000000000,R1,residential,5.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+9,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,55,2045.00000000000,R1,residential,3.83333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+10,A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,66,2040.00000000000,R1,residential,3.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+11,A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,67,2045.00000000000,R1,residential,2.55555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2025.00000000000,R1,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2025.00000000000,R1,power,0.05333333333,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+2,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2030.00000000000,R1,power,0.13333333333,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+3,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2035.00000000000,R1,power,0.20422222222,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+4,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,4,2040.00000000000,R1,power,0.13333333333,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+5,A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,5,2045.00000000000,R1,power,0.37577777778,solarPV,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+6,A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,6,2045.00000000000,R1,power,0.15000000000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+7,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,16,2025.00000000000,R1,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+8,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,40,2025.00000000000,R1,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+9,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,41,2025.00000000000,R1,power,0.08000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+10,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,42,2030.00000000000,R1,power,0.20000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+11,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,43,2035.00000000000,R1,power,0.30633333333,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+12,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,44,2040.00000000000,R1,power,0.20000000000,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+13,A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,45,2045.00000000000,R1,power,0.56366666667,solarPV,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+14,A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,46,2045.00000000000,R1,power,0.22500000000,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+15,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,56,2025.00000000000,R1,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+16,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,80,2025.00000000000,R1,power,0.15000000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+17,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,81,2025.00000000000,R1,power,0.05333333333,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+18,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,82,2030.00000000000,R1,power,0.13333333333,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+19,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,83,2035.00000000000,R1,power,0.20422222222,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+20,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,84,2040.00000000000,R1,power,0.13333333333,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+21,A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,85,2045.00000000000,R1,power,0.37577777778,solarPV,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+22,A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,86,2045.00000000000,R1,power,0.15000000000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+23,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,96,2025.00000000000,R1,power,13.75050000000,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+24,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,120,2025.00000000000,R1,power,0.22500000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+25,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,121,2025.00000000000,R1,power,0.08000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+26,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,122,2030.00000000000,R1,power,0.20000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+27,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,123,2035.00000000000,R1,power,0.30633333333,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+28,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,124,2040.00000000000,R1,power,0.20000000000,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+29,A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,125,2045.00000000000,R1,power,0.56366666667,solarPV,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+30,A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,126,2045.00000000000,R1,power,0.22500000000,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+31,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,136,2025.00000000000,R1,power,20.62575000000,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+32,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,160,2025.00000000000,R1,power,0.45000000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+33,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,161,2025.00000000000,R1,power,0.16000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+34,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,162,2030.00000000000,R1,power,0.40000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+35,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,163,2035.00000000000,R1,power,0.61266666667,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+36,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,164,2040.00000000000,R1,power,0.40000000000,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+37,A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,165,2045.00000000000,R1,power,1.12733333333,solarPV,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+38,A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,166,2045.00000000000,R1,power,0.45000000000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+39,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,176,2025.00000000000,R1,power,41.25150000000,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+40,A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,200,2025.00000000000,R1,power,0.30000000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+41,A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,201,2025.00000000000,R1,power,0.10666666667,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+42,A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,202,2030.00000000000,R1,power,0.26666666667,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+43,A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,203,2035.00000000000,R1,power,0.40844444444,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+44,A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,204,2040.00000000000,R1,power,0.26666666667,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+45,A1,5.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,205,2045.00000000000,R1,power,0.75155555556,solarPV,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+46,A1,6.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,206,2045.00000000000,R1,power,0.30000000000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+47,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,216,2025.00000000000,R1,power,27.50100000000,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2025.00000000000,R1,gas,0.06799865084,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2030.00000000000,R1,gas,0.18250134916,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+2,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2025.00000000000,R1,gas,0.10199797625,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+3,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2030.00000000000,R1,gas,0.27375202375,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+4,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2025.00000000000,R1,gas,0.06799865084,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+5,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2030.00000000000,R1,gas,0.18250134916,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+6,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2025.00000000000,R1,gas,0.10199797625,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+7,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,7,2030.00000000000,R1,gas,0.27375202375,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+8,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,8,2025.00000000000,R1,gas,0.20399595251,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+9,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,9,2030.00000000000,R1,gas,0.54750404749,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+10,A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2025.00000000000,R1,gas,0.13599730167,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+11,A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,11,2030.00000000000,R1,gas,0.36500269833,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
diff --git a/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv b/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv
index f4d602c4c..c303e3a98 100644
--- a/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv
+++ b/docs/tutorial-code/0-new-decision-metric/Results/MCAPrices.csv
@@ -95,75 +95,75 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
 "('all-year', 'all-week', 'evening')",heat,R1,0.43510000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.54820000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.53940000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
 "('all-year', 'all-week', 'night')",heat,R1,0.08340000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.82330000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.81000000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
 "('all-year', 'all-week', 'morning')",heat,R1,0.14110000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.54820000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.53940000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
 "('all-year', 'all-week', 'afternoon')",heat,R1,0.08340000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.82330000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.81000000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.14110000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.65240000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.62590000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
 "('all-year', 'all-week', 'late-peak')",heat,R1,0.37940000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.09900000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,1.08140000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
 "('all-year', 'all-week', 'evening')",heat,R1,0.20970000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.67220000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.59490000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.08880000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.08850000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.00930000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.89320000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.14950000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.14870000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.67220000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.59490000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08880000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.08850000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.00930000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.89320000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14950000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.14870000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.02460000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.79150000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.39710000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.39400000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,1.34710000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,1.19200000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.22110000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.21970000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.74920000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.62940000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.05090000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.04780000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.12470000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.94490000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.09660000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.08970000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.74920000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.62940000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05090000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04780000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.12470000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.94490000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09660000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.08970000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.25490000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.89420000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.31510000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.28710000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.50080000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,1.26080000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.15590000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.14350000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/0-new-decision-metric/settings.toml b/docs/tutorial-code/0-new-decision-metric/settings.toml
index 3e0e8f9c0..50058a1a6 100644
--- a/docs/tutorial-code/0-new-decision-metric/settings.toml
+++ b/docs/tutorial-code/0-new-decision-metric/settings.toml
@@ -16,22 +16,22 @@ tolerance_unmet_demand = -0.1
 [[outputs]]
 quantity = "prices"
 sink = "aggregate"
-filename = "{path}/{default_output_dir}/MCA{Quantity}.csv"
+filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 
 [[outputs]]
 quantity = "capacity"
 sink = "aggregate"
-filename = "{path}/{default_output_dir}/MCA{Quantity}.csv"
+filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 
 [[outputs]]
 quantity = "timeslice_consumption"
 sink = "aggregate"
-filename = "{path}/{default_output_dir}/MCA{Quantity}.csv"
+filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 
 [[outputs]]
 quantity = "timeslice_supply"
 sink = "aggregate"
-filename = "{path}/{default_output_dir}/MCA{Quantity}.csv"
+filename = "{cwd}/{default_output_dir}/MCA{Quantity}.csv"
 
 # Carbon budget control
 [carbon_budget_control]
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2020.csv
index fdbb2d279..d1ee882b2 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2020.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2020.csv
@@ -1,4 +1,4 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gassupply1,15.00000000000
-0,2025,R1,2020,gassupply1,15.00000000000
-0,2030,R1,2020,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2030.csv
index 298f6c891..e84ef6dc7 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2030.csv
@@ -1,15 +1,15 @@
-asset,year,region,installed,technology,capacity
-0,2030,R1,2020,gassupply1,7.50000000000
-1,2030,R1,2025,gassupply1,2.79440000000
-1,2035,R1,2025,gassupply1,2.79440000000
-1,2040,R1,2025,gassupply1,2.79440000000
-1,2045,R1,2025,gassupply1,2.79440000000
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2035,R1,2030,gassupply1,7.50000000000
-2,2040,R1,2030,gassupply1,7.50000000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2030,R1,gassupply1,2025,2.79440000000
+1,2035,R1,gassupply1,2025,2.79440000000
+1,2040,R1,gassupply1,2025,2.79440000000
+1,2045,R1,gassupply1,2025,2.79440000000
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2035,R1,gassupply1,2030,7.50000000000
+2,2040,R1,gassupply1,2030,7.50000000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2035.csv
index e368dd50c..ccf34c3db 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2035.csv
@@ -1,13 +1,13 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2025,gassupply1,2.79440000000
-1,2040,R1,2025,gassupply1,2.79440000000
-1,2045,R1,2025,gassupply1,2.79440000000
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2035,R1,2030,gassupply1,7.50000000000
-2,2040,R1,2030,gassupply1,7.50000000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2035,R1,gassupply1,2025,2.79440000000
+1,2040,R1,gassupply1,2025,2.79440000000
+1,2045,R1,gassupply1,2025,2.79440000000
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2035,R1,gassupply1,2030,7.50000000000
+2,2040,R1,gassupply1,2030,7.50000000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2040.csv
index 4d55f6f79..79fdfddb6 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2040.csv
@@ -1,11 +1,11 @@
-asset,year,region,installed,technology,capacity
-1,2040,R1,2025,gassupply1,2.79440000000
-1,2045,R1,2025,gassupply1,2.79440000000
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2040,R1,2030,gassupply1,7.50000000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2040,R1,gassupply1,2025,2.79440000000
+1,2045,R1,gassupply1,2025,2.79440000000
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2040,R1,gassupply1,2030,7.50000000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2045.csv
index e5d560fce..b2ca194fb 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2045.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-1,2045,R1,2025,gassupply1,2.79440000000
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2045,R1,gassupply1,2025,2.79440000000
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2050.csv
index 4a7d05fa4..4f3e3a180 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Gas/Capacity/2050.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2055,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2055,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2055,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2055,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCACapacity.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCACapacity.csv
index 9d868b1dd..6a9a31487 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCACapacity.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCACapacity.csv
@@ -31,12 +31,10 @@ gasboiler,R1,R1,A1,residential,retrofit,2040,0.91000000000
 heatpump,R1,R1,A1,residential,retrofit,2040,25.00000000000
 heatpump,R1,R1,A1,residential,retrofit,2040,16.09000000000
 gasCCGT,R1,R1,A1,power,retrofit,2040,3.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2040,0.72440000000
 solarPV,R1,R1,A1,power,retrofit,2040,10.00000000000
 solarPV,R1,R1,A1,power,retrofit,2040,2.40000000000
 solarPV,R1,R1,A1,power,retrofit,2040,6.00000000000
-solarPV,R1,R1,A1,power,retrofit,2040,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2040,9.19000000000
 windturbine,R1,R1,A1,power,retrofit,2040,6.75000000000
 gassupply1,R1,R1,A1,gas,retrofit,2040,2.79440000000
 gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
@@ -44,24 +42,22 @@ gasboiler,R1,R1,A1,residential,retrofit,2045,0.91000000000
 heatpump,R1,R1,A1,residential,retrofit,2045,16.09000000000
 heatpump,R1,R1,A1,residential,retrofit,2045,31.00000000000
 gasCCGT,R1,R1,A1,power,retrofit,2045,3.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2045,0.72440000000
 solarPV,R1,R1,A1,power,retrofit,2045,10.00000000000
 solarPV,R1,R1,A1,power,retrofit,2045,2.40000000000
 solarPV,R1,R1,A1,power,retrofit,2045,6.00000000000
-solarPV,R1,R1,A1,power,retrofit,2045,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,6.75000000000
+solarPV,R1,R1,A1,power,retrofit,2045,9.19000000000
+solarPV,R1,R1,A1,power,retrofit,2045,6.00000000000
 windturbine,R1,R1,A1,power,retrofit,2045,6.75000000000
 gassupply1,R1,R1,A1,gas,retrofit,2045,2.79440000000
 gassupply1,R1,R1,A1,gas,retrofit,2045,7.50000000000
 heatpump,R1,R1,A1,residential,retrofit,2050,31.00000000000
 heatpump,R1,R1,A1,residential,retrofit,2050,23.00000000000
 gasCCGT,R1,R1,A1,power,retrofit,2050,3.00000000000
-gasCCGT,R1,R1,A1,power,retrofit,2050,0.72440000000
 solarPV,R1,R1,A1,power,retrofit,2050,2.40000000000
 solarPV,R1,R1,A1,power,retrofit,2050,6.00000000000
-solarPV,R1,R1,A1,power,retrofit,2050,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2050,9.19000000000
+solarPV,R1,R1,A1,power,retrofit,2050,6.00000000000
 solarPV,R1,R1,A1,power,retrofit,2050,16.91000000000
 windturbine,R1,R1,A1,power,retrofit,2050,6.75000000000
-windturbine,R1,R1,A1,power,retrofit,2050,3.56000000000
 gassupply1,R1,R1,A1,gas,retrofit,2050,2.79440000000
 gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCAPrices.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCAPrices.csv
index f4d602c4c..c303e3a98 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCAPrices.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/MCAPrices.csv
@@ -95,75 +95,75 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
 "('all-year', 'all-week', 'evening')",heat,R1,0.43510000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.54820000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.53940000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
 "('all-year', 'all-week', 'night')",heat,R1,0.08340000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.82330000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.81000000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
 "('all-year', 'all-week', 'morning')",heat,R1,0.14110000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.54820000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.53940000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
 "('all-year', 'all-week', 'afternoon')",heat,R1,0.08340000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.82330000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.81000000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.14110000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.65240000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.62590000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
 "('all-year', 'all-week', 'late-peak')",heat,R1,0.37940000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.09900000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,1.08140000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
 "('all-year', 'all-week', 'evening')",heat,R1,0.20970000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.67220000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.59490000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.08880000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.08850000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,1.00930000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.89320000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.14950000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.14870000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.67220000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.59490000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08880000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.08850000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.00930000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.89320000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14950000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.14870000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.02460000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.79150000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.39710000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.39400000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,1.34710000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,1.19200000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.22110000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.21970000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.74920000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.62940000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.05090000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.04780000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,1.12470000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.94490000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.09660000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.08970000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.74920000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.62940000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.05090000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04780000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,1.12470000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.94490000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.09660000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.08970000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,2.25490000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.89420000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.31510000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.28710000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.50080000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,1.26080000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.15590000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.14350000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2020.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2020.csv
index beea1d344..e62bab810 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2020.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2020.csv
@@ -1,15 +1,15 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gasCCGT,1.00000000000
-0,2025,R1,2020,gasCCGT,1.00000000000
-1,2025,R1,2020,solarPV,10.00000000000
-1,2030,R1,2020,solarPV,10.00000000000
-1,2035,R1,2020,solarPV,10.00000000000
-1,2040,R1,2020,solarPV,10.00000000000
-1,2045,R1,2020,solarPV,10.00000000000
-1,2049,R1,2020,solarPV,10.00000000000
-2,2025,R1,2020,windturbine,6.75000000000
-2,2030,R1,2020,windturbine,6.75000000000
-2,2035,R1,2020,windturbine,6.75000000000
-2,2040,R1,2020,windturbine,6.75000000000
-2,2045,R1,2020,windturbine,6.75000000000
-2,2049,R1,2020,windturbine,6.75000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2025,R1,solarPV,2020,10.00000000000
+1,2030,R1,solarPV,2020,10.00000000000
+1,2035,R1,solarPV,2020,10.00000000000
+1,2040,R1,solarPV,2020,10.00000000000
+1,2045,R1,solarPV,2020,10.00000000000
+1,2049,R1,solarPV,2020,10.00000000000
+2,2025,R1,windturbine,2020,6.75000000000
+2,2030,R1,windturbine,2020,6.75000000000
+2,2035,R1,windturbine,2020,6.75000000000
+2,2040,R1,windturbine,2020,6.75000000000
+2,2045,R1,windturbine,2020,6.75000000000
+2,2049,R1,windturbine,2020,6.75000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2030.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2030.csv
index 26ce8db80..f1d62d693 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2030.csv
@@ -1,37 +1,37 @@
-asset,year,region,installed,technology,capacity
-1,2030,R1,2020,solarPV,10.00000000000
-1,2035,R1,2020,solarPV,10.00000000000
-1,2040,R1,2020,solarPV,10.00000000000
-1,2045,R1,2020,solarPV,10.00000000000
-1,2049,R1,2020,solarPV,10.00000000000
-2,2030,R1,2020,windturbine,6.75000000000
-2,2035,R1,2020,windturbine,6.75000000000
-2,2040,R1,2020,windturbine,6.75000000000
-2,2045,R1,2020,windturbine,6.75000000000
-2,2049,R1,2020,windturbine,6.75000000000
-3,2030,R1,2025,gasCCGT,3.00000000000
-3,2035,R1,2025,gasCCGT,3.00000000000
-3,2040,R1,2025,gasCCGT,3.00000000000
-3,2045,R1,2025,gasCCGT,3.00000000000
-3,2049,R1,2025,gasCCGT,3.00000000000
-3,2050,R1,2025,gasCCGT,3.00000000000
-3,2054,R1,2025,gasCCGT,3.00000000000
-3,2055,R1,2025,gasCCGT,3.00000000000
-3,2059,R1,2025,gasCCGT,3.00000000000
-3,2060,R1,2025,gasCCGT,3.00000000000
-3,2064,R1,2025,gasCCGT,3.00000000000
-4,2030,R1,2025,solarPV,2.40000000000
-4,2035,R1,2025,solarPV,2.40000000000
-4,2040,R1,2025,solarPV,2.40000000000
-4,2045,R1,2025,solarPV,2.40000000000
-4,2049,R1,2025,solarPV,2.40000000000
-4,2050,R1,2025,solarPV,2.40000000000
-4,2054,R1,2025,solarPV,2.40000000000
-5,2035,R1,2030,solarPV,6.00000000000
-5,2040,R1,2030,solarPV,6.00000000000
-5,2045,R1,2030,solarPV,6.00000000000
-5,2049,R1,2030,solarPV,6.00000000000
-5,2050,R1,2030,solarPV,6.00000000000
-5,2054,R1,2030,solarPV,6.00000000000
-5,2055,R1,2030,solarPV,6.00000000000
-5,2059,R1,2030,solarPV,6.00000000000
+asset,year,region,technology,installed,capacity
+1,2030,R1,gasCCGT,2025,3.00000000000
+1,2035,R1,gasCCGT,2025,3.00000000000
+1,2040,R1,gasCCGT,2025,3.00000000000
+1,2045,R1,gasCCGT,2025,3.00000000000
+1,2049,R1,gasCCGT,2025,3.00000000000
+1,2050,R1,gasCCGT,2025,3.00000000000
+1,2054,R1,gasCCGT,2025,3.00000000000
+1,2055,R1,gasCCGT,2025,3.00000000000
+1,2059,R1,gasCCGT,2025,3.00000000000
+1,2060,R1,gasCCGT,2025,3.00000000000
+1,2064,R1,gasCCGT,2025,3.00000000000
+2,2030,R1,solarPV,2020,10.00000000000
+2,2035,R1,solarPV,2020,10.00000000000
+2,2040,R1,solarPV,2020,10.00000000000
+2,2045,R1,solarPV,2020,10.00000000000
+2,2049,R1,solarPV,2020,10.00000000000
+3,2030,R1,solarPV,2025,2.40000000000
+3,2035,R1,solarPV,2025,2.40000000000
+3,2040,R1,solarPV,2025,2.40000000000
+3,2045,R1,solarPV,2025,2.40000000000
+3,2049,R1,solarPV,2025,2.40000000000
+3,2050,R1,solarPV,2025,2.40000000000
+3,2054,R1,solarPV,2025,2.40000000000
+4,2035,R1,solarPV,2030,6.00000000000
+4,2040,R1,solarPV,2030,6.00000000000
+4,2045,R1,solarPV,2030,6.00000000000
+4,2049,R1,solarPV,2030,6.00000000000
+4,2050,R1,solarPV,2030,6.00000000000
+4,2054,R1,solarPV,2030,6.00000000000
+4,2055,R1,solarPV,2030,6.00000000000
+4,2059,R1,solarPV,2030,6.00000000000
+5,2030,R1,windturbine,2020,6.75000000000
+5,2035,R1,windturbine,2020,6.75000000000
+5,2040,R1,windturbine,2020,6.75000000000
+5,2045,R1,windturbine,2020,6.75000000000
+5,2049,R1,windturbine,2020,6.75000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2035.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2035.csv
index 3f21815e0..25a2d0fc4 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2035.csv
@@ -1,62 +1,42 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2020,solarPV,10.00000000000
-1,2040,R1,2020,solarPV,10.00000000000
-1,2045,R1,2020,solarPV,10.00000000000
-1,2049,R1,2020,solarPV,10.00000000000
-2,2035,R1,2020,windturbine,6.75000000000
-2,2040,R1,2020,windturbine,6.75000000000
-2,2045,R1,2020,windturbine,6.75000000000
-2,2049,R1,2020,windturbine,6.75000000000
-3,2035,R1,2025,gasCCGT,3.00000000000
-3,2040,R1,2025,gasCCGT,3.00000000000
-3,2045,R1,2025,gasCCGT,3.00000000000
-3,2049,R1,2025,gasCCGT,3.00000000000
-3,2050,R1,2025,gasCCGT,3.00000000000
-3,2054,R1,2025,gasCCGT,3.00000000000
-3,2055,R1,2025,gasCCGT,3.00000000000
-3,2059,R1,2025,gasCCGT,3.00000000000
-3,2060,R1,2025,gasCCGT,3.00000000000
-3,2064,R1,2025,gasCCGT,3.00000000000
-4,2035,R1,2025,solarPV,2.40000000000
-4,2040,R1,2025,solarPV,2.40000000000
-4,2045,R1,2025,solarPV,2.40000000000
-4,2049,R1,2025,solarPV,2.40000000000
-4,2050,R1,2025,solarPV,2.40000000000
-4,2054,R1,2025,solarPV,2.40000000000
-5,2035,R1,2030,solarPV,6.00000000000
-5,2040,R1,2030,solarPV,6.00000000000
-5,2045,R1,2030,solarPV,6.00000000000
-5,2049,R1,2030,solarPV,6.00000000000
-5,2050,R1,2030,solarPV,6.00000000000
-5,2054,R1,2030,solarPV,6.00000000000
-5,2055,R1,2030,solarPV,6.00000000000
-5,2059,R1,2030,solarPV,6.00000000000
-6,2040,R1,2035,gasCCGT,0.72440000000
-6,2045,R1,2035,gasCCGT,0.72440000000
-6,2049,R1,2035,gasCCGT,0.72440000000
-6,2050,R1,2035,gasCCGT,0.72440000000
-6,2054,R1,2035,gasCCGT,0.72440000000
-6,2055,R1,2035,gasCCGT,0.72440000000
-6,2059,R1,2035,gasCCGT,0.72440000000
-6,2060,R1,2035,gasCCGT,0.72440000000
-6,2064,R1,2035,gasCCGT,0.72440000000
-6,2065,R1,2035,gasCCGT,0.72440000000
-6,2074,R1,2035,gasCCGT,0.72440000000
-7,2040,R1,2035,solarPV,10.00000000000
-7,2045,R1,2035,solarPV,10.00000000000
-7,2049,R1,2035,solarPV,10.00000000000
-7,2050,R1,2035,solarPV,10.00000000000
-7,2054,R1,2035,solarPV,10.00000000000
-7,2055,R1,2035,solarPV,10.00000000000
-7,2059,R1,2035,solarPV,10.00000000000
-7,2060,R1,2035,solarPV,10.00000000000
-7,2064,R1,2035,solarPV,10.00000000000
-8,2040,R1,2035,windturbine,6.75000000000
-8,2045,R1,2035,windturbine,6.75000000000
-8,2049,R1,2035,windturbine,6.75000000000
-8,2050,R1,2035,windturbine,6.75000000000
-8,2054,R1,2035,windturbine,6.75000000000
-8,2055,R1,2035,windturbine,6.75000000000
-8,2059,R1,2035,windturbine,6.75000000000
-8,2060,R1,2035,windturbine,6.75000000000
-8,2064,R1,2035,windturbine,6.75000000000
+asset,year,region,technology,installed,capacity
+1,2035,R1,gasCCGT,2025,3.00000000000
+1,2040,R1,gasCCGT,2025,3.00000000000
+1,2045,R1,gasCCGT,2025,3.00000000000
+1,2049,R1,gasCCGT,2025,3.00000000000
+1,2050,R1,gasCCGT,2025,3.00000000000
+1,2054,R1,gasCCGT,2025,3.00000000000
+1,2055,R1,gasCCGT,2025,3.00000000000
+1,2059,R1,gasCCGT,2025,3.00000000000
+1,2060,R1,gasCCGT,2025,3.00000000000
+1,2064,R1,gasCCGT,2025,3.00000000000
+2,2035,R1,solarPV,2020,10.00000000000
+2,2040,R1,solarPV,2020,10.00000000000
+2,2045,R1,solarPV,2020,10.00000000000
+2,2049,R1,solarPV,2020,10.00000000000
+3,2035,R1,solarPV,2025,2.40000000000
+3,2040,R1,solarPV,2025,2.40000000000
+3,2045,R1,solarPV,2025,2.40000000000
+3,2049,R1,solarPV,2025,2.40000000000
+3,2050,R1,solarPV,2025,2.40000000000
+3,2054,R1,solarPV,2025,2.40000000000
+4,2035,R1,solarPV,2030,6.00000000000
+4,2040,R1,solarPV,2030,6.00000000000
+4,2045,R1,solarPV,2030,6.00000000000
+4,2049,R1,solarPV,2030,6.00000000000
+4,2050,R1,solarPV,2030,6.00000000000
+4,2054,R1,solarPV,2030,6.00000000000
+4,2055,R1,solarPV,2030,6.00000000000
+4,2059,R1,solarPV,2030,6.00000000000
+5,2040,R1,solarPV,2035,9.19000000000
+5,2045,R1,solarPV,2035,9.19000000000
+5,2049,R1,solarPV,2035,9.19000000000
+5,2050,R1,solarPV,2035,9.19000000000
+5,2054,R1,solarPV,2035,9.19000000000
+5,2055,R1,solarPV,2035,9.19000000000
+5,2059,R1,solarPV,2035,9.19000000000
+5,2060,R1,solarPV,2035,9.19000000000
+5,2064,R1,solarPV,2035,9.19000000000
+6,2035,R1,windturbine,2020,6.75000000000
+6,2040,R1,windturbine,2020,6.75000000000
+6,2045,R1,windturbine,2020,6.75000000000
+6,2049,R1,windturbine,2020,6.75000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2040.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2040.csv
index 0ab7f9bf1..c076a27c9 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2040.csv
@@ -1,57 +1,47 @@
-asset,year,region,installed,technology,capacity
-1,2040,R1,2020,solarPV,10.00000000000
-1,2045,R1,2020,solarPV,10.00000000000
-1,2049,R1,2020,solarPV,10.00000000000
-2,2040,R1,2020,windturbine,6.75000000000
-2,2045,R1,2020,windturbine,6.75000000000
-2,2049,R1,2020,windturbine,6.75000000000
-3,2040,R1,2025,gasCCGT,3.00000000000
-3,2045,R1,2025,gasCCGT,3.00000000000
-3,2049,R1,2025,gasCCGT,3.00000000000
-3,2050,R1,2025,gasCCGT,3.00000000000
-3,2054,R1,2025,gasCCGT,3.00000000000
-3,2055,R1,2025,gasCCGT,3.00000000000
-3,2059,R1,2025,gasCCGT,3.00000000000
-3,2060,R1,2025,gasCCGT,3.00000000000
-3,2064,R1,2025,gasCCGT,3.00000000000
-4,2040,R1,2025,solarPV,2.40000000000
-4,2045,R1,2025,solarPV,2.40000000000
-4,2049,R1,2025,solarPV,2.40000000000
-4,2050,R1,2025,solarPV,2.40000000000
-4,2054,R1,2025,solarPV,2.40000000000
-5,2040,R1,2030,solarPV,6.00000000000
-5,2045,R1,2030,solarPV,6.00000000000
-5,2049,R1,2030,solarPV,6.00000000000
-5,2050,R1,2030,solarPV,6.00000000000
-5,2054,R1,2030,solarPV,6.00000000000
-5,2055,R1,2030,solarPV,6.00000000000
-5,2059,R1,2030,solarPV,6.00000000000
-6,2040,R1,2035,gasCCGT,0.72440000000
-6,2045,R1,2035,gasCCGT,0.72440000000
-6,2049,R1,2035,gasCCGT,0.72440000000
-6,2050,R1,2035,gasCCGT,0.72440000000
-6,2054,R1,2035,gasCCGT,0.72440000000
-6,2055,R1,2035,gasCCGT,0.72440000000
-6,2059,R1,2035,gasCCGT,0.72440000000
-6,2060,R1,2035,gasCCGT,0.72440000000
-6,2064,R1,2035,gasCCGT,0.72440000000
-6,2065,R1,2035,gasCCGT,0.72440000000
-6,2074,R1,2035,gasCCGT,0.72440000000
-7,2040,R1,2035,solarPV,10.00000000000
-7,2045,R1,2035,solarPV,10.00000000000
-7,2049,R1,2035,solarPV,10.00000000000
-7,2050,R1,2035,solarPV,10.00000000000
-7,2054,R1,2035,solarPV,10.00000000000
-7,2055,R1,2035,solarPV,10.00000000000
-7,2059,R1,2035,solarPV,10.00000000000
-7,2060,R1,2035,solarPV,10.00000000000
-7,2064,R1,2035,solarPV,10.00000000000
-8,2040,R1,2035,windturbine,6.75000000000
-8,2045,R1,2035,windturbine,6.75000000000
-8,2049,R1,2035,windturbine,6.75000000000
-8,2050,R1,2035,windturbine,6.75000000000
-8,2054,R1,2035,windturbine,6.75000000000
-8,2055,R1,2035,windturbine,6.75000000000
-8,2059,R1,2035,windturbine,6.75000000000
-8,2060,R1,2035,windturbine,6.75000000000
-8,2064,R1,2035,windturbine,6.75000000000
+asset,year,region,technology,installed,capacity
+1,2040,R1,gasCCGT,2025,3.00000000000
+1,2045,R1,gasCCGT,2025,3.00000000000
+1,2049,R1,gasCCGT,2025,3.00000000000
+1,2050,R1,gasCCGT,2025,3.00000000000
+1,2054,R1,gasCCGT,2025,3.00000000000
+1,2055,R1,gasCCGT,2025,3.00000000000
+1,2059,R1,gasCCGT,2025,3.00000000000
+1,2060,R1,gasCCGT,2025,3.00000000000
+1,2064,R1,gasCCGT,2025,3.00000000000
+2,2040,R1,solarPV,2020,10.00000000000
+2,2045,R1,solarPV,2020,10.00000000000
+2,2049,R1,solarPV,2020,10.00000000000
+3,2040,R1,solarPV,2025,2.40000000000
+3,2045,R1,solarPV,2025,2.40000000000
+3,2049,R1,solarPV,2025,2.40000000000
+3,2050,R1,solarPV,2025,2.40000000000
+3,2054,R1,solarPV,2025,2.40000000000
+4,2040,R1,solarPV,2030,6.00000000000
+4,2045,R1,solarPV,2030,6.00000000000
+4,2049,R1,solarPV,2030,6.00000000000
+4,2050,R1,solarPV,2030,6.00000000000
+4,2054,R1,solarPV,2030,6.00000000000
+4,2055,R1,solarPV,2030,6.00000000000
+4,2059,R1,solarPV,2030,6.00000000000
+5,2040,R1,solarPV,2035,9.19000000000
+5,2045,R1,solarPV,2035,9.19000000000
+5,2049,R1,solarPV,2035,9.19000000000
+5,2050,R1,solarPV,2035,9.19000000000
+5,2054,R1,solarPV,2035,9.19000000000
+5,2055,R1,solarPV,2035,9.19000000000
+5,2059,R1,solarPV,2035,9.19000000000
+5,2060,R1,solarPV,2035,9.19000000000
+5,2064,R1,solarPV,2035,9.19000000000
+6,2045,R1,solarPV,2040,6.00000000000
+6,2049,R1,solarPV,2040,6.00000000000
+6,2050,R1,solarPV,2040,6.00000000000
+6,2054,R1,solarPV,2040,6.00000000000
+6,2055,R1,solarPV,2040,6.00000000000
+6,2059,R1,solarPV,2040,6.00000000000
+6,2060,R1,solarPV,2040,6.00000000000
+6,2064,R1,solarPV,2040,6.00000000000
+6,2065,R1,solarPV,2040,6.00000000000
+6,2069,R1,solarPV,2040,6.00000000000
+7,2040,R1,windturbine,2020,6.75000000000
+7,2045,R1,windturbine,2020,6.75000000000
+7,2049,R1,windturbine,2020,6.75000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2045.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2045.csv
index 3d2ca0a40..3b950a241 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2045.csv
@@ -7,36 +7,36 @@ asset,year,region,technology,installed,capacity
 0,2059,R1,gasCCGT,2025,3.00000000000
 0,2060,R1,gasCCGT,2025,3.00000000000
 0,2064,R1,gasCCGT,2025,3.00000000000
-1,2045,R1,gasCCGT,2035,0.72440000000
-1,2049,R1,gasCCGT,2035,0.72440000000
-1,2050,R1,gasCCGT,2035,0.72440000000
-1,2054,R1,gasCCGT,2035,0.72440000000
-1,2055,R1,gasCCGT,2035,0.72440000000
-1,2059,R1,gasCCGT,2035,0.72440000000
-1,2060,R1,gasCCGT,2035,0.72440000000
-1,2064,R1,gasCCGT,2035,0.72440000000
-1,2065,R1,gasCCGT,2035,0.72440000000
-1,2074,R1,gasCCGT,2035,0.72440000000
-2,2045,R1,solarPV,2020,10.00000000000
-2,2049,R1,solarPV,2020,10.00000000000
-3,2045,R1,solarPV,2025,2.40000000000
-3,2049,R1,solarPV,2025,2.40000000000
-3,2050,R1,solarPV,2025,2.40000000000
-3,2054,R1,solarPV,2025,2.40000000000
-4,2045,R1,solarPV,2030,6.00000000000
-4,2049,R1,solarPV,2030,6.00000000000
-4,2050,R1,solarPV,2030,6.00000000000
-4,2054,R1,solarPV,2030,6.00000000000
-4,2055,R1,solarPV,2030,6.00000000000
-4,2059,R1,solarPV,2030,6.00000000000
-5,2045,R1,solarPV,2035,10.00000000000
-5,2049,R1,solarPV,2035,10.00000000000
-5,2050,R1,solarPV,2035,10.00000000000
-5,2054,R1,solarPV,2035,10.00000000000
-5,2055,R1,solarPV,2035,10.00000000000
-5,2059,R1,solarPV,2035,10.00000000000
-5,2060,R1,solarPV,2035,10.00000000000
-5,2064,R1,solarPV,2035,10.00000000000
+1,2045,R1,solarPV,2020,10.00000000000
+1,2049,R1,solarPV,2020,10.00000000000
+2,2045,R1,solarPV,2025,2.40000000000
+2,2049,R1,solarPV,2025,2.40000000000
+2,2050,R1,solarPV,2025,2.40000000000
+2,2054,R1,solarPV,2025,2.40000000000
+3,2045,R1,solarPV,2030,6.00000000000
+3,2049,R1,solarPV,2030,6.00000000000
+3,2050,R1,solarPV,2030,6.00000000000
+3,2054,R1,solarPV,2030,6.00000000000
+3,2055,R1,solarPV,2030,6.00000000000
+3,2059,R1,solarPV,2030,6.00000000000
+4,2045,R1,solarPV,2035,9.19000000000
+4,2049,R1,solarPV,2035,9.19000000000
+4,2050,R1,solarPV,2035,9.19000000000
+4,2054,R1,solarPV,2035,9.19000000000
+4,2055,R1,solarPV,2035,9.19000000000
+4,2059,R1,solarPV,2035,9.19000000000
+4,2060,R1,solarPV,2035,9.19000000000
+4,2064,R1,solarPV,2035,9.19000000000
+5,2045,R1,solarPV,2040,6.00000000000
+5,2049,R1,solarPV,2040,6.00000000000
+5,2050,R1,solarPV,2040,6.00000000000
+5,2054,R1,solarPV,2040,6.00000000000
+5,2055,R1,solarPV,2040,6.00000000000
+5,2059,R1,solarPV,2040,6.00000000000
+5,2060,R1,solarPV,2040,6.00000000000
+5,2064,R1,solarPV,2040,6.00000000000
+5,2065,R1,solarPV,2040,6.00000000000
+5,2069,R1,solarPV,2040,6.00000000000
 6,2050,R1,solarPV,2045,16.91000000000
 6,2054,R1,solarPV,2045,16.91000000000
 6,2055,R1,solarPV,2045,16.91000000000
@@ -44,22 +44,18 @@ asset,year,region,technology,installed,capacity
 6,2060,R1,solarPV,2045,16.91000000000
 6,2064,R1,solarPV,2045,16.91000000000
 6,2065,R1,solarPV,2045,16.91000000000
+6,2069,R1,solarPV,2045,16.91000000000
+6,2070,R1,solarPV,2045,16.91000000000
 6,2074,R1,solarPV,2045,16.91000000000
 7,2045,R1,windturbine,2020,6.75000000000
 7,2049,R1,windturbine,2020,6.75000000000
-8,2045,R1,windturbine,2035,6.75000000000
-8,2049,R1,windturbine,2035,6.75000000000
-8,2050,R1,windturbine,2035,6.75000000000
-8,2054,R1,windturbine,2035,6.75000000000
-8,2055,R1,windturbine,2035,6.75000000000
-8,2059,R1,windturbine,2035,6.75000000000
-8,2060,R1,windturbine,2035,6.75000000000
-8,2064,R1,windturbine,2035,6.75000000000
-9,2050,R1,windturbine,2045,3.56000000000
-9,2054,R1,windturbine,2045,3.56000000000
-9,2055,R1,windturbine,2045,3.56000000000
-9,2059,R1,windturbine,2045,3.56000000000
-9,2060,R1,windturbine,2045,3.56000000000
-9,2064,R1,windturbine,2045,3.56000000000
-9,2065,R1,windturbine,2045,3.56000000000
-9,2074,R1,windturbine,2045,3.56000000000
+8,2050,R1,windturbine,2045,6.75000000000
+8,2054,R1,windturbine,2045,6.75000000000
+8,2055,R1,windturbine,2045,6.75000000000
+8,2059,R1,windturbine,2045,6.75000000000
+8,2060,R1,windturbine,2045,6.75000000000
+8,2064,R1,windturbine,2045,6.75000000000
+8,2065,R1,windturbine,2045,6.75000000000
+8,2069,R1,windturbine,2045,6.75000000000
+8,2070,R1,windturbine,2045,6.75000000000
+8,2074,R1,windturbine,2045,6.75000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2050.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2050.csv
index 43ea9b829..449982307 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Power/Capacity/2050.csv
@@ -1,57 +1,57 @@
-asset,year,region,installed,technology,capacity
-2,2050,R1,2025,gasCCGT,3.00000000000
-2,2054,R1,2025,gasCCGT,3.00000000000
-2,2055,R1,2025,gasCCGT,3.00000000000
-2,2059,R1,2025,gasCCGT,3.00000000000
-2,2060,R1,2025,gasCCGT,3.00000000000
-2,2064,R1,2025,gasCCGT,3.00000000000
-3,2050,R1,2025,solarPV,2.40000000000
-3,2054,R1,2025,solarPV,2.40000000000
-4,2050,R1,2030,solarPV,6.00000000000
-4,2054,R1,2030,solarPV,6.00000000000
-4,2055,R1,2030,solarPV,6.00000000000
-4,2059,R1,2030,solarPV,6.00000000000
-5,2050,R1,2035,gasCCGT,0.72440000000
-5,2054,R1,2035,gasCCGT,0.72440000000
-5,2055,R1,2035,gasCCGT,0.72440000000
-5,2059,R1,2035,gasCCGT,0.72440000000
-5,2060,R1,2035,gasCCGT,0.72440000000
-5,2064,R1,2035,gasCCGT,0.72440000000
-5,2065,R1,2035,gasCCGT,0.72440000000
-5,2074,R1,2035,gasCCGT,0.72440000000
-6,2050,R1,2035,solarPV,10.00000000000
-6,2054,R1,2035,solarPV,10.00000000000
-6,2055,R1,2035,solarPV,10.00000000000
-6,2059,R1,2035,solarPV,10.00000000000
-6,2060,R1,2035,solarPV,10.00000000000
-6,2064,R1,2035,solarPV,10.00000000000
-7,2050,R1,2035,windturbine,6.75000000000
-7,2054,R1,2035,windturbine,6.75000000000
-7,2055,R1,2035,windturbine,6.75000000000
-7,2059,R1,2035,windturbine,6.75000000000
-7,2060,R1,2035,windturbine,6.75000000000
-7,2064,R1,2035,windturbine,6.75000000000
-8,2050,R1,2045,solarPV,16.91000000000
-8,2054,R1,2045,solarPV,16.91000000000
-8,2055,R1,2045,solarPV,16.91000000000
-8,2059,R1,2045,solarPV,16.91000000000
-8,2060,R1,2045,solarPV,16.91000000000
-8,2064,R1,2045,solarPV,16.91000000000
-8,2065,R1,2045,solarPV,16.91000000000
-8,2074,R1,2045,solarPV,16.91000000000
-9,2050,R1,2045,windturbine,3.56000000000
-9,2054,R1,2045,windturbine,3.56000000000
-9,2055,R1,2045,windturbine,3.56000000000
-9,2059,R1,2045,windturbine,3.56000000000
-9,2060,R1,2045,windturbine,3.56000000000
-9,2064,R1,2045,windturbine,3.56000000000
-9,2065,R1,2045,windturbine,3.56000000000
-9,2074,R1,2045,windturbine,3.56000000000
-10,2055,R1,2050,solarPV,2.40000000000
-10,2059,R1,2050,solarPV,2.40000000000
-10,2060,R1,2050,solarPV,2.40000000000
-10,2064,R1,2050,solarPV,2.40000000000
-10,2065,R1,2050,solarPV,2.40000000000
-10,2074,R1,2050,solarPV,2.40000000000
-10,2075,R1,2050,solarPV,2.40000000000
-10,2079,R1,2050,solarPV,2.40000000000
+asset,year,region,technology,installed,capacity
+0,2050,R1,gasCCGT,2025,3.00000000000
+0,2054,R1,gasCCGT,2025,3.00000000000
+0,2055,R1,gasCCGT,2025,3.00000000000
+0,2059,R1,gasCCGT,2025,3.00000000000
+0,2060,R1,gasCCGT,2025,3.00000000000
+0,2064,R1,gasCCGT,2025,3.00000000000
+2,2050,R1,solarPV,2025,2.40000000000
+2,2054,R1,solarPV,2025,2.40000000000
+3,2050,R1,solarPV,2030,6.00000000000
+3,2054,R1,solarPV,2030,6.00000000000
+3,2055,R1,solarPV,2030,6.00000000000
+3,2059,R1,solarPV,2030,6.00000000000
+4,2050,R1,solarPV,2035,9.19000000000
+4,2054,R1,solarPV,2035,9.19000000000
+4,2055,R1,solarPV,2035,9.19000000000
+4,2059,R1,solarPV,2035,9.19000000000
+4,2060,R1,solarPV,2035,9.19000000000
+4,2064,R1,solarPV,2035,9.19000000000
+5,2050,R1,solarPV,2040,6.00000000000
+5,2054,R1,solarPV,2040,6.00000000000
+5,2055,R1,solarPV,2040,6.00000000000
+5,2059,R1,solarPV,2040,6.00000000000
+5,2060,R1,solarPV,2040,6.00000000000
+5,2064,R1,solarPV,2040,6.00000000000
+5,2065,R1,solarPV,2040,6.00000000000
+5,2069,R1,solarPV,2040,6.00000000000
+6,2050,R1,solarPV,2045,16.91000000000
+6,2054,R1,solarPV,2045,16.91000000000
+6,2055,R1,solarPV,2045,16.91000000000
+6,2059,R1,solarPV,2045,16.91000000000
+6,2060,R1,solarPV,2045,16.91000000000
+6,2064,R1,solarPV,2045,16.91000000000
+6,2065,R1,solarPV,2045,16.91000000000
+6,2069,R1,solarPV,2045,16.91000000000
+6,2070,R1,solarPV,2045,16.91000000000
+6,2074,R1,solarPV,2045,16.91000000000
+7,2055,R1,solarPV,2050,2.40000000000
+7,2059,R1,solarPV,2050,2.40000000000
+7,2060,R1,solarPV,2050,2.40000000000
+7,2064,R1,solarPV,2050,2.40000000000
+7,2065,R1,solarPV,2050,2.40000000000
+7,2069,R1,solarPV,2050,2.40000000000
+7,2070,R1,solarPV,2050,2.40000000000
+7,2074,R1,solarPV,2050,2.40000000000
+7,2075,R1,solarPV,2050,2.40000000000
+7,2079,R1,solarPV,2050,2.40000000000
+9,2050,R1,windturbine,2045,6.75000000000
+9,2054,R1,windturbine,2045,6.75000000000
+9,2055,R1,windturbine,2045,6.75000000000
+9,2059,R1,windturbine,2045,6.75000000000
+9,2060,R1,windturbine,2045,6.75000000000
+9,2064,R1,windturbine,2045,6.75000000000
+9,2065,R1,windturbine,2045,6.75000000000
+9,2069,R1,windturbine,2045,6.75000000000
+9,2070,R1,windturbine,2045,6.75000000000
+9,2074,R1,windturbine,2045,6.75000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2050.csv
index 305b627b2..42f4be20c 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2050.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Capacity/2050.csv
@@ -1,11 +1,11 @@
-asset,year,region,installed,technology,capacity
-2,2050,R1,2040,heatpump,31.00000000000
-2,2054,R1,2040,heatpump,31.00000000000
-3,2050,R1,2045,heatpump,23.00000000000
-3,2054,R1,2045,heatpump,23.00000000000
-3,2055,R1,2045,heatpump,23.00000000000
-3,2059,R1,2045,heatpump,23.00000000000
-4,2055,R1,2050,heatpump,31.00000000000
-4,2059,R1,2050,heatpump,31.00000000000
-4,2060,R1,2050,heatpump,31.00000000000
-4,2064,R1,2050,heatpump,31.00000000000
+asset,year,region,technology,installed,capacity
+2,2050,R1,heatpump,2040,31.00000000000
+2,2054,R1,heatpump,2040,31.00000000000
+3,2050,R1,heatpump,2045,23.00000000000
+3,2054,R1,heatpump,2045,23.00000000000
+3,2055,R1,heatpump,2045,23.00000000000
+3,2059,R1,heatpump,2045,23.00000000000
+4,2055,R1,heatpump,2050,31.00000000000
+4,2059,R1,heatpump,2050,31.00000000000
+4,2060,R1,heatpump,2050,31.00000000000
+4,2064,R1,heatpump,2050,31.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2020.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2020.csv
index a44059a3e..7b8c4061d 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2020.csv
@@ -1,31 +1,31 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2020,0,R1,gasboiler,2020,all-year,all-week,night,1.00000000000
-0,heat,2025,0,R1,gasboiler,2020,all-year,all-week,night,0.27780000000
-0,heat,2025,1,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,night,64.71000000000
-0,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,night,17.97500000000
-1,heat,2020,0,R1,gasboiler,2020,all-year,all-week,morning,1.50000000000
-1,heat,2025,0,R1,gasboiler,2020,all-year,all-week,morning,0.41670000000
-1,heat,2025,1,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,morning,97.06500000000
-1,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,morning,26.96250000000
-2,heat,2020,0,R1,gasboiler,2020,all-year,all-week,afternoon,1.00000000000
-2,heat,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.27780000000
-2,heat,2025,1,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,afternoon,64.71000000000
-2,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,17.97500000000
-3,heat,2020,0,R1,gasboiler,2020,all-year,all-week,early-peak,1.50000000000
-3,heat,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.41670000000
-3,heat,2025,1,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,early-peak,97.06500000000
-3,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,26.96250000000
-4,heat,2020,0,R1,gasboiler,2020,all-year,all-week,late-peak,3.00000000000
-4,heat,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,0.83330000000
-4,heat,2025,1,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,late-peak,194.13000000000
-4,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,53.92500000000
-5,heat,2020,0,R1,gasboiler,2020,all-year,all-week,evening,2.00000000000
-5,heat,2025,0,R1,gasboiler,2020,all-year,all-week,evening,0.55560000000
-5,heat,2025,1,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,evening,129.42000000000
-5,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,evening,35.95000000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,1.00000000000
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,64.71000000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2025.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2025.csv
index c9ed8c00b..bfe116d0b 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2025.csv
@@ -1,43 +1,43 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2025,0,R1,gasboiler,2020,all-year,all-week,night,0.27780000000
-0,heat,2025,2,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,heat,2030,1,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2030,2,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,heat,2030,3,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,night,17.97500000000
-0,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-1,heat,2025,0,R1,gasboiler,2020,all-year,all-week,morning,0.41670000000
-1,heat,2025,2,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,heat,2030,1,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2030,2,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,heat,2030,3,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,morning,26.96250000000
-1,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-2,heat,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.27780000000
-2,heat,2025,2,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,heat,2030,1,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2030,2,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,heat,2030,3,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,17.97500000000
-2,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-3,heat,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.41670000000
-3,heat,2025,2,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,heat,2030,1,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2030,2,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,heat,2030,3,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,26.96250000000
-3,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-4,heat,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,0.83330000000
-4,heat,2025,2,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,heat,2030,1,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2030,2,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,heat,2030,3,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,53.92500000000
-4,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-5,heat,2025,0,R1,gasboiler,2020,all-year,all-week,evening,0.55560000000
-5,heat,2025,2,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,heat,2030,1,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2030,2,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,heat,2030,3,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,evening,35.95000000000
-5,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+0,heat,2025,2,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,3,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+1,heat,2025,2,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,3,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+2,heat,2025,2,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,3,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+3,heat,2025,2,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,3,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+4,heat,2025,2,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,3,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+5,heat,2025,2,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,3,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2030.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2030.csv
index 61ae11982..82873caab 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2030.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2030,0,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2030,1,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,heat,2030,2,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,heat,2035,0,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2035,2,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,heat,2035,3,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-0,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-1,heat,2030,0,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2030,1,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,heat,2030,2,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,heat,2035,0,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2035,2,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,heat,2035,3,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-1,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-2,heat,2030,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2030,1,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,heat,2030,2,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,heat,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2035,2,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,heat,2035,3,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-2,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-3,heat,2030,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2030,1,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,heat,2030,2,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,heat,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2035,2,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,heat,2035,3,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-3,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-4,heat,2030,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2030,1,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,heat,2030,2,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,heat,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2035,2,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,heat,2035,3,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-4,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-5,heat,2030,0,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2030,1,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,heat,2030,2,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,heat,2035,0,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2035,2,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,heat,2035,3,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
-5,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,CO2f,2030,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,CO2f,2030,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,CO2f,2030,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,CO2f,2030,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,CO2f,2030,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,CO2f,2030,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2035.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2035.csv
index 89e0bd4e1..741ea3c65 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2035.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2035,0,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2035,2,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,heat,2035,3,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,heat,2040,1,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2040,3,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,heat,2040,4,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-0,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-1,heat,2035,0,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2035,2,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,heat,2035,3,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,heat,2040,1,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2040,3,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,heat,2040,4,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-1,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-2,heat,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2035,2,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,heat,2035,3,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,heat,2040,1,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2040,3,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,heat,2040,4,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-2,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-3,heat,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2035,2,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,heat,2035,3,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,heat,2040,1,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2040,3,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,heat,2040,4,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-3,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-4,heat,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2035,2,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,heat,2035,3,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,heat,2040,1,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2040,3,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,heat,2040,4,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-4,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-5,heat,2035,0,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2035,2,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,heat,2035,3,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,heat,2040,1,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2040,3,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,heat,2040,4,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
-5,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,1,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+0,CO2f,2040,1,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,1,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+1,CO2f,2040,1,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,1,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+2,CO2f,2040,1,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,1,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+3,CO2f,2040,1,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,1,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+4,CO2f,2040,1,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,1,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
+5,CO2f,2040,1,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2040.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2040.csv
index 663e47a5a..c802f3409 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2040.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2040,0,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2040,1,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,heat,2040,2,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,heat,2045,0,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2045,2,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,heat,2045,3,R1,heatpump,2040,all-year,all-week,night,1.72220000000
-0,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-0,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-1,heat,2040,0,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2040,1,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,heat,2040,2,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,heat,2045,0,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2045,2,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,heat,2045,3,R1,heatpump,2040,all-year,all-week,morning,2.58330000000
-1,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-1,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-2,heat,2040,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2040,1,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,heat,2040,2,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,heat,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2045,2,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,heat,2045,3,R1,heatpump,2040,all-year,all-week,afternoon,1.72220000000
-2,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-2,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-3,heat,2040,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2040,1,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,heat,2040,2,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,heat,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2045,2,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,heat,2045,3,R1,heatpump,2040,all-year,all-week,early-peak,2.58330000000
-3,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-3,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-4,heat,2040,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2040,1,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,heat,2040,2,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,heat,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2045,2,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,heat,2045,3,R1,heatpump,2040,all-year,all-week,late-peak,5.16670000000
-4,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-4,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-5,heat,2040,0,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2040,1,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,heat,2040,2,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,heat,2045,0,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2045,2,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,heat,2045,3,R1,heatpump,2040,all-year,all-week,evening,3.44440000000
-5,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
-5,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2040,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2040,1,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,2,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,heat,2045,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2045,2,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,CO2f,2040,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+0,CO2f,2045,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+1,heat,2040,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2040,1,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,heat,2045,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2045,2,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,CO2f,2040,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+1,CO2f,2045,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+2,heat,2040,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2040,1,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,heat,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2045,2,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,CO2f,2040,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+2,CO2f,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+3,heat,2040,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2040,1,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,heat,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2045,2,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,CO2f,2040,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+3,CO2f,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+4,heat,2040,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2040,1,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,heat,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2045,2,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,CO2f,2040,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+4,CO2f,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+5,heat,2040,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2040,1,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,heat,2045,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2045,2,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,CO2f,2040,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
+5,CO2f,2045,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2045.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2045.csv
index 6e2884e67..c7be86b20 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2045.csv
@@ -1,37 +1,37 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2045,0,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2045,1,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,heat,2045,2,R1,heatpump,2040,all-year,all-week,night,1.72220000000
-0,heat,2050,2,R1,heatpump,2040,all-year,all-week,night,1.72220000000
-0,heat,2050,3,R1,heatpump,2045,all-year,all-week,night,1.27780000000
-0,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-1,heat,2045,0,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2045,1,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,heat,2045,2,R1,heatpump,2040,all-year,all-week,morning,2.58330000000
-1,heat,2050,2,R1,heatpump,2040,all-year,all-week,morning,2.58330000000
-1,heat,2050,3,R1,heatpump,2045,all-year,all-week,morning,1.91670000000
-1,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-2,heat,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2045,1,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,heat,2045,2,R1,heatpump,2040,all-year,all-week,afternoon,1.72220000000
-2,heat,2050,2,R1,heatpump,2040,all-year,all-week,afternoon,1.72220000000
-2,heat,2050,3,R1,heatpump,2045,all-year,all-week,afternoon,1.27780000000
-2,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-3,heat,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2045,1,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,heat,2045,2,R1,heatpump,2040,all-year,all-week,early-peak,2.58330000000
-3,heat,2050,2,R1,heatpump,2040,all-year,all-week,early-peak,2.58330000000
-3,heat,2050,3,R1,heatpump,2045,all-year,all-week,early-peak,1.91670000000
-3,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-4,heat,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2045,1,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,heat,2045,2,R1,heatpump,2040,all-year,all-week,late-peak,5.16670000000
-4,heat,2050,2,R1,heatpump,2040,all-year,all-week,late-peak,5.16670000000
-4,heat,2050,3,R1,heatpump,2045,all-year,all-week,late-peak,3.83330000000
-4,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-5,heat,2045,0,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2045,1,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,heat,2045,2,R1,heatpump,2040,all-year,all-week,evening,3.44440000000
-5,heat,2050,2,R1,heatpump,2040,all-year,all-week,evening,3.44440000000
-5,heat,2050,3,R1,heatpump,2045,all-year,all-week,evening,2.55560000000
-5,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2045,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2045,1,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,heat,2045,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,CO2f,2045,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+1,heat,2045,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2045,1,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,heat,2045,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,CO2f,2045,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+2,heat,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2045,1,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,heat,2045,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,CO2f,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+3,heat,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2045,1,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,heat,2045,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,CO2f,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+4,heat,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2045,1,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,heat,2045,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,CO2f,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+5,heat,2045,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2045,1,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,heat,2045,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,CO2f,2045,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2050.csv b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2050.csv
index 61004cae8..8c1871538 100644
--- a/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/1-add-new-technology/1-introduction/Results/Residential/Supply/2050.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,heat,2050,2,R1,2040,heatpump,all-year,all-week,night,1.72220000000
-0,heat,2050,3,R1,2045,heatpump,all-year,all-week,night,1.27780000000
-0,heat,2055,3,R1,2045,heatpump,all-year,all-week,night,1.27780000000
-0,heat,2055,4,R1,2050,heatpump,all-year,all-week,night,1.72220000000
-1,heat,2050,2,R1,2040,heatpump,all-year,all-week,morning,2.58330000000
-1,heat,2050,3,R1,2045,heatpump,all-year,all-week,morning,1.91670000000
-1,heat,2055,3,R1,2045,heatpump,all-year,all-week,morning,1.91670000000
-1,heat,2055,4,R1,2050,heatpump,all-year,all-week,morning,2.58330000000
-2,heat,2050,2,R1,2040,heatpump,all-year,all-week,afternoon,1.72220000000
-2,heat,2050,3,R1,2045,heatpump,all-year,all-week,afternoon,1.27780000000
-2,heat,2055,3,R1,2045,heatpump,all-year,all-week,afternoon,1.27780000000
-2,heat,2055,4,R1,2050,heatpump,all-year,all-week,afternoon,1.72220000000
-3,heat,2050,2,R1,2040,heatpump,all-year,all-week,early-peak,2.58330000000
-3,heat,2050,3,R1,2045,heatpump,all-year,all-week,early-peak,1.91670000000
-3,heat,2055,3,R1,2045,heatpump,all-year,all-week,early-peak,1.91670000000
-3,heat,2055,4,R1,2050,heatpump,all-year,all-week,early-peak,2.58330000000
-4,heat,2050,2,R1,2040,heatpump,all-year,all-week,late-peak,5.16670000000
-4,heat,2050,3,R1,2045,heatpump,all-year,all-week,late-peak,3.83330000000
-4,heat,2055,3,R1,2045,heatpump,all-year,all-week,late-peak,3.83330000000
-4,heat,2055,4,R1,2050,heatpump,all-year,all-week,late-peak,5.16670000000
-5,heat,2050,2,R1,2040,heatpump,all-year,all-week,evening,3.44440000000
-5,heat,2050,3,R1,2045,heatpump,all-year,all-week,evening,2.55560000000
-5,heat,2055,3,R1,2045,heatpump,all-year,all-week,evening,2.55560000000
-5,heat,2055,4,R1,2050,heatpump,all-year,all-week,evening,3.44440000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2050,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,4,R1,all-year,all-week,night,heatpump,2050,1.72220000000
+1,heat,2050,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,4,R1,all-year,all-week,morning,heatpump,2050,2.58330000000
+2,heat,2050,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,4,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
+3,heat,2050,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,4,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
+4,heat,2050,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,4,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
+5,heat,2050,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,4,R1,all-year,all-week,evening,heatpump,2050,3.44440000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2020.csv
index fdbb2d279..d1ee882b2 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2020.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2020.csv
@@ -1,4 +1,4 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gassupply1,15.00000000000
-0,2025,R1,2020,gassupply1,15.00000000000
-0,2030,R1,2020,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2030.csv
index 298f6c891..e84ef6dc7 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2030.csv
@@ -1,15 +1,15 @@
-asset,year,region,installed,technology,capacity
-0,2030,R1,2020,gassupply1,7.50000000000
-1,2030,R1,2025,gassupply1,2.79440000000
-1,2035,R1,2025,gassupply1,2.79440000000
-1,2040,R1,2025,gassupply1,2.79440000000
-1,2045,R1,2025,gassupply1,2.79440000000
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2035,R1,2030,gassupply1,7.50000000000
-2,2040,R1,2030,gassupply1,7.50000000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2030,R1,gassupply1,2025,2.79440000000
+1,2035,R1,gassupply1,2025,2.79440000000
+1,2040,R1,gassupply1,2025,2.79440000000
+1,2045,R1,gassupply1,2025,2.79440000000
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2035,R1,gassupply1,2030,7.50000000000
+2,2040,R1,gassupply1,2030,7.50000000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2035.csv
index e368dd50c..ccf34c3db 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2035.csv
@@ -1,13 +1,13 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2025,gassupply1,2.79440000000
-1,2040,R1,2025,gassupply1,2.79440000000
-1,2045,R1,2025,gassupply1,2.79440000000
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2035,R1,2030,gassupply1,7.50000000000
-2,2040,R1,2030,gassupply1,7.50000000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2035,R1,gassupply1,2025,2.79440000000
+1,2040,R1,gassupply1,2025,2.79440000000
+1,2045,R1,gassupply1,2025,2.79440000000
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2035,R1,gassupply1,2030,7.50000000000
+2,2040,R1,gassupply1,2030,7.50000000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2040.csv
index 4d55f6f79..79fdfddb6 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2040.csv
@@ -1,11 +1,11 @@
-asset,year,region,installed,technology,capacity
-1,2040,R1,2025,gassupply1,2.79440000000
-1,2045,R1,2025,gassupply1,2.79440000000
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2040,R1,2030,gassupply1,7.50000000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2040,R1,gassupply1,2025,2.79440000000
+1,2045,R1,gassupply1,2025,2.79440000000
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2040,R1,gassupply1,2030,7.50000000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2045.csv
index e5d560fce..b2ca194fb 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2045.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-1,2045,R1,2025,gassupply1,2.79440000000
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2045,R1,gassupply1,2025,2.79440000000
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2050.csv
index 4a7d05fa4..4f3e3a180 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Gas/Capacity/2050.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2055,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2055,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2055,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2055,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCACapacity.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCACapacity.csv
index 5f93911e7..907f0026a 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCACapacity.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCACapacity.csv
@@ -34,9 +34,8 @@ gasCCGT,R1,R1,A1,power,retrofit,2040,3.00000000000
 solarPV,R1,R1,A1,power,retrofit,2040,6.75000000000
 solarPV,R1,R1,A1,power,retrofit,2040,2.40000000000
 solarPV,R1,R1,A1,power,retrofit,2040,6.00000000000
-solarPV,R1,R1,A1,power,retrofit,2040,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2040,9.19000000000
 windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,8.38000000000
 gassupply1,R1,R1,A1,gas,retrofit,2040,2.79440000000
 gassupply1,R1,R1,A1,gas,retrofit,2040,7.50000000000
 gasboiler,R1,R1,A1,residential,retrofit,2045,0.91000000000
@@ -46,9 +45,9 @@ gasCCGT,R1,R1,A1,power,retrofit,2045,3.00000000000
 solarPV,R1,R1,A1,power,retrofit,2045,6.75000000000
 solarPV,R1,R1,A1,power,retrofit,2045,2.40000000000
 solarPV,R1,R1,A1,power,retrofit,2045,6.00000000000
-solarPV,R1,R1,A1,power,retrofit,2045,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2045,9.19000000000
+solarPV,R1,R1,A1,power,retrofit,2045,6.00000000000
 windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,8.38000000000
 gassupply1,R1,R1,A1,gas,retrofit,2045,2.79440000000
 gassupply1,R1,R1,A1,gas,retrofit,2045,7.50000000000
 heatpump,R1,R1,A1,residential,retrofit,2050,31.00000000000
@@ -56,9 +55,9 @@ heatpump,R1,R1,A1,residential,retrofit,2050,23.00000000000
 gasCCGT,R1,R1,A1,power,retrofit,2050,3.00000000000
 solarPV,R1,R1,A1,power,retrofit,2050,2.40000000000
 solarPV,R1,R1,A1,power,retrofit,2050,6.00000000000
-solarPV,R1,R1,A1,power,retrofit,2050,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2050,9.19000000000
+solarPV,R1,R1,A1,power,retrofit,2050,6.00000000000
 solarPV,R1,R1,A1,power,retrofit,2050,16.91000000000
-windturbine,R1,R1,A1,power,retrofit,2050,8.38000000000
-windturbine,R1,R1,A1,power,retrofit,2050,3.56000000000
+windturbine,R1,R1,A1,power,retrofit,2050,6.75000000000
 gassupply1,R1,R1,A1,gas,retrofit,2050,2.79440000000
 gassupply1,R1,R1,A1,gas,retrofit,2050,7.50000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAPrices.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAPrices.csv
index d29309c09..1e6fcccc3 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAPrices.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/MCAPrices.csv
@@ -95,75 +95,75 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2035
 "('all-year', 'all-week', 'evening')",heat,R1,0.43780000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.48550000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.55710000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
 "('all-year', 'all-week', 'night')",heat,R1,0.08410000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.72900000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.83670000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
 "('all-year', 'all-week', 'morning')",heat,R1,0.14290000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.48550000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.55710000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
 "('all-year', 'all-week', 'afternoon')",heat,R1,0.08410000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.72900000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.83670000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.14290000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.46280000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.67920000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
 "('all-year', 'all-week', 'late-peak')",heat,R1,0.38630000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,0.97310000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,1.11690000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
 "('all-year', 'all-week', 'evening')",heat,R1,0.21280000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.58540000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.61040000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.08640000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.08920000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.87890000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.91640000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.14400000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.15030000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.58540000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.61040000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08640000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.08920000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.87890000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.91640000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14400000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.15030000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.76260000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.83790000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.37480000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.40030000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,1.17290000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,1.22300000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.21120000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.22250000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.63840000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.63550000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.04750000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.04850000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.95840000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.95390000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.08880000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.09110000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63840000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63550000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04750000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04850000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.95840000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.95390000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.08880000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.09110000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.92120000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.91230000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.28370000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.29270000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.27880000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,1.27290000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.14190000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.14590000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2020.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2020.csv
index f194e7421..32dbf0a58 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2020.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2020.csv
@@ -1,15 +1,15 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gasCCGT,1.00000000000
-0,2025,R1,2020,gasCCGT,1.00000000000
-1,2025,R1,2020,solarPV,6.75000000000
-1,2030,R1,2020,solarPV,6.75000000000
-1,2035,R1,2020,solarPV,6.75000000000
-1,2040,R1,2020,solarPV,6.75000000000
-1,2045,R1,2020,solarPV,6.75000000000
-1,2049,R1,2020,solarPV,6.75000000000
-2,2025,R1,2020,windturbine,10.00000000000
-2,2030,R1,2020,windturbine,10.00000000000
-2,2035,R1,2020,windturbine,10.00000000000
-2,2040,R1,2020,windturbine,10.00000000000
-2,2045,R1,2020,windturbine,10.00000000000
-2,2049,R1,2020,windturbine,10.00000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2025,R1,solarPV,2020,6.75000000000
+1,2030,R1,solarPV,2020,6.75000000000
+1,2035,R1,solarPV,2020,6.75000000000
+1,2040,R1,solarPV,2020,6.75000000000
+1,2045,R1,solarPV,2020,6.75000000000
+1,2049,R1,solarPV,2020,6.75000000000
+2,2025,R1,windturbine,2020,10.00000000000
+2,2030,R1,windturbine,2020,10.00000000000
+2,2035,R1,windturbine,2020,10.00000000000
+2,2040,R1,windturbine,2020,10.00000000000
+2,2045,R1,windturbine,2020,10.00000000000
+2,2049,R1,windturbine,2020,10.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2030.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2030.csv
index 3739f2ea6..7a86e052c 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2030.csv
@@ -1,37 +1,37 @@
-asset,year,region,installed,technology,capacity
-1,2030,R1,2020,solarPV,6.75000000000
-1,2035,R1,2020,solarPV,6.75000000000
-1,2040,R1,2020,solarPV,6.75000000000
-1,2045,R1,2020,solarPV,6.75000000000
-1,2049,R1,2020,solarPV,6.75000000000
-2,2030,R1,2020,windturbine,10.00000000000
-2,2035,R1,2020,windturbine,10.00000000000
-2,2040,R1,2020,windturbine,10.00000000000
-2,2045,R1,2020,windturbine,10.00000000000
-2,2049,R1,2020,windturbine,10.00000000000
-3,2030,R1,2025,gasCCGT,3.00000000000
-3,2035,R1,2025,gasCCGT,3.00000000000
-3,2040,R1,2025,gasCCGT,3.00000000000
-3,2045,R1,2025,gasCCGT,3.00000000000
-3,2049,R1,2025,gasCCGT,3.00000000000
-3,2050,R1,2025,gasCCGT,3.00000000000
-3,2054,R1,2025,gasCCGT,3.00000000000
-3,2055,R1,2025,gasCCGT,3.00000000000
-3,2059,R1,2025,gasCCGT,3.00000000000
-3,2060,R1,2025,gasCCGT,3.00000000000
-3,2064,R1,2025,gasCCGT,3.00000000000
-4,2030,R1,2025,solarPV,2.40000000000
-4,2035,R1,2025,solarPV,2.40000000000
-4,2040,R1,2025,solarPV,2.40000000000
-4,2045,R1,2025,solarPV,2.40000000000
-4,2049,R1,2025,solarPV,2.40000000000
-4,2050,R1,2025,solarPV,2.40000000000
-4,2054,R1,2025,solarPV,2.40000000000
-5,2035,R1,2030,solarPV,6.00000000000
-5,2040,R1,2030,solarPV,6.00000000000
-5,2045,R1,2030,solarPV,6.00000000000
-5,2049,R1,2030,solarPV,6.00000000000
-5,2050,R1,2030,solarPV,6.00000000000
-5,2054,R1,2030,solarPV,6.00000000000
-5,2055,R1,2030,solarPV,6.00000000000
-5,2059,R1,2030,solarPV,6.00000000000
+asset,year,region,technology,installed,capacity
+1,2030,R1,gasCCGT,2025,3.00000000000
+1,2035,R1,gasCCGT,2025,3.00000000000
+1,2040,R1,gasCCGT,2025,3.00000000000
+1,2045,R1,gasCCGT,2025,3.00000000000
+1,2049,R1,gasCCGT,2025,3.00000000000
+1,2050,R1,gasCCGT,2025,3.00000000000
+1,2054,R1,gasCCGT,2025,3.00000000000
+1,2055,R1,gasCCGT,2025,3.00000000000
+1,2059,R1,gasCCGT,2025,3.00000000000
+1,2060,R1,gasCCGT,2025,3.00000000000
+1,2064,R1,gasCCGT,2025,3.00000000000
+2,2030,R1,solarPV,2020,6.75000000000
+2,2035,R1,solarPV,2020,6.75000000000
+2,2040,R1,solarPV,2020,6.75000000000
+2,2045,R1,solarPV,2020,6.75000000000
+2,2049,R1,solarPV,2020,6.75000000000
+3,2030,R1,solarPV,2025,2.40000000000
+3,2035,R1,solarPV,2025,2.40000000000
+3,2040,R1,solarPV,2025,2.40000000000
+3,2045,R1,solarPV,2025,2.40000000000
+3,2049,R1,solarPV,2025,2.40000000000
+3,2050,R1,solarPV,2025,2.40000000000
+3,2054,R1,solarPV,2025,2.40000000000
+4,2035,R1,solarPV,2030,6.00000000000
+4,2040,R1,solarPV,2030,6.00000000000
+4,2045,R1,solarPV,2030,6.00000000000
+4,2049,R1,solarPV,2030,6.00000000000
+4,2050,R1,solarPV,2030,6.00000000000
+4,2054,R1,solarPV,2030,6.00000000000
+4,2055,R1,solarPV,2030,6.00000000000
+4,2059,R1,solarPV,2030,6.00000000000
+5,2030,R1,windturbine,2020,10.00000000000
+5,2035,R1,windturbine,2020,10.00000000000
+5,2040,R1,windturbine,2020,10.00000000000
+5,2045,R1,windturbine,2020,10.00000000000
+5,2049,R1,windturbine,2020,10.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2035.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2035.csv
index 94a5d1ab3..3c54dd715 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2035.csv
@@ -1,51 +1,42 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2020,solarPV,6.75000000000
-1,2040,R1,2020,solarPV,6.75000000000
-1,2045,R1,2020,solarPV,6.75000000000
-1,2049,R1,2020,solarPV,6.75000000000
-2,2035,R1,2020,windturbine,10.00000000000
-2,2040,R1,2020,windturbine,10.00000000000
-2,2045,R1,2020,windturbine,10.00000000000
-2,2049,R1,2020,windturbine,10.00000000000
-3,2035,R1,2025,gasCCGT,3.00000000000
-3,2040,R1,2025,gasCCGT,3.00000000000
-3,2045,R1,2025,gasCCGT,3.00000000000
-3,2049,R1,2025,gasCCGT,3.00000000000
-3,2050,R1,2025,gasCCGT,3.00000000000
-3,2054,R1,2025,gasCCGT,3.00000000000
-3,2055,R1,2025,gasCCGT,3.00000000000
-3,2059,R1,2025,gasCCGT,3.00000000000
-3,2060,R1,2025,gasCCGT,3.00000000000
-3,2064,R1,2025,gasCCGT,3.00000000000
-4,2035,R1,2025,solarPV,2.40000000000
-4,2040,R1,2025,solarPV,2.40000000000
-4,2045,R1,2025,solarPV,2.40000000000
-4,2049,R1,2025,solarPV,2.40000000000
-4,2050,R1,2025,solarPV,2.40000000000
-4,2054,R1,2025,solarPV,2.40000000000
-5,2035,R1,2030,solarPV,6.00000000000
-5,2040,R1,2030,solarPV,6.00000000000
-5,2045,R1,2030,solarPV,6.00000000000
-5,2049,R1,2030,solarPV,6.00000000000
-5,2050,R1,2030,solarPV,6.00000000000
-5,2054,R1,2030,solarPV,6.00000000000
-5,2055,R1,2030,solarPV,6.00000000000
-5,2059,R1,2030,solarPV,6.00000000000
-6,2040,R1,2035,solarPV,10.00000000000
-6,2045,R1,2035,solarPV,10.00000000000
-6,2049,R1,2035,solarPV,10.00000000000
-6,2050,R1,2035,solarPV,10.00000000000
-6,2054,R1,2035,solarPV,10.00000000000
-6,2055,R1,2035,solarPV,10.00000000000
-6,2059,R1,2035,solarPV,10.00000000000
-6,2060,R1,2035,solarPV,10.00000000000
-6,2064,R1,2035,solarPV,10.00000000000
-7,2040,R1,2035,windturbine,8.38000000000
-7,2045,R1,2035,windturbine,8.38000000000
-7,2049,R1,2035,windturbine,8.38000000000
-7,2050,R1,2035,windturbine,8.38000000000
-7,2054,R1,2035,windturbine,8.38000000000
-7,2055,R1,2035,windturbine,8.38000000000
-7,2059,R1,2035,windturbine,8.38000000000
-7,2060,R1,2035,windturbine,8.38000000000
-7,2064,R1,2035,windturbine,8.38000000000
+asset,year,region,technology,installed,capacity
+1,2035,R1,gasCCGT,2025,3.00000000000
+1,2040,R1,gasCCGT,2025,3.00000000000
+1,2045,R1,gasCCGT,2025,3.00000000000
+1,2049,R1,gasCCGT,2025,3.00000000000
+1,2050,R1,gasCCGT,2025,3.00000000000
+1,2054,R1,gasCCGT,2025,3.00000000000
+1,2055,R1,gasCCGT,2025,3.00000000000
+1,2059,R1,gasCCGT,2025,3.00000000000
+1,2060,R1,gasCCGT,2025,3.00000000000
+1,2064,R1,gasCCGT,2025,3.00000000000
+2,2035,R1,solarPV,2020,6.75000000000
+2,2040,R1,solarPV,2020,6.75000000000
+2,2045,R1,solarPV,2020,6.75000000000
+2,2049,R1,solarPV,2020,6.75000000000
+3,2035,R1,solarPV,2025,2.40000000000
+3,2040,R1,solarPV,2025,2.40000000000
+3,2045,R1,solarPV,2025,2.40000000000
+3,2049,R1,solarPV,2025,2.40000000000
+3,2050,R1,solarPV,2025,2.40000000000
+3,2054,R1,solarPV,2025,2.40000000000
+4,2035,R1,solarPV,2030,6.00000000000
+4,2040,R1,solarPV,2030,6.00000000000
+4,2045,R1,solarPV,2030,6.00000000000
+4,2049,R1,solarPV,2030,6.00000000000
+4,2050,R1,solarPV,2030,6.00000000000
+4,2054,R1,solarPV,2030,6.00000000000
+4,2055,R1,solarPV,2030,6.00000000000
+4,2059,R1,solarPV,2030,6.00000000000
+5,2040,R1,solarPV,2035,9.19000000000
+5,2045,R1,solarPV,2035,9.19000000000
+5,2049,R1,solarPV,2035,9.19000000000
+5,2050,R1,solarPV,2035,9.19000000000
+5,2054,R1,solarPV,2035,9.19000000000
+5,2055,R1,solarPV,2035,9.19000000000
+5,2059,R1,solarPV,2035,9.19000000000
+5,2060,R1,solarPV,2035,9.19000000000
+5,2064,R1,solarPV,2035,9.19000000000
+6,2035,R1,windturbine,2020,10.00000000000
+6,2040,R1,windturbine,2020,10.00000000000
+6,2045,R1,windturbine,2020,10.00000000000
+6,2049,R1,windturbine,2020,10.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2040.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2040.csv
index 5e8f56bca..5b645c70b 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2040.csv
@@ -1,46 +1,47 @@
-asset,year,region,installed,technology,capacity
-1,2040,R1,2020,solarPV,6.75000000000
-1,2045,R1,2020,solarPV,6.75000000000
-1,2049,R1,2020,solarPV,6.75000000000
-2,2040,R1,2020,windturbine,10.00000000000
-2,2045,R1,2020,windturbine,10.00000000000
-2,2049,R1,2020,windturbine,10.00000000000
-3,2040,R1,2025,gasCCGT,3.00000000000
-3,2045,R1,2025,gasCCGT,3.00000000000
-3,2049,R1,2025,gasCCGT,3.00000000000
-3,2050,R1,2025,gasCCGT,3.00000000000
-3,2054,R1,2025,gasCCGT,3.00000000000
-3,2055,R1,2025,gasCCGT,3.00000000000
-3,2059,R1,2025,gasCCGT,3.00000000000
-3,2060,R1,2025,gasCCGT,3.00000000000
-3,2064,R1,2025,gasCCGT,3.00000000000
-4,2040,R1,2025,solarPV,2.40000000000
-4,2045,R1,2025,solarPV,2.40000000000
-4,2049,R1,2025,solarPV,2.40000000000
-4,2050,R1,2025,solarPV,2.40000000000
-4,2054,R1,2025,solarPV,2.40000000000
-5,2040,R1,2030,solarPV,6.00000000000
-5,2045,R1,2030,solarPV,6.00000000000
-5,2049,R1,2030,solarPV,6.00000000000
-5,2050,R1,2030,solarPV,6.00000000000
-5,2054,R1,2030,solarPV,6.00000000000
-5,2055,R1,2030,solarPV,6.00000000000
-5,2059,R1,2030,solarPV,6.00000000000
-6,2040,R1,2035,solarPV,10.00000000000
-6,2045,R1,2035,solarPV,10.00000000000
-6,2049,R1,2035,solarPV,10.00000000000
-6,2050,R1,2035,solarPV,10.00000000000
-6,2054,R1,2035,solarPV,10.00000000000
-6,2055,R1,2035,solarPV,10.00000000000
-6,2059,R1,2035,solarPV,10.00000000000
-6,2060,R1,2035,solarPV,10.00000000000
-6,2064,R1,2035,solarPV,10.00000000000
-7,2040,R1,2035,windturbine,8.38000000000
-7,2045,R1,2035,windturbine,8.38000000000
-7,2049,R1,2035,windturbine,8.38000000000
-7,2050,R1,2035,windturbine,8.38000000000
-7,2054,R1,2035,windturbine,8.38000000000
-7,2055,R1,2035,windturbine,8.38000000000
-7,2059,R1,2035,windturbine,8.38000000000
-7,2060,R1,2035,windturbine,8.38000000000
-7,2064,R1,2035,windturbine,8.38000000000
+asset,year,region,technology,installed,capacity
+1,2040,R1,gasCCGT,2025,3.00000000000
+1,2045,R1,gasCCGT,2025,3.00000000000
+1,2049,R1,gasCCGT,2025,3.00000000000
+1,2050,R1,gasCCGT,2025,3.00000000000
+1,2054,R1,gasCCGT,2025,3.00000000000
+1,2055,R1,gasCCGT,2025,3.00000000000
+1,2059,R1,gasCCGT,2025,3.00000000000
+1,2060,R1,gasCCGT,2025,3.00000000000
+1,2064,R1,gasCCGT,2025,3.00000000000
+2,2040,R1,solarPV,2020,6.75000000000
+2,2045,R1,solarPV,2020,6.75000000000
+2,2049,R1,solarPV,2020,6.75000000000
+3,2040,R1,solarPV,2025,2.40000000000
+3,2045,R1,solarPV,2025,2.40000000000
+3,2049,R1,solarPV,2025,2.40000000000
+3,2050,R1,solarPV,2025,2.40000000000
+3,2054,R1,solarPV,2025,2.40000000000
+4,2040,R1,solarPV,2030,6.00000000000
+4,2045,R1,solarPV,2030,6.00000000000
+4,2049,R1,solarPV,2030,6.00000000000
+4,2050,R1,solarPV,2030,6.00000000000
+4,2054,R1,solarPV,2030,6.00000000000
+4,2055,R1,solarPV,2030,6.00000000000
+4,2059,R1,solarPV,2030,6.00000000000
+5,2040,R1,solarPV,2035,9.19000000000
+5,2045,R1,solarPV,2035,9.19000000000
+5,2049,R1,solarPV,2035,9.19000000000
+5,2050,R1,solarPV,2035,9.19000000000
+5,2054,R1,solarPV,2035,9.19000000000
+5,2055,R1,solarPV,2035,9.19000000000
+5,2059,R1,solarPV,2035,9.19000000000
+5,2060,R1,solarPV,2035,9.19000000000
+5,2064,R1,solarPV,2035,9.19000000000
+6,2045,R1,solarPV,2040,6.00000000000
+6,2049,R1,solarPV,2040,6.00000000000
+6,2050,R1,solarPV,2040,6.00000000000
+6,2054,R1,solarPV,2040,6.00000000000
+6,2055,R1,solarPV,2040,6.00000000000
+6,2059,R1,solarPV,2040,6.00000000000
+6,2060,R1,solarPV,2040,6.00000000000
+6,2064,R1,solarPV,2040,6.00000000000
+6,2065,R1,solarPV,2040,6.00000000000
+6,2069,R1,solarPV,2040,6.00000000000
+7,2040,R1,windturbine,2020,10.00000000000
+7,2045,R1,windturbine,2020,10.00000000000
+7,2049,R1,windturbine,2020,10.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2045.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2045.csv
index c64073d2a..4b3e364d7 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2045.csv
@@ -19,37 +19,43 @@ asset,year,region,technology,installed,capacity
 3,2054,R1,solarPV,2030,6.00000000000
 3,2055,R1,solarPV,2030,6.00000000000
 3,2059,R1,solarPV,2030,6.00000000000
-4,2045,R1,solarPV,2035,10.00000000000
-4,2049,R1,solarPV,2035,10.00000000000
-4,2050,R1,solarPV,2035,10.00000000000
-4,2054,R1,solarPV,2035,10.00000000000
-4,2055,R1,solarPV,2035,10.00000000000
-4,2059,R1,solarPV,2035,10.00000000000
-4,2060,R1,solarPV,2035,10.00000000000
-4,2064,R1,solarPV,2035,10.00000000000
-5,2050,R1,solarPV,2045,16.91000000000
-5,2054,R1,solarPV,2045,16.91000000000
-5,2055,R1,solarPV,2045,16.91000000000
-5,2059,R1,solarPV,2045,16.91000000000
-5,2060,R1,solarPV,2045,16.91000000000
-5,2064,R1,solarPV,2045,16.91000000000
-5,2065,R1,solarPV,2045,16.91000000000
-5,2074,R1,solarPV,2045,16.91000000000
-6,2045,R1,windturbine,2020,10.00000000000
-6,2049,R1,windturbine,2020,10.00000000000
-7,2045,R1,windturbine,2035,8.38000000000
-7,2049,R1,windturbine,2035,8.38000000000
-7,2050,R1,windturbine,2035,8.38000000000
-7,2054,R1,windturbine,2035,8.38000000000
-7,2055,R1,windturbine,2035,8.38000000000
-7,2059,R1,windturbine,2035,8.38000000000
-7,2060,R1,windturbine,2035,8.38000000000
-7,2064,R1,windturbine,2035,8.38000000000
-8,2050,R1,windturbine,2045,3.56000000000
-8,2054,R1,windturbine,2045,3.56000000000
-8,2055,R1,windturbine,2045,3.56000000000
-8,2059,R1,windturbine,2045,3.56000000000
-8,2060,R1,windturbine,2045,3.56000000000
-8,2064,R1,windturbine,2045,3.56000000000
-8,2065,R1,windturbine,2045,3.56000000000
-8,2074,R1,windturbine,2045,3.56000000000
+4,2045,R1,solarPV,2035,9.19000000000
+4,2049,R1,solarPV,2035,9.19000000000
+4,2050,R1,solarPV,2035,9.19000000000
+4,2054,R1,solarPV,2035,9.19000000000
+4,2055,R1,solarPV,2035,9.19000000000
+4,2059,R1,solarPV,2035,9.19000000000
+4,2060,R1,solarPV,2035,9.19000000000
+4,2064,R1,solarPV,2035,9.19000000000
+5,2045,R1,solarPV,2040,6.00000000000
+5,2049,R1,solarPV,2040,6.00000000000
+5,2050,R1,solarPV,2040,6.00000000000
+5,2054,R1,solarPV,2040,6.00000000000
+5,2055,R1,solarPV,2040,6.00000000000
+5,2059,R1,solarPV,2040,6.00000000000
+5,2060,R1,solarPV,2040,6.00000000000
+5,2064,R1,solarPV,2040,6.00000000000
+5,2065,R1,solarPV,2040,6.00000000000
+5,2069,R1,solarPV,2040,6.00000000000
+6,2050,R1,solarPV,2045,16.91000000000
+6,2054,R1,solarPV,2045,16.91000000000
+6,2055,R1,solarPV,2045,16.91000000000
+6,2059,R1,solarPV,2045,16.91000000000
+6,2060,R1,solarPV,2045,16.91000000000
+6,2064,R1,solarPV,2045,16.91000000000
+6,2065,R1,solarPV,2045,16.91000000000
+6,2069,R1,solarPV,2045,16.91000000000
+6,2070,R1,solarPV,2045,16.91000000000
+6,2074,R1,solarPV,2045,16.91000000000
+7,2045,R1,windturbine,2020,10.00000000000
+7,2049,R1,windturbine,2020,10.00000000000
+8,2050,R1,windturbine,2045,6.75000000000
+8,2054,R1,windturbine,2045,6.75000000000
+8,2055,R1,windturbine,2045,6.75000000000
+8,2059,R1,windturbine,2045,6.75000000000
+8,2060,R1,windturbine,2045,6.75000000000
+8,2064,R1,windturbine,2045,6.75000000000
+8,2065,R1,windturbine,2045,6.75000000000
+8,2069,R1,windturbine,2045,6.75000000000
+8,2070,R1,windturbine,2045,6.75000000000
+8,2074,R1,windturbine,2045,6.75000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2050.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2050.csv
index fbf5711d8..449982307 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Power/Capacity/2050.csv
@@ -1,49 +1,57 @@
-asset,year,region,installed,technology,capacity
-2,2050,R1,2025,gasCCGT,3.00000000000
-2,2054,R1,2025,gasCCGT,3.00000000000
-2,2055,R1,2025,gasCCGT,3.00000000000
-2,2059,R1,2025,gasCCGT,3.00000000000
-2,2060,R1,2025,gasCCGT,3.00000000000
-2,2064,R1,2025,gasCCGT,3.00000000000
-3,2050,R1,2025,solarPV,2.40000000000
-3,2054,R1,2025,solarPV,2.40000000000
-4,2050,R1,2030,solarPV,6.00000000000
-4,2054,R1,2030,solarPV,6.00000000000
-4,2055,R1,2030,solarPV,6.00000000000
-4,2059,R1,2030,solarPV,6.00000000000
-5,2050,R1,2035,solarPV,10.00000000000
-5,2054,R1,2035,solarPV,10.00000000000
-5,2055,R1,2035,solarPV,10.00000000000
-5,2059,R1,2035,solarPV,10.00000000000
-5,2060,R1,2035,solarPV,10.00000000000
-5,2064,R1,2035,solarPV,10.00000000000
-6,2050,R1,2035,windturbine,8.38000000000
-6,2054,R1,2035,windturbine,8.38000000000
-6,2055,R1,2035,windturbine,8.38000000000
-6,2059,R1,2035,windturbine,8.38000000000
-6,2060,R1,2035,windturbine,8.38000000000
-6,2064,R1,2035,windturbine,8.38000000000
-7,2050,R1,2045,solarPV,16.91000000000
-7,2054,R1,2045,solarPV,16.91000000000
-7,2055,R1,2045,solarPV,16.91000000000
-7,2059,R1,2045,solarPV,16.91000000000
-7,2060,R1,2045,solarPV,16.91000000000
-7,2064,R1,2045,solarPV,16.91000000000
-7,2065,R1,2045,solarPV,16.91000000000
-7,2074,R1,2045,solarPV,16.91000000000
-8,2050,R1,2045,windturbine,3.56000000000
-8,2054,R1,2045,windturbine,3.56000000000
-8,2055,R1,2045,windturbine,3.56000000000
-8,2059,R1,2045,windturbine,3.56000000000
-8,2060,R1,2045,windturbine,3.56000000000
-8,2064,R1,2045,windturbine,3.56000000000
-8,2065,R1,2045,windturbine,3.56000000000
-8,2074,R1,2045,windturbine,3.56000000000
-9,2055,R1,2050,solarPV,2.40000000000
-9,2059,R1,2050,solarPV,2.40000000000
-9,2060,R1,2050,solarPV,2.40000000000
-9,2064,R1,2050,solarPV,2.40000000000
-9,2065,R1,2050,solarPV,2.40000000000
-9,2074,R1,2050,solarPV,2.40000000000
-9,2075,R1,2050,solarPV,2.40000000000
-9,2079,R1,2050,solarPV,2.40000000000
+asset,year,region,technology,installed,capacity
+0,2050,R1,gasCCGT,2025,3.00000000000
+0,2054,R1,gasCCGT,2025,3.00000000000
+0,2055,R1,gasCCGT,2025,3.00000000000
+0,2059,R1,gasCCGT,2025,3.00000000000
+0,2060,R1,gasCCGT,2025,3.00000000000
+0,2064,R1,gasCCGT,2025,3.00000000000
+2,2050,R1,solarPV,2025,2.40000000000
+2,2054,R1,solarPV,2025,2.40000000000
+3,2050,R1,solarPV,2030,6.00000000000
+3,2054,R1,solarPV,2030,6.00000000000
+3,2055,R1,solarPV,2030,6.00000000000
+3,2059,R1,solarPV,2030,6.00000000000
+4,2050,R1,solarPV,2035,9.19000000000
+4,2054,R1,solarPV,2035,9.19000000000
+4,2055,R1,solarPV,2035,9.19000000000
+4,2059,R1,solarPV,2035,9.19000000000
+4,2060,R1,solarPV,2035,9.19000000000
+4,2064,R1,solarPV,2035,9.19000000000
+5,2050,R1,solarPV,2040,6.00000000000
+5,2054,R1,solarPV,2040,6.00000000000
+5,2055,R1,solarPV,2040,6.00000000000
+5,2059,R1,solarPV,2040,6.00000000000
+5,2060,R1,solarPV,2040,6.00000000000
+5,2064,R1,solarPV,2040,6.00000000000
+5,2065,R1,solarPV,2040,6.00000000000
+5,2069,R1,solarPV,2040,6.00000000000
+6,2050,R1,solarPV,2045,16.91000000000
+6,2054,R1,solarPV,2045,16.91000000000
+6,2055,R1,solarPV,2045,16.91000000000
+6,2059,R1,solarPV,2045,16.91000000000
+6,2060,R1,solarPV,2045,16.91000000000
+6,2064,R1,solarPV,2045,16.91000000000
+6,2065,R1,solarPV,2045,16.91000000000
+6,2069,R1,solarPV,2045,16.91000000000
+6,2070,R1,solarPV,2045,16.91000000000
+6,2074,R1,solarPV,2045,16.91000000000
+7,2055,R1,solarPV,2050,2.40000000000
+7,2059,R1,solarPV,2050,2.40000000000
+7,2060,R1,solarPV,2050,2.40000000000
+7,2064,R1,solarPV,2050,2.40000000000
+7,2065,R1,solarPV,2050,2.40000000000
+7,2069,R1,solarPV,2050,2.40000000000
+7,2070,R1,solarPV,2050,2.40000000000
+7,2074,R1,solarPV,2050,2.40000000000
+7,2075,R1,solarPV,2050,2.40000000000
+7,2079,R1,solarPV,2050,2.40000000000
+9,2050,R1,windturbine,2045,6.75000000000
+9,2054,R1,windturbine,2045,6.75000000000
+9,2055,R1,windturbine,2045,6.75000000000
+9,2059,R1,windturbine,2045,6.75000000000
+9,2060,R1,windturbine,2045,6.75000000000
+9,2064,R1,windturbine,2045,6.75000000000
+9,2065,R1,windturbine,2045,6.75000000000
+9,2069,R1,windturbine,2045,6.75000000000
+9,2070,R1,windturbine,2045,6.75000000000
+9,2074,R1,windturbine,2045,6.75000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2050.csv
index 305b627b2..42f4be20c 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2050.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Capacity/2050.csv
@@ -1,11 +1,11 @@
-asset,year,region,installed,technology,capacity
-2,2050,R1,2040,heatpump,31.00000000000
-2,2054,R1,2040,heatpump,31.00000000000
-3,2050,R1,2045,heatpump,23.00000000000
-3,2054,R1,2045,heatpump,23.00000000000
-3,2055,R1,2045,heatpump,23.00000000000
-3,2059,R1,2045,heatpump,23.00000000000
-4,2055,R1,2050,heatpump,31.00000000000
-4,2059,R1,2050,heatpump,31.00000000000
-4,2060,R1,2050,heatpump,31.00000000000
-4,2064,R1,2050,heatpump,31.00000000000
+asset,year,region,technology,installed,capacity
+2,2050,R1,heatpump,2040,31.00000000000
+2,2054,R1,heatpump,2040,31.00000000000
+3,2050,R1,heatpump,2045,23.00000000000
+3,2054,R1,heatpump,2045,23.00000000000
+3,2055,R1,heatpump,2045,23.00000000000
+3,2059,R1,heatpump,2045,23.00000000000
+4,2055,R1,heatpump,2050,31.00000000000
+4,2059,R1,heatpump,2050,31.00000000000
+4,2060,R1,heatpump,2050,31.00000000000
+4,2064,R1,heatpump,2050,31.00000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2020.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2020.csv
index a44059a3e..7b8c4061d 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2020.csv
@@ -1,31 +1,31 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2020,0,R1,gasboiler,2020,all-year,all-week,night,1.00000000000
-0,heat,2025,0,R1,gasboiler,2020,all-year,all-week,night,0.27780000000
-0,heat,2025,1,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,night,64.71000000000
-0,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,night,17.97500000000
-1,heat,2020,0,R1,gasboiler,2020,all-year,all-week,morning,1.50000000000
-1,heat,2025,0,R1,gasboiler,2020,all-year,all-week,morning,0.41670000000
-1,heat,2025,1,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,morning,97.06500000000
-1,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,morning,26.96250000000
-2,heat,2020,0,R1,gasboiler,2020,all-year,all-week,afternoon,1.00000000000
-2,heat,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.27780000000
-2,heat,2025,1,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,afternoon,64.71000000000
-2,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,17.97500000000
-3,heat,2020,0,R1,gasboiler,2020,all-year,all-week,early-peak,1.50000000000
-3,heat,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.41670000000
-3,heat,2025,1,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,early-peak,97.06500000000
-3,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,26.96250000000
-4,heat,2020,0,R1,gasboiler,2020,all-year,all-week,late-peak,3.00000000000
-4,heat,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,0.83330000000
-4,heat,2025,1,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,late-peak,194.13000000000
-4,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,53.92500000000
-5,heat,2020,0,R1,gasboiler,2020,all-year,all-week,evening,2.00000000000
-5,heat,2025,0,R1,gasboiler,2020,all-year,all-week,evening,0.55560000000
-5,heat,2025,1,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,evening,129.42000000000
-5,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,evening,35.95000000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,1.00000000000
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,64.71000000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2025.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2025.csv
index c9ed8c00b..bfe116d0b 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2025.csv
@@ -1,43 +1,43 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2025,0,R1,gasboiler,2020,all-year,all-week,night,0.27780000000
-0,heat,2025,2,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,heat,2030,1,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2030,2,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,heat,2030,3,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,night,17.97500000000
-0,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-1,heat,2025,0,R1,gasboiler,2020,all-year,all-week,morning,0.41670000000
-1,heat,2025,2,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,heat,2030,1,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2030,2,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,heat,2030,3,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,morning,26.96250000000
-1,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-2,heat,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.27780000000
-2,heat,2025,2,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,heat,2030,1,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2030,2,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,heat,2030,3,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,17.97500000000
-2,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-3,heat,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.41670000000
-3,heat,2025,2,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,heat,2030,1,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2030,2,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,heat,2030,3,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,26.96250000000
-3,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-4,heat,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,0.83330000000
-4,heat,2025,2,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,heat,2030,1,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2030,2,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,heat,2030,3,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,53.92500000000
-4,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-5,heat,2025,0,R1,gasboiler,2020,all-year,all-week,evening,0.55560000000
-5,heat,2025,2,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,heat,2030,1,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2030,2,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,heat,2030,3,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,evening,35.95000000000
-5,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+0,heat,2025,2,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,3,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+1,heat,2025,2,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,3,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+2,heat,2025,2,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,3,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+3,heat,2025,2,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,3,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+4,heat,2025,2,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,3,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+5,heat,2025,2,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,3,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2030.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2030.csv
index 61ae11982..82873caab 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2030.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2030,0,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2030,1,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,heat,2030,2,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,heat,2035,0,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2035,2,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,heat,2035,3,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-0,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-1,heat,2030,0,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2030,1,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,heat,2030,2,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,heat,2035,0,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2035,2,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,heat,2035,3,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-1,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-2,heat,2030,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2030,1,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,heat,2030,2,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,heat,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2035,2,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,heat,2035,3,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-2,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-3,heat,2030,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2030,1,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,heat,2030,2,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,heat,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2035,2,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,heat,2035,3,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-3,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-4,heat,2030,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2030,1,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,heat,2030,2,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,heat,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2035,2,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,heat,2035,3,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-4,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-5,heat,2030,0,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2030,1,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,heat,2030,2,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,heat,2035,0,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2035,2,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,heat,2035,3,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
-5,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,CO2f,2030,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,CO2f,2030,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,CO2f,2030,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,CO2f,2030,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,CO2f,2030,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,CO2f,2030,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2035.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2035.csv
index 89e0bd4e1..741ea3c65 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2035.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2035,0,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2035,2,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,heat,2035,3,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,heat,2040,1,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2040,3,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,heat,2040,4,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-0,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-1,heat,2035,0,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2035,2,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,heat,2035,3,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,heat,2040,1,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2040,3,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,heat,2040,4,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-1,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-2,heat,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2035,2,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,heat,2035,3,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,heat,2040,1,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2040,3,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,heat,2040,4,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-2,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-3,heat,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2035,2,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,heat,2035,3,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,heat,2040,1,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2040,3,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,heat,2040,4,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-3,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-4,heat,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2035,2,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,heat,2035,3,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,heat,2040,1,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2040,3,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,heat,2040,4,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-4,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-5,heat,2035,0,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2035,2,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,heat,2035,3,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,heat,2040,1,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2040,3,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,heat,2040,4,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
-5,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,1,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+0,CO2f,2040,1,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,1,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+1,CO2f,2040,1,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,1,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+2,CO2f,2040,1,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,1,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+3,CO2f,2040,1,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,1,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+4,CO2f,2040,1,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,1,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
+5,CO2f,2040,1,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2040.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2040.csv
index 663e47a5a..c802f3409 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2040.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2040,0,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2040,1,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,heat,2040,2,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,heat,2045,0,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2045,2,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,heat,2045,3,R1,heatpump,2040,all-year,all-week,night,1.72220000000
-0,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-0,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-1,heat,2040,0,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2040,1,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,heat,2040,2,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,heat,2045,0,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2045,2,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,heat,2045,3,R1,heatpump,2040,all-year,all-week,morning,2.58330000000
-1,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-1,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-2,heat,2040,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2040,1,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,heat,2040,2,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,heat,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2045,2,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,heat,2045,3,R1,heatpump,2040,all-year,all-week,afternoon,1.72220000000
-2,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-2,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-3,heat,2040,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2040,1,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,heat,2040,2,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,heat,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2045,2,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,heat,2045,3,R1,heatpump,2040,all-year,all-week,early-peak,2.58330000000
-3,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-3,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-4,heat,2040,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2040,1,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,heat,2040,2,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,heat,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2045,2,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,heat,2045,3,R1,heatpump,2040,all-year,all-week,late-peak,5.16670000000
-4,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-4,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-5,heat,2040,0,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2040,1,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,heat,2040,2,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,heat,2045,0,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2045,2,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,heat,2045,3,R1,heatpump,2040,all-year,all-week,evening,3.44440000000
-5,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
-5,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2040,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2040,1,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,2,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,heat,2045,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2045,2,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,CO2f,2040,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+0,CO2f,2045,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+1,heat,2040,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2040,1,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,heat,2045,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2045,2,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,CO2f,2040,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+1,CO2f,2045,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+2,heat,2040,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2040,1,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,heat,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2045,2,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,CO2f,2040,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+2,CO2f,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+3,heat,2040,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2040,1,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,heat,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2045,2,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,CO2f,2040,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+3,CO2f,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+4,heat,2040,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2040,1,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,heat,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2045,2,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,CO2f,2040,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+4,CO2f,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+5,heat,2040,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2040,1,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,heat,2045,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2045,2,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,CO2f,2040,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
+5,CO2f,2045,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2045.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2045.csv
index 6e2884e67..c7be86b20 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2045.csv
@@ -1,37 +1,37 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2045,0,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2045,1,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,heat,2045,2,R1,heatpump,2040,all-year,all-week,night,1.72220000000
-0,heat,2050,2,R1,heatpump,2040,all-year,all-week,night,1.72220000000
-0,heat,2050,3,R1,heatpump,2045,all-year,all-week,night,1.27780000000
-0,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-1,heat,2045,0,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2045,1,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,heat,2045,2,R1,heatpump,2040,all-year,all-week,morning,2.58330000000
-1,heat,2050,2,R1,heatpump,2040,all-year,all-week,morning,2.58330000000
-1,heat,2050,3,R1,heatpump,2045,all-year,all-week,morning,1.91670000000
-1,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-2,heat,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2045,1,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,heat,2045,2,R1,heatpump,2040,all-year,all-week,afternoon,1.72220000000
-2,heat,2050,2,R1,heatpump,2040,all-year,all-week,afternoon,1.72220000000
-2,heat,2050,3,R1,heatpump,2045,all-year,all-week,afternoon,1.27780000000
-2,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-3,heat,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2045,1,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,heat,2045,2,R1,heatpump,2040,all-year,all-week,early-peak,2.58330000000
-3,heat,2050,2,R1,heatpump,2040,all-year,all-week,early-peak,2.58330000000
-3,heat,2050,3,R1,heatpump,2045,all-year,all-week,early-peak,1.91670000000
-3,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-4,heat,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2045,1,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,heat,2045,2,R1,heatpump,2040,all-year,all-week,late-peak,5.16670000000
-4,heat,2050,2,R1,heatpump,2040,all-year,all-week,late-peak,5.16670000000
-4,heat,2050,3,R1,heatpump,2045,all-year,all-week,late-peak,3.83330000000
-4,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-5,heat,2045,0,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2045,1,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,heat,2045,2,R1,heatpump,2040,all-year,all-week,evening,3.44440000000
-5,heat,2050,2,R1,heatpump,2040,all-year,all-week,evening,3.44440000000
-5,heat,2050,3,R1,heatpump,2045,all-year,all-week,evening,2.55560000000
-5,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2045,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2045,1,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,heat,2045,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,CO2f,2045,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+1,heat,2045,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2045,1,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,heat,2045,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,CO2f,2045,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+2,heat,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2045,1,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,heat,2045,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,CO2f,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+3,heat,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2045,1,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,heat,2045,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,CO2f,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+4,heat,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2045,1,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,heat,2045,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,CO2f,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+5,heat,2045,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2045,1,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,heat,2045,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,CO2f,2045,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2050.csv b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2050.csv
index 61004cae8..8c1871538 100644
--- a/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/1-add-new-technology/2-scenario/Results/Residential/Supply/2050.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,heat,2050,2,R1,2040,heatpump,all-year,all-week,night,1.72220000000
-0,heat,2050,3,R1,2045,heatpump,all-year,all-week,night,1.27780000000
-0,heat,2055,3,R1,2045,heatpump,all-year,all-week,night,1.27780000000
-0,heat,2055,4,R1,2050,heatpump,all-year,all-week,night,1.72220000000
-1,heat,2050,2,R1,2040,heatpump,all-year,all-week,morning,2.58330000000
-1,heat,2050,3,R1,2045,heatpump,all-year,all-week,morning,1.91670000000
-1,heat,2055,3,R1,2045,heatpump,all-year,all-week,morning,1.91670000000
-1,heat,2055,4,R1,2050,heatpump,all-year,all-week,morning,2.58330000000
-2,heat,2050,2,R1,2040,heatpump,all-year,all-week,afternoon,1.72220000000
-2,heat,2050,3,R1,2045,heatpump,all-year,all-week,afternoon,1.27780000000
-2,heat,2055,3,R1,2045,heatpump,all-year,all-week,afternoon,1.27780000000
-2,heat,2055,4,R1,2050,heatpump,all-year,all-week,afternoon,1.72220000000
-3,heat,2050,2,R1,2040,heatpump,all-year,all-week,early-peak,2.58330000000
-3,heat,2050,3,R1,2045,heatpump,all-year,all-week,early-peak,1.91670000000
-3,heat,2055,3,R1,2045,heatpump,all-year,all-week,early-peak,1.91670000000
-3,heat,2055,4,R1,2050,heatpump,all-year,all-week,early-peak,2.58330000000
-4,heat,2050,2,R1,2040,heatpump,all-year,all-week,late-peak,5.16670000000
-4,heat,2050,3,R1,2045,heatpump,all-year,all-week,late-peak,3.83330000000
-4,heat,2055,3,R1,2045,heatpump,all-year,all-week,late-peak,3.83330000000
-4,heat,2055,4,R1,2050,heatpump,all-year,all-week,late-peak,5.16670000000
-5,heat,2050,2,R1,2040,heatpump,all-year,all-week,evening,3.44440000000
-5,heat,2050,3,R1,2045,heatpump,all-year,all-week,evening,2.55560000000
-5,heat,2055,3,R1,2045,heatpump,all-year,all-week,evening,2.55560000000
-5,heat,2055,4,R1,2050,heatpump,all-year,all-week,evening,3.44440000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2050,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,4,R1,all-year,all-week,night,heatpump,2050,1.72220000000
+1,heat,2050,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,4,R1,all-year,all-week,morning,heatpump,2050,2.58330000000
+2,heat,2050,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,4,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
+3,heat,2050,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,4,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
+4,heat,2050,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,4,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
+5,heat,2050,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,4,R1,all-year,all-week,evening,heatpump,2050,3.44440000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2020.csv
index fdbb2d279..d1ee882b2 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2020.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2020.csv
@@ -1,4 +1,4 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gassupply1,15.00000000000
-0,2025,R1,2020,gassupply1,15.00000000000
-0,2030,R1,2020,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2025.csv
index f2ad7b025..d42ba410b 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2025.csv
@@ -1,3 +1,3 @@
-asset,year,region,installed,technology,capacity
-0,2025,R1,2020,gassupply1,15.00000000000
-0,2030,R1,2020,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2035.csv
index 39ffacce2..44a4859ec 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2035.csv
@@ -1,6 +1,6 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2030,gassupply1,52.86010000000
-1,2040,R1,2030,gassupply1,52.86010000000
-1,2045,R1,2030,gassupply1,52.86010000000
-1,2050,R1,2030,gassupply1,52.86010000000
-1,2069,R1,2030,gassupply1,52.86010000000
+asset,year,region,technology,installed,capacity
+1,2035,R1,gassupply1,2030,52.86010000000
+1,2040,R1,gassupply1,2030,52.86010000000
+1,2045,R1,gassupply1,2030,52.86010000000
+1,2050,R1,gassupply1,2030,52.86010000000
+1,2069,R1,gassupply1,2030,52.86010000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2040.csv
index cc87d2bd7..e2f2b70bf 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2040.csv
@@ -1,5 +1,5 @@
-asset,year,region,installed,technology,capacity
-1,2040,R1,2030,gassupply1,52.86010000000
-1,2045,R1,2030,gassupply1,52.86010000000
-1,2050,R1,2030,gassupply1,52.86010000000
-1,2069,R1,2030,gassupply1,52.86010000000
+asset,year,region,technology,installed,capacity
+1,2040,R1,gassupply1,2030,52.86010000000
+1,2045,R1,gassupply1,2030,52.86010000000
+1,2050,R1,gassupply1,2030,52.86010000000
+1,2069,R1,gassupply1,2030,52.86010000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2045.csv
index c7248804e..3923060e7 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2045.csv
@@ -1,4 +1,4 @@
-asset,year,region,installed,technology,capacity
-1,2045,R1,2030,gassupply1,52.86010000000
-1,2050,R1,2030,gassupply1,52.86010000000
-1,2069,R1,2030,gassupply1,52.86010000000
+asset,year,region,technology,installed,capacity
+1,2045,R1,gassupply1,2030,52.86010000000
+1,2050,R1,gassupply1,2030,52.86010000000
+1,2069,R1,gassupply1,2030,52.86010000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2050.csv
index 90a0f85e4..a9f4bcda0 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Gas/Capacity/2050.csv
@@ -1,4 +1,4 @@
-asset,year,region,installed,technology,capacity
-1,2050,R1,2030,gassupply1,52.86010000000
-1,2055,R1,2030,gassupply1,52.86010000000
-1,2069,R1,2030,gassupply1,52.86010000000
+asset,year,region,technology,installed,capacity
+1,2050,R1,gassupply1,2030,52.86010000000
+1,2055,R1,gassupply1,2030,52.86010000000
+1,2069,R1,gassupply1,2030,52.86010000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2020.csv
index 48bcd2e6d..e59155563 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2020.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2020.csv
@@ -1,15 +1,15 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gasCCGT,1.00000000000
-0,2025,R1,2020,gasCCGT,1.00000000000
-1,2025,R1,2020,solarPV,0.78230000000
-1,2030,R1,2020,solarPV,0.78230000000
-1,2035,R1,2020,solarPV,0.78230000000
-1,2040,R1,2020,solarPV,0.78230000000
-1,2045,R1,2020,solarPV,0.78230000000
-1,2049,R1,2020,solarPV,0.78230000000
-2,2025,R1,2020,windturbine,20.00000000000
-2,2030,R1,2020,windturbine,20.00000000000
-2,2035,R1,2020,windturbine,20.00000000000
-2,2040,R1,2020,windturbine,20.00000000000
-2,2045,R1,2020,windturbine,20.00000000000
-2,2049,R1,2020,windturbine,20.00000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2025,R1,solarPV,2020,0.78230000000
+1,2030,R1,solarPV,2020,0.78230000000
+1,2035,R1,solarPV,2020,0.78230000000
+1,2040,R1,solarPV,2020,0.78230000000
+1,2045,R1,solarPV,2020,0.78230000000
+1,2049,R1,solarPV,2020,0.78230000000
+2,2025,R1,windturbine,2020,20.00000000000
+2,2030,R1,windturbine,2020,20.00000000000
+2,2035,R1,windturbine,2020,20.00000000000
+2,2040,R1,windturbine,2020,20.00000000000
+2,2045,R1,windturbine,2020,20.00000000000
+2,2049,R1,windturbine,2020,20.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2030.csv
index 68b049a36..77e18c058 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2030.csv
@@ -1,34 +1,34 @@
-asset,year,region,installed,technology,capacity
-1,2030,R1,2020,solarPV,0.78230000000
-1,2035,R1,2020,solarPV,0.78230000000
-1,2040,R1,2020,solarPV,0.78230000000
-1,2045,R1,2020,solarPV,0.78230000000
-1,2049,R1,2020,solarPV,0.78230000000
-2,2030,R1,2020,windturbine,20.00000000000
-2,2035,R1,2020,windturbine,20.00000000000
-2,2040,R1,2020,windturbine,20.00000000000
-2,2045,R1,2020,windturbine,20.00000000000
-2,2049,R1,2020,windturbine,20.00000000000
-3,2030,R1,2025,gasCCGT,2.00000000000
-3,2035,R1,2025,gasCCGT,2.00000000000
-3,2040,R1,2025,gasCCGT,2.00000000000
-3,2045,R1,2025,gasCCGT,2.00000000000
-3,2049,R1,2025,gasCCGT,2.00000000000
-3,2050,R1,2025,gasCCGT,2.00000000000
-3,2054,R1,2025,gasCCGT,2.00000000000
-3,2055,R1,2025,gasCCGT,2.00000000000
-3,2064,R1,2025,gasCCGT,2.00000000000
-4,2030,R1,2025,solarPV,3.03230000000
-4,2035,R1,2025,solarPV,3.03230000000
-4,2040,R1,2025,solarPV,3.03230000000
-4,2045,R1,2025,solarPV,3.03230000000
-4,2049,R1,2025,solarPV,3.03230000000
-4,2050,R1,2025,solarPV,3.03230000000
-4,2054,R1,2025,solarPV,3.03230000000
-5,2030,R1,2025,windturbine,10.90320000000
-5,2035,R1,2025,windturbine,10.90320000000
-5,2040,R1,2025,windturbine,10.90320000000
-5,2045,R1,2025,windturbine,10.90320000000
-5,2049,R1,2025,windturbine,10.90320000000
-5,2050,R1,2025,windturbine,10.90320000000
-5,2054,R1,2025,windturbine,10.90320000000
+asset,year,region,technology,installed,capacity
+1,2030,R1,gasCCGT,2025,2.00000000000
+1,2035,R1,gasCCGT,2025,2.00000000000
+1,2040,R1,gasCCGT,2025,2.00000000000
+1,2045,R1,gasCCGT,2025,2.00000000000
+1,2049,R1,gasCCGT,2025,2.00000000000
+1,2050,R1,gasCCGT,2025,2.00000000000
+1,2054,R1,gasCCGT,2025,2.00000000000
+1,2055,R1,gasCCGT,2025,2.00000000000
+1,2064,R1,gasCCGT,2025,2.00000000000
+2,2030,R1,solarPV,2020,0.78230000000
+2,2035,R1,solarPV,2020,0.78230000000
+2,2040,R1,solarPV,2020,0.78230000000
+2,2045,R1,solarPV,2020,0.78230000000
+2,2049,R1,solarPV,2020,0.78230000000
+3,2030,R1,solarPV,2025,3.03230000000
+3,2035,R1,solarPV,2025,3.03230000000
+3,2040,R1,solarPV,2025,3.03230000000
+3,2045,R1,solarPV,2025,3.03230000000
+3,2049,R1,solarPV,2025,3.03230000000
+3,2050,R1,solarPV,2025,3.03230000000
+3,2054,R1,solarPV,2025,3.03230000000
+4,2030,R1,windturbine,2020,20.00000000000
+4,2035,R1,windturbine,2020,20.00000000000
+4,2040,R1,windturbine,2020,20.00000000000
+4,2045,R1,windturbine,2020,20.00000000000
+4,2049,R1,windturbine,2020,20.00000000000
+5,2030,R1,windturbine,2025,10.90320000000
+5,2035,R1,windturbine,2025,10.90320000000
+5,2040,R1,windturbine,2025,10.90320000000
+5,2045,R1,windturbine,2025,10.90320000000
+5,2049,R1,windturbine,2025,10.90320000000
+5,2050,R1,windturbine,2025,10.90320000000
+5,2054,R1,windturbine,2025,10.90320000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2035.csv
index ca1752877..69e37a641 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2035.csv
@@ -1,36 +1,36 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2020,solarPV,0.78230000000
-1,2040,R1,2020,solarPV,0.78230000000
-1,2045,R1,2020,solarPV,0.78230000000
-1,2049,R1,2020,solarPV,0.78230000000
-2,2035,R1,2020,windturbine,20.00000000000
-2,2040,R1,2020,windturbine,20.00000000000
-2,2045,R1,2020,windturbine,20.00000000000
-2,2049,R1,2020,windturbine,20.00000000000
-3,2035,R1,2025,gasCCGT,2.00000000000
-3,2040,R1,2025,gasCCGT,2.00000000000
-3,2045,R1,2025,gasCCGT,2.00000000000
-3,2049,R1,2025,gasCCGT,2.00000000000
-3,2050,R1,2025,gasCCGT,2.00000000000
-3,2054,R1,2025,gasCCGT,2.00000000000
-3,2055,R1,2025,gasCCGT,2.00000000000
-3,2064,R1,2025,gasCCGT,2.00000000000
-4,2035,R1,2025,solarPV,3.03230000000
-4,2040,R1,2025,solarPV,3.03230000000
-4,2045,R1,2025,solarPV,3.03230000000
-4,2049,R1,2025,solarPV,3.03230000000
-4,2050,R1,2025,solarPV,3.03230000000
-4,2054,R1,2025,solarPV,3.03230000000
-5,2035,R1,2025,windturbine,10.90320000000
-5,2040,R1,2025,windturbine,10.90320000000
-5,2045,R1,2025,windturbine,10.90320000000
-5,2049,R1,2025,windturbine,10.90320000000
-5,2050,R1,2025,windturbine,10.90320000000
-5,2054,R1,2025,windturbine,10.90320000000
-6,2040,R1,2035,solarPV,3.31160000000
-6,2045,R1,2035,solarPV,3.31160000000
-6,2049,R1,2035,solarPV,3.31160000000
-6,2050,R1,2035,solarPV,3.31160000000
-6,2054,R1,2035,solarPV,3.31160000000
-6,2055,R1,2035,solarPV,3.31160000000
-6,2064,R1,2035,solarPV,3.31160000000
+asset,year,region,technology,installed,capacity
+1,2035,R1,gasCCGT,2025,2.00000000000
+1,2040,R1,gasCCGT,2025,2.00000000000
+1,2045,R1,gasCCGT,2025,2.00000000000
+1,2049,R1,gasCCGT,2025,2.00000000000
+1,2050,R1,gasCCGT,2025,2.00000000000
+1,2054,R1,gasCCGT,2025,2.00000000000
+1,2055,R1,gasCCGT,2025,2.00000000000
+1,2064,R1,gasCCGT,2025,2.00000000000
+2,2035,R1,solarPV,2020,0.78230000000
+2,2040,R1,solarPV,2020,0.78230000000
+2,2045,R1,solarPV,2020,0.78230000000
+2,2049,R1,solarPV,2020,0.78230000000
+3,2035,R1,solarPV,2025,3.03230000000
+3,2040,R1,solarPV,2025,3.03230000000
+3,2045,R1,solarPV,2025,3.03230000000
+3,2049,R1,solarPV,2025,3.03230000000
+3,2050,R1,solarPV,2025,3.03230000000
+3,2054,R1,solarPV,2025,3.03230000000
+4,2040,R1,solarPV,2035,3.31160000000
+4,2045,R1,solarPV,2035,3.31160000000
+4,2049,R1,solarPV,2035,3.31160000000
+4,2050,R1,solarPV,2035,3.31160000000
+4,2054,R1,solarPV,2035,3.31160000000
+4,2055,R1,solarPV,2035,3.31160000000
+4,2064,R1,solarPV,2035,3.31160000000
+5,2035,R1,windturbine,2020,20.00000000000
+5,2040,R1,windturbine,2020,20.00000000000
+5,2045,R1,windturbine,2020,20.00000000000
+5,2049,R1,windturbine,2020,20.00000000000
+6,2035,R1,windturbine,2025,10.90320000000
+6,2040,R1,windturbine,2025,10.90320000000
+6,2045,R1,windturbine,2025,10.90320000000
+6,2049,R1,windturbine,2025,10.90320000000
+6,2050,R1,windturbine,2025,10.90320000000
+6,2054,R1,windturbine,2025,10.90320000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2040.csv
index 3969a49d0..21f523e88 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2040.csv
@@ -1,47 +1,47 @@
-asset,year,region,installed,technology,capacity
-1,2040,R1,2020,solarPV,0.78230000000
-1,2045,R1,2020,solarPV,0.78230000000
-1,2049,R1,2020,solarPV,0.78230000000
-2,2040,R1,2020,windturbine,20.00000000000
-2,2045,R1,2020,windturbine,20.00000000000
-2,2049,R1,2020,windturbine,20.00000000000
-3,2040,R1,2025,gasCCGT,2.00000000000
-3,2045,R1,2025,gasCCGT,2.00000000000
-3,2049,R1,2025,gasCCGT,2.00000000000
-3,2050,R1,2025,gasCCGT,2.00000000000
-3,2054,R1,2025,gasCCGT,2.00000000000
-3,2055,R1,2025,gasCCGT,2.00000000000
-3,2064,R1,2025,gasCCGT,2.00000000000
-4,2040,R1,2025,solarPV,3.03230000000
-4,2045,R1,2025,solarPV,3.03230000000
-4,2049,R1,2025,solarPV,3.03230000000
-4,2050,R1,2025,solarPV,3.03230000000
-4,2054,R1,2025,solarPV,3.03230000000
-5,2040,R1,2025,windturbine,10.90320000000
-5,2045,R1,2025,windturbine,10.90320000000
-5,2049,R1,2025,windturbine,10.90320000000
-5,2050,R1,2025,windturbine,10.90320000000
-5,2054,R1,2025,windturbine,10.90320000000
-6,2040,R1,2035,solarPV,3.31160000000
-6,2045,R1,2035,solarPV,3.31160000000
-6,2049,R1,2035,solarPV,3.31160000000
-6,2050,R1,2035,solarPV,3.31160000000
-6,2054,R1,2035,solarPV,3.31160000000
-6,2055,R1,2035,solarPV,3.31160000000
-6,2064,R1,2035,solarPV,3.31160000000
-7,2045,R1,2040,solarPV,7.12610000000
-7,2049,R1,2040,solarPV,7.12610000000
-7,2050,R1,2040,solarPV,7.12610000000
-7,2054,R1,2040,solarPV,7.12610000000
-7,2055,R1,2040,solarPV,7.12610000000
-7,2064,R1,2040,solarPV,7.12610000000
-7,2065,R1,2040,solarPV,7.12610000000
-7,2069,R1,2040,solarPV,7.12610000000
-8,2045,R1,2040,windturbine,0.46720000000
-8,2049,R1,2040,windturbine,0.46720000000
-8,2050,R1,2040,windturbine,0.46720000000
-8,2054,R1,2040,windturbine,0.46720000000
-8,2055,R1,2040,windturbine,0.46720000000
-8,2064,R1,2040,windturbine,0.46720000000
-8,2065,R1,2040,windturbine,0.46720000000
-8,2069,R1,2040,windturbine,0.46720000000
+asset,year,region,technology,installed,capacity
+1,2040,R1,gasCCGT,2025,2.00000000000
+1,2045,R1,gasCCGT,2025,2.00000000000
+1,2049,R1,gasCCGT,2025,2.00000000000
+1,2050,R1,gasCCGT,2025,2.00000000000
+1,2054,R1,gasCCGT,2025,2.00000000000
+1,2055,R1,gasCCGT,2025,2.00000000000
+1,2064,R1,gasCCGT,2025,2.00000000000
+2,2040,R1,solarPV,2020,0.78230000000
+2,2045,R1,solarPV,2020,0.78230000000
+2,2049,R1,solarPV,2020,0.78230000000
+3,2040,R1,solarPV,2025,3.03230000000
+3,2045,R1,solarPV,2025,3.03230000000
+3,2049,R1,solarPV,2025,3.03230000000
+3,2050,R1,solarPV,2025,3.03230000000
+3,2054,R1,solarPV,2025,3.03230000000
+4,2040,R1,solarPV,2035,3.31160000000
+4,2045,R1,solarPV,2035,3.31160000000
+4,2049,R1,solarPV,2035,3.31160000000
+4,2050,R1,solarPV,2035,3.31160000000
+4,2054,R1,solarPV,2035,3.31160000000
+4,2055,R1,solarPV,2035,3.31160000000
+4,2064,R1,solarPV,2035,3.31160000000
+5,2045,R1,solarPV,2040,7.12610000000
+5,2049,R1,solarPV,2040,7.12610000000
+5,2050,R1,solarPV,2040,7.12610000000
+5,2054,R1,solarPV,2040,7.12610000000
+5,2055,R1,solarPV,2040,7.12610000000
+5,2064,R1,solarPV,2040,7.12610000000
+5,2065,R1,solarPV,2040,7.12610000000
+5,2069,R1,solarPV,2040,7.12610000000
+6,2040,R1,windturbine,2020,20.00000000000
+6,2045,R1,windturbine,2020,20.00000000000
+6,2049,R1,windturbine,2020,20.00000000000
+7,2040,R1,windturbine,2025,10.90320000000
+7,2045,R1,windturbine,2025,10.90320000000
+7,2049,R1,windturbine,2025,10.90320000000
+7,2050,R1,windturbine,2025,10.90320000000
+7,2054,R1,windturbine,2025,10.90320000000
+8,2045,R1,windturbine,2040,0.46720000000
+8,2049,R1,windturbine,2040,0.46720000000
+8,2050,R1,windturbine,2040,0.46720000000
+8,2054,R1,windturbine,2040,0.46720000000
+8,2055,R1,windturbine,2040,0.46720000000
+8,2064,R1,windturbine,2040,0.46720000000
+8,2065,R1,windturbine,2040,0.46720000000
+8,2069,R1,windturbine,2040,0.46720000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2050.csv
index e3a241693..76dd0b6be 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Power/Capacity/2050.csv
@@ -1,51 +1,51 @@
-asset,year,region,installed,technology,capacity
-2,2050,R1,2025,gasCCGT,2.00000000000
-2,2054,R1,2025,gasCCGT,2.00000000000
-2,2055,R1,2025,gasCCGT,2.00000000000
-2,2064,R1,2025,gasCCGT,2.00000000000
-3,2050,R1,2025,solarPV,3.03230000000
-3,2054,R1,2025,solarPV,3.03230000000
-4,2050,R1,2025,windturbine,10.90320000000
-4,2054,R1,2025,windturbine,10.90320000000
-5,2050,R1,2035,solarPV,3.31160000000
-5,2054,R1,2035,solarPV,3.31160000000
-5,2055,R1,2035,solarPV,3.31160000000
-5,2064,R1,2035,solarPV,3.31160000000
-6,2050,R1,2040,solarPV,7.12610000000
-6,2054,R1,2040,solarPV,7.12610000000
-6,2055,R1,2040,solarPV,7.12610000000
-6,2064,R1,2040,solarPV,7.12610000000
-6,2065,R1,2040,solarPV,7.12610000000
-6,2069,R1,2040,solarPV,7.12610000000
-7,2050,R1,2040,windturbine,0.46720000000
-7,2054,R1,2040,windturbine,0.46720000000
-7,2055,R1,2040,windturbine,0.46720000000
-7,2064,R1,2040,windturbine,0.46720000000
-7,2065,R1,2040,windturbine,0.46720000000
-7,2069,R1,2040,windturbine,0.46720000000
-8,2050,R1,2045,gasCCGT,1.65880000000
-8,2054,R1,2045,gasCCGT,1.65880000000
-8,2055,R1,2045,gasCCGT,1.65880000000
-8,2064,R1,2045,gasCCGT,1.65880000000
-8,2065,R1,2045,gasCCGT,1.65880000000
-8,2069,R1,2045,gasCCGT,1.65880000000
-8,2070,R1,2045,gasCCGT,1.65880000000
-8,2074,R1,2045,gasCCGT,1.65880000000
-8,2075,R1,2045,gasCCGT,1.65880000000
-8,2084,R1,2045,gasCCGT,1.65880000000
-9,2050,R1,2045,solarPV,28.21280000000
-9,2054,R1,2045,solarPV,28.21280000000
-9,2055,R1,2045,solarPV,28.21280000000
-9,2064,R1,2045,solarPV,28.21280000000
-9,2065,R1,2045,solarPV,28.21280000000
-9,2069,R1,2045,solarPV,28.21280000000
-9,2070,R1,2045,solarPV,28.21280000000
-9,2074,R1,2045,solarPV,28.21280000000
-10,2050,R1,2045,windturbine,16.24660000000
-10,2054,R1,2045,windturbine,16.24660000000
-10,2055,R1,2045,windturbine,16.24660000000
-10,2064,R1,2045,windturbine,16.24660000000
-10,2065,R1,2045,windturbine,16.24660000000
-10,2069,R1,2045,windturbine,16.24660000000
-10,2070,R1,2045,windturbine,16.24660000000
-10,2074,R1,2045,windturbine,16.24660000000
+asset,year,region,technology,installed,capacity
+0,2050,R1,gasCCGT,2025,2.00000000000
+0,2054,R1,gasCCGT,2025,2.00000000000
+0,2055,R1,gasCCGT,2025,2.00000000000
+0,2064,R1,gasCCGT,2025,2.00000000000
+1,2050,R1,gasCCGT,2045,1.65880000000
+1,2054,R1,gasCCGT,2045,1.65880000000
+1,2055,R1,gasCCGT,2045,1.65880000000
+1,2064,R1,gasCCGT,2045,1.65880000000
+1,2065,R1,gasCCGT,2045,1.65880000000
+1,2069,R1,gasCCGT,2045,1.65880000000
+1,2070,R1,gasCCGT,2045,1.65880000000
+1,2074,R1,gasCCGT,2045,1.65880000000
+1,2075,R1,gasCCGT,2045,1.65880000000
+1,2084,R1,gasCCGT,2045,1.65880000000
+3,2050,R1,solarPV,2025,3.03230000000
+3,2054,R1,solarPV,2025,3.03230000000
+4,2050,R1,solarPV,2035,3.31160000000
+4,2054,R1,solarPV,2035,3.31160000000
+4,2055,R1,solarPV,2035,3.31160000000
+4,2064,R1,solarPV,2035,3.31160000000
+5,2050,R1,solarPV,2040,7.12610000000
+5,2054,R1,solarPV,2040,7.12610000000
+5,2055,R1,solarPV,2040,7.12610000000
+5,2064,R1,solarPV,2040,7.12610000000
+5,2065,R1,solarPV,2040,7.12610000000
+5,2069,R1,solarPV,2040,7.12610000000
+6,2050,R1,solarPV,2045,28.21280000000
+6,2054,R1,solarPV,2045,28.21280000000
+6,2055,R1,solarPV,2045,28.21280000000
+6,2064,R1,solarPV,2045,28.21280000000
+6,2065,R1,solarPV,2045,28.21280000000
+6,2069,R1,solarPV,2045,28.21280000000
+6,2070,R1,solarPV,2045,28.21280000000
+6,2074,R1,solarPV,2045,28.21280000000
+8,2050,R1,windturbine,2025,10.90320000000
+8,2054,R1,windturbine,2025,10.90320000000
+9,2050,R1,windturbine,2040,0.46720000000
+9,2054,R1,windturbine,2040,0.46720000000
+9,2055,R1,windturbine,2040,0.46720000000
+9,2064,R1,windturbine,2040,0.46720000000
+9,2065,R1,windturbine,2040,0.46720000000
+9,2069,R1,windturbine,2040,0.46720000000
+10,2050,R1,windturbine,2045,16.24660000000
+10,2054,R1,windturbine,2045,16.24660000000
+10,2055,R1,windturbine,2045,16.24660000000
+10,2064,R1,windturbine,2045,16.24660000000
+10,2065,R1,windturbine,2045,16.24660000000
+10,2069,R1,windturbine,2045,16.24660000000
+10,2070,R1,windturbine,2045,16.24660000000
+10,2074,R1,windturbine,2045,16.24660000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2025.csv
index db6e6073b..bba2b270a 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2025.csv
@@ -1,5 +1,5 @@
-asset,year,region,installed,technology,capacity
-0,2025,R1,2020,gasboiler,5.00000000000
-1,2025,R1,2020,heatpump,119.00000000000
-1,2030,R1,2020,heatpump,119.00000000000
-1,2034,R1,2020,heatpump,119.00000000000
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,119.00000000000
+1,2030,R1,heatpump,2020,119.00000000000
+1,2034,R1,heatpump,2020,119.00000000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2035.csv
index 6d888046f..acf603100 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2035.csv
@@ -1,7 +1,7 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2030,gasboiler,7.20000000000
-1,2040,R1,2030,gasboiler,7.20000000000
-1,2044,R1,2030,gasboiler,7.20000000000
-2,2035,R1,2030,heatpump,128.80000000000
-2,2040,R1,2030,heatpump,128.80000000000
-2,2044,R1,2030,heatpump,128.80000000000
+asset,year,region,technology,installed,capacity
+0,2035,R1,gasboiler,2030,7.20000000000
+0,2040,R1,gasboiler,2030,7.20000000000
+0,2044,R1,gasboiler,2030,7.20000000000
+2,2035,R1,heatpump,2030,128.80000000000
+2,2040,R1,heatpump,2030,128.80000000000
+2,2044,R1,heatpump,2030,128.80000000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2045.csv
index 799a06648..c4060b3eb 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2045.csv
@@ -1,7 +1,7 @@
-asset,year,region,installed,technology,capacity
-2,2045,R1,2040,gasboiler,7.44000000000
-2,2050,R1,2040,gasboiler,7.44000000000
-2,2054,R1,2040,gasboiler,7.44000000000
-3,2045,R1,2040,heatpump,140.56000000000
-3,2050,R1,2040,heatpump,140.56000000000
-3,2054,R1,2040,heatpump,140.56000000000
+asset,year,region,technology,installed,capacity
+1,2045,R1,gasboiler,2040,7.44000000000
+1,2050,R1,gasboiler,2040,7.44000000000
+1,2054,R1,gasboiler,2040,7.44000000000
+3,2045,R1,heatpump,2040,140.56000000000
+3,2050,R1,heatpump,2040,140.56000000000
+3,2054,R1,heatpump,2040,140.56000000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2050.csv
index 85bfbefaa..7c95de2a9 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Capacity/2050.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-2,2050,R1,2040,gasboiler,7.44000000000
-2,2054,R1,2040,gasboiler,7.44000000000
-3,2050,R1,2040,heatpump,140.56000000000
-3,2054,R1,2040,heatpump,140.56000000000
-4,2055,R1,2050,gasboiler,9.32800000000
-4,2064,R1,2050,gasboiler,9.32800000000
-5,2055,R1,2050,heatpump,98.67200000000
-5,2064,R1,2050,heatpump,98.67200000000
+asset,year,region,technology,installed,capacity
+1,2050,R1,gasboiler,2040,7.44000000000
+1,2054,R1,gasboiler,2040,7.44000000000
+2,2055,R1,gasboiler,2050,9.32800000000
+2,2064,R1,gasboiler,2050,9.32800000000
+4,2050,R1,heatpump,2040,140.56000000000
+4,2054,R1,heatpump,2040,140.56000000000
+5,2055,R1,heatpump,2050,98.67200000000
+5,2064,R1,heatpump,2050,98.67200000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2020.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2020.csv
index 57fe2699e..93c5f764b 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2020.csv
@@ -1,31 +1,31 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2020,0,R1,gasboiler,2020,all-year,all-week,night,1.00000000000
-0,heat,2025,0,R1,gasboiler,2020,all-year,all-week,night,0.05380000000
-0,heat,2025,1,R1,heatpump,2020,all-year,all-week,night,1.27960000000
-0,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,night,64.71000000000
-0,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,night,3.47900000000
-1,heat,2020,0,R1,gasboiler,2020,all-year,all-week,morning,1.50000000000
-1,heat,2025,0,R1,gasboiler,2020,all-year,all-week,morning,0.08060000000
-1,heat,2025,1,R1,heatpump,2020,all-year,all-week,morning,1.91940000000
-1,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,morning,97.06500000000
-1,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,morning,5.21850000000
-2,heat,2020,0,R1,gasboiler,2020,all-year,all-week,afternoon,1.00000000000
-2,heat,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.05380000000
-2,heat,2025,1,R1,heatpump,2020,all-year,all-week,afternoon,1.27960000000
-2,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,afternoon,64.71000000000
-2,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,3.47900000000
-3,heat,2020,0,R1,gasboiler,2020,all-year,all-week,early-peak,1.50000000000
-3,heat,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.08060000000
-3,heat,2025,1,R1,heatpump,2020,all-year,all-week,early-peak,1.91940000000
-3,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,early-peak,97.06500000000
-3,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,5.21850000000
-4,heat,2020,0,R1,gasboiler,2020,all-year,all-week,late-peak,3.00000000000
-4,heat,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,0.16130000000
-4,heat,2025,1,R1,heatpump,2020,all-year,all-week,late-peak,3.83870000000
-4,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,late-peak,194.13000000000
-4,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,10.43710000000
-5,heat,2020,0,R1,gasboiler,2020,all-year,all-week,evening,2.00000000000
-5,heat,2025,0,R1,gasboiler,2020,all-year,all-week,evening,0.10750000000
-5,heat,2025,1,R1,heatpump,2020,all-year,all-week,evening,2.55910000000
-5,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,evening,129.42000000000
-5,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,evening,6.95810000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,1.00000000000
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.05380000000
+0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.27960000000
+0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,64.71000000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,3.47900000000
+1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.08060000000
+1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.91940000000
+1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,5.21850000000
+2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.05380000000
+2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.27960000000
+2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,3.47900000000
+3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.08060000000
+3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.91940000000
+3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,5.21850000000
+4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.16130000000
+4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.83870000000
+4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,10.43710000000
+5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.10750000000
+5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.55910000000
+5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,6.95810000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2025.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2025.csv
index 1339d7d26..1de5dcc2a 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2025.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,heat,2025,0,R1,2020,gasboiler,all-year,all-week,night,0.05380000000
-0,heat,2025,1,R1,2020,heatpump,all-year,all-week,night,1.27960000000
-0,heat,2030,1,R1,2020,heatpump,all-year,all-week,night,1.66670000000
-0,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,night,3.47900000000
-1,heat,2025,0,R1,2020,gasboiler,all-year,all-week,morning,0.08060000000
-1,heat,2025,1,R1,2020,heatpump,all-year,all-week,morning,1.91940000000
-1,heat,2030,1,R1,2020,heatpump,all-year,all-week,morning,2.50000000000
-1,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,morning,5.21850000000
-2,heat,2025,0,R1,2020,gasboiler,all-year,all-week,afternoon,0.05380000000
-2,heat,2025,1,R1,2020,heatpump,all-year,all-week,afternoon,1.27960000000
-2,heat,2030,1,R1,2020,heatpump,all-year,all-week,afternoon,1.66670000000
-2,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,afternoon,3.47900000000
-3,heat,2025,0,R1,2020,gasboiler,all-year,all-week,early-peak,0.08060000000
-3,heat,2025,1,R1,2020,heatpump,all-year,all-week,early-peak,1.91940000000
-3,heat,2030,1,R1,2020,heatpump,all-year,all-week,early-peak,2.50000000000
-3,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,early-peak,5.21850000000
-4,heat,2025,0,R1,2020,gasboiler,all-year,all-week,late-peak,0.16130000000
-4,heat,2025,1,R1,2020,heatpump,all-year,all-week,late-peak,3.83870000000
-4,heat,2030,1,R1,2020,heatpump,all-year,all-week,late-peak,5.00000000000
-4,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,late-peak,10.43710000000
-5,heat,2025,0,R1,2020,gasboiler,all-year,all-week,evening,0.10750000000
-5,heat,2025,1,R1,2020,heatpump,all-year,all-week,evening,2.55910000000
-5,heat,2030,1,R1,2020,heatpump,all-year,all-week,evening,3.33330000000
-5,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,evening,6.95810000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.05380000000
+0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.27960000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.66670000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,3.47900000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.08060000000
+1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.91940000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,2.50000000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,5.21850000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.05380000000
+2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.27960000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.66670000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,3.47900000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.08060000000
+3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.91940000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,2.50000000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,5.21850000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.16130000000
+4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.83870000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,5.00000000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,10.43710000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.10750000000
+5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.55910000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,3.33330000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,6.95810000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2030.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2030.csv
index 9c87f423d..9dac1d1f4 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2030.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2030,1,R1,heatpump,2020,all-year,all-week,night,1.66670000000
-0,heat,2035,0,R1,gasboiler,2030,all-year,all-week,night,0.10590000000
-0,heat,2035,2,R1,heatpump,2030,all-year,all-week,night,1.89410000000
-0,CO2f,2035,0,R1,gasboiler,2030,all-year,all-week,night,6.85160000000
-1,heat,2030,1,R1,heatpump,2020,all-year,all-week,morning,2.50000000000
-1,heat,2035,0,R1,gasboiler,2030,all-year,all-week,morning,0.15880000000
-1,heat,2035,2,R1,heatpump,2030,all-year,all-week,morning,2.84120000000
-1,CO2f,2035,0,R1,gasboiler,2030,all-year,all-week,morning,10.27750000000
-2,heat,2030,1,R1,heatpump,2020,all-year,all-week,afternoon,1.66670000000
-2,heat,2035,0,R1,gasboiler,2030,all-year,all-week,afternoon,0.10590000000
-2,heat,2035,2,R1,heatpump,2030,all-year,all-week,afternoon,1.89410000000
-2,CO2f,2035,0,R1,gasboiler,2030,all-year,all-week,afternoon,6.85160000000
-3,heat,2030,1,R1,heatpump,2020,all-year,all-week,early-peak,2.50000000000
-3,heat,2035,0,R1,gasboiler,2030,all-year,all-week,early-peak,0.15880000000
-3,heat,2035,2,R1,heatpump,2030,all-year,all-week,early-peak,2.84120000000
-3,CO2f,2035,0,R1,gasboiler,2030,all-year,all-week,early-peak,10.27750000000
-4,heat,2030,1,R1,heatpump,2020,all-year,all-week,late-peak,5.00000000000
-4,heat,2035,0,R1,gasboiler,2030,all-year,all-week,late-peak,0.31760000000
-4,heat,2035,2,R1,heatpump,2030,all-year,all-week,late-peak,5.68240000000
-4,CO2f,2035,0,R1,gasboiler,2030,all-year,all-week,late-peak,20.55490000000
-5,heat,2030,1,R1,heatpump,2020,all-year,all-week,evening,3.33330000000
-5,heat,2035,0,R1,gasboiler,2030,all-year,all-week,evening,0.21180000000
-5,heat,2035,2,R1,heatpump,2030,all-year,all-week,evening,3.78820000000
-5,CO2f,2035,0,R1,gasboiler,2030,all-year,all-week,evening,13.70330000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.66670000000
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2030,0.10590000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2030,1.89410000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2030,6.85160000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,2.50000000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2030,0.15880000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2030,2.84120000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2030,10.27750000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.66670000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2030,0.10590000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2030,1.89410000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2030,6.85160000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,2.50000000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2030,0.15880000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2030,2.84120000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2030,10.27750000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,5.00000000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2030,0.31760000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2030,5.68240000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2030,20.55490000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,3.33330000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2030,0.21180000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2030,3.78820000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2030,13.70330000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2035.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2035.csv
index f8de21570..c6d2e57f6 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2035.csv
@@ -1,37 +1,37 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,heat,2035,1,R1,2030,gasboiler,all-year,all-week,night,0.10590000000
-0,heat,2035,2,R1,2030,heatpump,all-year,all-week,night,1.89410000000
-0,heat,2040,1,R1,2030,gasboiler,all-year,all-week,night,0.12350000000
-0,heat,2040,2,R1,2030,heatpump,all-year,all-week,night,2.20980000000
-0,CO2f,2035,1,R1,2030,gasboiler,all-year,all-week,night,6.85160000000
-0,CO2f,2040,1,R1,2030,gasboiler,all-year,all-week,night,7.99360000000
-1,heat,2035,1,R1,2030,gasboiler,all-year,all-week,morning,0.15880000000
-1,heat,2035,2,R1,2030,heatpump,all-year,all-week,morning,2.84120000000
-1,heat,2040,1,R1,2030,gasboiler,all-year,all-week,morning,0.18530000000
-1,heat,2040,2,R1,2030,heatpump,all-year,all-week,morning,3.31470000000
-1,CO2f,2035,1,R1,2030,gasboiler,all-year,all-week,morning,10.27750000000
-1,CO2f,2040,1,R1,2030,gasboiler,all-year,all-week,morning,11.99040000000
-2,heat,2035,1,R1,2030,gasboiler,all-year,all-week,afternoon,0.10590000000
-2,heat,2035,2,R1,2030,heatpump,all-year,all-week,afternoon,1.89410000000
-2,heat,2040,1,R1,2030,gasboiler,all-year,all-week,afternoon,0.12350000000
-2,heat,2040,2,R1,2030,heatpump,all-year,all-week,afternoon,2.20980000000
-2,CO2f,2035,1,R1,2030,gasboiler,all-year,all-week,afternoon,6.85160000000
-2,CO2f,2040,1,R1,2030,gasboiler,all-year,all-week,afternoon,7.99360000000
-3,heat,2035,1,R1,2030,gasboiler,all-year,all-week,early-peak,0.15880000000
-3,heat,2035,2,R1,2030,heatpump,all-year,all-week,early-peak,2.84120000000
-3,heat,2040,1,R1,2030,gasboiler,all-year,all-week,early-peak,0.18530000000
-3,heat,2040,2,R1,2030,heatpump,all-year,all-week,early-peak,3.31470000000
-3,CO2f,2035,1,R1,2030,gasboiler,all-year,all-week,early-peak,10.27750000000
-3,CO2f,2040,1,R1,2030,gasboiler,all-year,all-week,early-peak,11.99040000000
-4,heat,2035,1,R1,2030,gasboiler,all-year,all-week,late-peak,0.31760000000
-4,heat,2035,2,R1,2030,heatpump,all-year,all-week,late-peak,5.68240000000
-4,heat,2040,1,R1,2030,gasboiler,all-year,all-week,late-peak,0.37060000000
-4,heat,2040,2,R1,2030,heatpump,all-year,all-week,late-peak,6.62940000000
-4,CO2f,2035,1,R1,2030,gasboiler,all-year,all-week,late-peak,20.55490000000
-4,CO2f,2040,1,R1,2030,gasboiler,all-year,all-week,late-peak,23.98080000000
-5,heat,2035,1,R1,2030,gasboiler,all-year,all-week,evening,0.21180000000
-5,heat,2035,2,R1,2030,heatpump,all-year,all-week,evening,3.78820000000
-5,heat,2040,1,R1,2030,gasboiler,all-year,all-week,evening,0.24710000000
-5,heat,2040,2,R1,2030,heatpump,all-year,all-week,evening,4.41960000000
-5,CO2f,2035,1,R1,2030,gasboiler,all-year,all-week,evening,13.70330000000
-5,CO2f,2040,1,R1,2030,gasboiler,all-year,all-week,evening,15.98720000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2030,0.10590000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2030,1.89410000000
+0,heat,2040,0,R1,all-year,all-week,night,gasboiler,2030,0.12350000000
+0,heat,2040,2,R1,all-year,all-week,night,heatpump,2030,2.20980000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2030,6.85160000000
+0,CO2f,2040,0,R1,all-year,all-week,night,gasboiler,2030,7.99360000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2030,0.15880000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2030,2.84120000000
+1,heat,2040,0,R1,all-year,all-week,morning,gasboiler,2030,0.18530000000
+1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2030,3.31470000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2030,10.27750000000
+1,CO2f,2040,0,R1,all-year,all-week,morning,gasboiler,2030,11.99040000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2030,0.10590000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2030,1.89410000000
+2,heat,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,0.12350000000
+2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2030,2.20980000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2030,6.85160000000
+2,CO2f,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,7.99360000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2030,0.15880000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2030,2.84120000000
+3,heat,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,0.18530000000
+3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2030,3.31470000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2030,10.27750000000
+3,CO2f,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,11.99040000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2030,0.31760000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2030,5.68240000000
+4,heat,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,0.37060000000
+4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2030,6.62940000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2030,20.55490000000
+4,CO2f,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,23.98080000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2030,0.21180000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2030,3.78820000000
+5,heat,2040,0,R1,all-year,all-week,evening,gasboiler,2030,0.24710000000
+5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2030,4.41960000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2030,13.70330000000
+5,CO2f,2040,0,R1,all-year,all-week,evening,gasboiler,2030,15.98720000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2040.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2040.csv
index 9a26b20db..f0709c734 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2040.csv
@@ -1,37 +1,37 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2040,0,R1,gasboiler,2030,all-year,all-week,night,0.12350000000
-0,heat,2040,2,R1,heatpump,2030,all-year,all-week,night,2.20980000000
-0,heat,2045,1,R1,gasboiler,2040,all-year,all-week,night,0.13410000000
-0,heat,2045,3,R1,heatpump,2040,all-year,all-week,night,2.53260000000
-0,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,night,7.99360000000
-0,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,night,8.67460000000
-1,heat,2040,0,R1,gasboiler,2030,all-year,all-week,morning,0.18530000000
-1,heat,2040,2,R1,heatpump,2030,all-year,all-week,morning,3.31470000000
-1,heat,2045,1,R1,gasboiler,2040,all-year,all-week,morning,0.20110000000
-1,heat,2045,3,R1,heatpump,2040,all-year,all-week,morning,3.79890000000
-1,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,morning,11.99040000000
-1,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,morning,13.01200000000
-2,heat,2040,0,R1,gasboiler,2030,all-year,all-week,afternoon,0.12350000000
-2,heat,2040,2,R1,heatpump,2030,all-year,all-week,afternoon,2.20980000000
-2,heat,2045,1,R1,gasboiler,2040,all-year,all-week,afternoon,0.13410000000
-2,heat,2045,3,R1,heatpump,2040,all-year,all-week,afternoon,2.53260000000
-2,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,afternoon,7.99360000000
-2,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,afternoon,8.67460000000
-3,heat,2040,0,R1,gasboiler,2030,all-year,all-week,early-peak,0.18530000000
-3,heat,2040,2,R1,heatpump,2030,all-year,all-week,early-peak,3.31470000000
-3,heat,2045,1,R1,gasboiler,2040,all-year,all-week,early-peak,0.20110000000
-3,heat,2045,3,R1,heatpump,2040,all-year,all-week,early-peak,3.79890000000
-3,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,early-peak,11.99040000000
-3,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,early-peak,13.01200000000
-4,heat,2040,0,R1,gasboiler,2030,all-year,all-week,late-peak,0.37060000000
-4,heat,2040,2,R1,heatpump,2030,all-year,all-week,late-peak,6.62940000000
-4,heat,2045,1,R1,gasboiler,2040,all-year,all-week,late-peak,0.40220000000
-4,heat,2045,3,R1,heatpump,2040,all-year,all-week,late-peak,7.59780000000
-4,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,late-peak,23.98080000000
-4,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,late-peak,26.02390000000
-5,heat,2040,0,R1,gasboiler,2030,all-year,all-week,evening,0.24710000000
-5,heat,2040,2,R1,heatpump,2030,all-year,all-week,evening,4.41960000000
-5,heat,2045,1,R1,gasboiler,2040,all-year,all-week,evening,0.26810000000
-5,heat,2045,3,R1,heatpump,2040,all-year,all-week,evening,5.06520000000
-5,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,evening,15.98720000000
-5,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,evening,17.34930000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2040,0,R1,all-year,all-week,night,gasboiler,2030,0.12350000000
+0,heat,2040,2,R1,all-year,all-week,night,heatpump,2030,2.20980000000
+0,heat,2045,1,R1,all-year,all-week,night,gasboiler,2040,0.13410000000
+0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,2.53260000000
+0,CO2f,2040,0,R1,all-year,all-week,night,gasboiler,2030,7.99360000000
+0,CO2f,2045,1,R1,all-year,all-week,night,gasboiler,2040,8.67460000000
+1,heat,2040,0,R1,all-year,all-week,morning,gasboiler,2030,0.18530000000
+1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2030,3.31470000000
+1,heat,2045,1,R1,all-year,all-week,morning,gasboiler,2040,0.20110000000
+1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,3.79890000000
+1,CO2f,2040,0,R1,all-year,all-week,morning,gasboiler,2030,11.99040000000
+1,CO2f,2045,1,R1,all-year,all-week,morning,gasboiler,2040,13.01200000000
+2,heat,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,0.12350000000
+2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2030,2.20980000000
+2,heat,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.13410000000
+2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,2.53260000000
+2,CO2f,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,7.99360000000
+2,CO2f,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,8.67460000000
+3,heat,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,0.18530000000
+3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2030,3.31470000000
+3,heat,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.20110000000
+3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,3.79890000000
+3,CO2f,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,11.99040000000
+3,CO2f,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,13.01200000000
+4,heat,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,0.37060000000
+4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2030,6.62940000000
+4,heat,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,0.40220000000
+4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,7.59780000000
+4,CO2f,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,23.98080000000
+4,CO2f,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,26.02390000000
+5,heat,2040,0,R1,all-year,all-week,evening,gasboiler,2030,0.24710000000
+5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2030,4.41960000000
+5,heat,2045,1,R1,all-year,all-week,evening,gasboiler,2040,0.26810000000
+5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,5.06520000000
+5,CO2f,2040,0,R1,all-year,all-week,evening,gasboiler,2030,15.98720000000
+5,CO2f,2045,1,R1,all-year,all-week,evening,gasboiler,2040,17.34930000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2045.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2045.csv
index cf942a498..7771a5f6b 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2045.csv
@@ -1,37 +1,37 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,heat,2045,2,R1,2040,gasboiler,all-year,all-week,night,0.13410000000
-0,heat,2045,3,R1,2040,heatpump,all-year,all-week,night,2.53260000000
-0,heat,2050,2,R1,2040,gasboiler,all-year,all-week,night,0.15080000000
-0,heat,2050,3,R1,2040,heatpump,all-year,all-week,night,2.84920000000
-0,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,night,8.67460000000
-0,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,night,9.75900000000
-1,heat,2045,2,R1,2040,gasboiler,all-year,all-week,morning,0.20110000000
-1,heat,2045,3,R1,2040,heatpump,all-year,all-week,morning,3.79890000000
-1,heat,2050,2,R1,2040,gasboiler,all-year,all-week,morning,0.22620000000
-1,heat,2050,3,R1,2040,heatpump,all-year,all-week,morning,4.27380000000
-1,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,morning,13.01200000000
-1,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,morning,14.63850000000
-2,heat,2045,2,R1,2040,gasboiler,all-year,all-week,afternoon,0.13410000000
-2,heat,2045,3,R1,2040,heatpump,all-year,all-week,afternoon,2.53260000000
-2,heat,2050,2,R1,2040,gasboiler,all-year,all-week,afternoon,0.15080000000
-2,heat,2050,3,R1,2040,heatpump,all-year,all-week,afternoon,2.84920000000
-2,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,afternoon,8.67460000000
-2,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,afternoon,9.75900000000
-3,heat,2045,2,R1,2040,gasboiler,all-year,all-week,early-peak,0.20110000000
-3,heat,2045,3,R1,2040,heatpump,all-year,all-week,early-peak,3.79890000000
-3,heat,2050,2,R1,2040,gasboiler,all-year,all-week,early-peak,0.22620000000
-3,heat,2050,3,R1,2040,heatpump,all-year,all-week,early-peak,4.27380000000
-3,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,early-peak,13.01200000000
-3,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,early-peak,14.63850000000
-4,heat,2045,2,R1,2040,gasboiler,all-year,all-week,late-peak,0.40220000000
-4,heat,2045,3,R1,2040,heatpump,all-year,all-week,late-peak,7.59780000000
-4,heat,2050,2,R1,2040,gasboiler,all-year,all-week,late-peak,0.45240000000
-4,heat,2050,3,R1,2040,heatpump,all-year,all-week,late-peak,8.54760000000
-4,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,late-peak,26.02390000000
-4,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,late-peak,29.27690000000
-5,heat,2045,2,R1,2040,gasboiler,all-year,all-week,evening,0.26810000000
-5,heat,2045,3,R1,2040,heatpump,all-year,all-week,evening,5.06520000000
-5,heat,2050,2,R1,2040,gasboiler,all-year,all-week,evening,0.30160000000
-5,heat,2050,3,R1,2040,heatpump,all-year,all-week,evening,5.69840000000
-5,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,evening,17.34930000000
-5,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,evening,19.51790000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2045,1,R1,all-year,all-week,night,gasboiler,2040,0.13410000000
+0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,2.53260000000
+0,heat,2050,1,R1,all-year,all-week,night,gasboiler,2040,0.15080000000
+0,heat,2050,3,R1,all-year,all-week,night,heatpump,2040,2.84920000000
+0,CO2f,2045,1,R1,all-year,all-week,night,gasboiler,2040,8.67460000000
+0,CO2f,2050,1,R1,all-year,all-week,night,gasboiler,2040,9.75900000000
+1,heat,2045,1,R1,all-year,all-week,morning,gasboiler,2040,0.20110000000
+1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,3.79890000000
+1,heat,2050,1,R1,all-year,all-week,morning,gasboiler,2040,0.22620000000
+1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2040,4.27380000000
+1,CO2f,2045,1,R1,all-year,all-week,morning,gasboiler,2040,13.01200000000
+1,CO2f,2050,1,R1,all-year,all-week,morning,gasboiler,2040,14.63850000000
+2,heat,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.13410000000
+2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,2.53260000000
+2,heat,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.15080000000
+2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2040,2.84920000000
+2,CO2f,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,8.67460000000
+2,CO2f,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,9.75900000000
+3,heat,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.20110000000
+3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,3.79890000000
+3,heat,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.22620000000
+3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2040,4.27380000000
+3,CO2f,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,13.01200000000
+3,CO2f,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,14.63850000000
+4,heat,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,0.40220000000
+4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,7.59780000000
+4,heat,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,0.45240000000
+4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2040,8.54760000000
+4,CO2f,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,26.02390000000
+4,CO2f,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,29.27690000000
+5,heat,2045,1,R1,all-year,all-week,evening,gasboiler,2040,0.26810000000
+5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,5.06520000000
+5,heat,2050,1,R1,all-year,all-week,evening,gasboiler,2040,0.30160000000
+5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2040,5.69840000000
+5,CO2f,2045,1,R1,all-year,all-week,evening,gasboiler,2040,17.34930000000
+5,CO2f,2050,1,R1,all-year,all-week,evening,gasboiler,2040,19.51790000000
diff --git a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2050.csv b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2050.csv
index 9d4b068ad..d8f4b1502 100644
--- a/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/2-add-agent/1-multiple-objective/Results/Residential/Supply/2050.csv
@@ -1,37 +1,37 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,heat,2050,2,R1,2040,gasboiler,all-year,all-week,night,0.15080000000
-0,heat,2050,3,R1,2040,heatpump,all-year,all-week,night,2.84920000000
-0,heat,2055,4,R1,2050,gasboiler,all-year,all-week,night,0.25910000000
-0,heat,2055,5,R1,2050,heatpump,all-year,all-week,night,2.74090000000
-0,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,night,9.75900000000
-0,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,night,16.76710000000
-1,heat,2050,2,R1,2040,gasboiler,all-year,all-week,morning,0.22620000000
-1,heat,2050,3,R1,2040,heatpump,all-year,all-week,morning,4.27380000000
-1,heat,2055,4,R1,2050,gasboiler,all-year,all-week,morning,0.38870000000
-1,heat,2055,5,R1,2050,heatpump,all-year,all-week,morning,4.11130000000
-1,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,morning,14.63850000000
-1,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,morning,25.15060000000
-2,heat,2050,2,R1,2040,gasboiler,all-year,all-week,afternoon,0.15080000000
-2,heat,2050,3,R1,2040,heatpump,all-year,all-week,afternoon,2.84920000000
-2,heat,2055,4,R1,2050,gasboiler,all-year,all-week,afternoon,0.25910000000
-2,heat,2055,5,R1,2050,heatpump,all-year,all-week,afternoon,2.74090000000
-2,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,afternoon,9.75900000000
-2,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,afternoon,16.76710000000
-3,heat,2050,2,R1,2040,gasboiler,all-year,all-week,early-peak,0.22620000000
-3,heat,2050,3,R1,2040,heatpump,all-year,all-week,early-peak,4.27380000000
-3,heat,2055,4,R1,2050,gasboiler,all-year,all-week,early-peak,0.38870000000
-3,heat,2055,5,R1,2050,heatpump,all-year,all-week,early-peak,4.11130000000
-3,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,early-peak,14.63850000000
-3,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,early-peak,25.15060000000
-4,heat,2050,2,R1,2040,gasboiler,all-year,all-week,late-peak,0.45240000000
-4,heat,2050,3,R1,2040,heatpump,all-year,all-week,late-peak,8.54760000000
-4,heat,2055,4,R1,2050,gasboiler,all-year,all-week,late-peak,0.77730000000
-4,heat,2055,5,R1,2050,heatpump,all-year,all-week,late-peak,8.22270000000
-4,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,late-peak,29.27690000000
-4,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,late-peak,50.30120000000
-5,heat,2050,2,R1,2040,gasboiler,all-year,all-week,evening,0.30160000000
-5,heat,2050,3,R1,2040,heatpump,all-year,all-week,evening,5.69840000000
-5,heat,2055,4,R1,2050,gasboiler,all-year,all-week,evening,0.51820000000
-5,heat,2055,5,R1,2050,heatpump,all-year,all-week,evening,5.48180000000
-5,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,evening,19.51790000000
-5,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,evening,33.53420000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2050,1,R1,all-year,all-week,night,gasboiler,2040,0.15080000000
+0,heat,2050,4,R1,all-year,all-week,night,heatpump,2040,2.84920000000
+0,heat,2055,2,R1,all-year,all-week,night,gasboiler,2050,0.25910000000
+0,heat,2055,5,R1,all-year,all-week,night,heatpump,2050,2.74090000000
+0,CO2f,2050,1,R1,all-year,all-week,night,gasboiler,2040,9.75900000000
+0,CO2f,2055,2,R1,all-year,all-week,night,gasboiler,2050,16.76710000000
+1,heat,2050,1,R1,all-year,all-week,morning,gasboiler,2040,0.22620000000
+1,heat,2050,4,R1,all-year,all-week,morning,heatpump,2040,4.27380000000
+1,heat,2055,2,R1,all-year,all-week,morning,gasboiler,2050,0.38870000000
+1,heat,2055,5,R1,all-year,all-week,morning,heatpump,2050,4.11130000000
+1,CO2f,2050,1,R1,all-year,all-week,morning,gasboiler,2040,14.63850000000
+1,CO2f,2055,2,R1,all-year,all-week,morning,gasboiler,2050,25.15060000000
+2,heat,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.15080000000
+2,heat,2050,4,R1,all-year,all-week,afternoon,heatpump,2040,2.84920000000
+2,heat,2055,2,R1,all-year,all-week,afternoon,gasboiler,2050,0.25910000000
+2,heat,2055,5,R1,all-year,all-week,afternoon,heatpump,2050,2.74090000000
+2,CO2f,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,9.75900000000
+2,CO2f,2055,2,R1,all-year,all-week,afternoon,gasboiler,2050,16.76710000000
+3,heat,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.22620000000
+3,heat,2050,4,R1,all-year,all-week,early-peak,heatpump,2040,4.27380000000
+3,heat,2055,2,R1,all-year,all-week,early-peak,gasboiler,2050,0.38870000000
+3,heat,2055,5,R1,all-year,all-week,early-peak,heatpump,2050,4.11130000000
+3,CO2f,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,14.63850000000
+3,CO2f,2055,2,R1,all-year,all-week,early-peak,gasboiler,2050,25.15060000000
+4,heat,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,0.45240000000
+4,heat,2050,4,R1,all-year,all-week,late-peak,heatpump,2040,8.54760000000
+4,heat,2055,2,R1,all-year,all-week,late-peak,gasboiler,2050,0.77730000000
+4,heat,2055,5,R1,all-year,all-week,late-peak,heatpump,2050,8.22270000000
+4,CO2f,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,29.27690000000
+4,CO2f,2055,2,R1,all-year,all-week,late-peak,gasboiler,2050,50.30120000000
+5,heat,2050,1,R1,all-year,all-week,evening,gasboiler,2040,0.30160000000
+5,heat,2050,4,R1,all-year,all-week,evening,heatpump,2040,5.69840000000
+5,heat,2055,2,R1,all-year,all-week,evening,gasboiler,2050,0.51820000000
+5,heat,2055,5,R1,all-year,all-week,evening,heatpump,2050,5.48180000000
+5,CO2f,2050,1,R1,all-year,all-week,evening,gasboiler,2040,19.51790000000
+5,CO2f,2055,2,R1,all-year,all-week,evening,gasboiler,2050,33.53420000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2020.csv
index fdbb2d279..d1ee882b2 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2020.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2020.csv
@@ -1,4 +1,4 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gassupply1,15.00000000000
-0,2025,R1,2020,gassupply1,15.00000000000
-0,2030,R1,2020,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2025.csv
index f2ad7b025..d42ba410b 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2025.csv
@@ -1,3 +1,3 @@
-asset,year,region,installed,technology,capacity
-0,2025,R1,2020,gassupply1,15.00000000000
-0,2030,R1,2020,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2035.csv
index d5dee8bbb..7634e12ce 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2035.csv
@@ -1,6 +1,6 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2030,gassupply1,27.93530000000
-1,2040,R1,2030,gassupply1,27.93530000000
-1,2045,R1,2030,gassupply1,27.93530000000
-1,2050,R1,2030,gassupply1,27.93530000000
-1,2069,R1,2030,gassupply1,27.93530000000
+asset,year,region,technology,installed,capacity
+1,2035,R1,gassupply1,2030,27.93530000000
+1,2040,R1,gassupply1,2030,27.93530000000
+1,2045,R1,gassupply1,2030,27.93530000000
+1,2050,R1,gassupply1,2030,27.93530000000
+1,2069,R1,gassupply1,2030,27.93530000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2040.csv
index 08966a427..8bcd1d830 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2040.csv
@@ -1,5 +1,5 @@
-asset,year,region,installed,technology,capacity
-1,2040,R1,2030,gassupply1,27.93530000000
-1,2045,R1,2030,gassupply1,27.93530000000
-1,2050,R1,2030,gassupply1,27.93530000000
-1,2069,R1,2030,gassupply1,27.93530000000
+asset,year,region,technology,installed,capacity
+1,2040,R1,gassupply1,2030,27.93530000000
+1,2045,R1,gassupply1,2030,27.93530000000
+1,2050,R1,gassupply1,2030,27.93530000000
+1,2069,R1,gassupply1,2030,27.93530000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2045.csv
index fe3133ab3..74ed4ef70 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2045.csv
@@ -1,4 +1,4 @@
-asset,year,region,installed,technology,capacity
-1,2045,R1,2030,gassupply1,27.93530000000
-1,2050,R1,2030,gassupply1,27.93530000000
-1,2069,R1,2030,gassupply1,27.93530000000
+asset,year,region,technology,installed,capacity
+1,2045,R1,gassupply1,2030,27.93530000000
+1,2050,R1,gassupply1,2030,27.93530000000
+1,2069,R1,gassupply1,2030,27.93530000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2050.csv
index f3a800ddc..e69b5daae 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Gas/Capacity/2050.csv
@@ -1,4 +1,4 @@
-asset,year,region,installed,technology,capacity
-1,2050,R1,2030,gassupply1,27.93530000000
-1,2055,R1,2030,gassupply1,27.93530000000
-1,2069,R1,2030,gassupply1,27.93530000000
+asset,year,region,technology,installed,capacity
+1,2050,R1,gassupply1,2030,27.93530000000
+1,2055,R1,gassupply1,2030,27.93530000000
+1,2069,R1,gassupply1,2030,27.93530000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2020.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2020.csv
index e51bf8d5f..cef51025a 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2020.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2020.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gasCCGT,1.00000000000
-0,2025,R1,2020,gasCCGT,1.00000000000
-1,2025,R1,2020,windturbine,18.95930000000
-1,2030,R1,2020,windturbine,18.95930000000
-1,2035,R1,2020,windturbine,18.95930000000
-1,2040,R1,2020,windturbine,18.95930000000
-1,2045,R1,2020,windturbine,18.95930000000
-1,2049,R1,2020,windturbine,18.95930000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2025,R1,windturbine,2020,18.95930000000
+1,2030,R1,windturbine,2020,18.95930000000
+1,2035,R1,windturbine,2020,18.95930000000
+1,2040,R1,windturbine,2020,18.95930000000
+1,2045,R1,windturbine,2020,18.95930000000
+1,2049,R1,windturbine,2020,18.95930000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2030.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2030.csv
index a3e0e3c70..95ca8db93 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2030.csv
@@ -1,22 +1,22 @@
-asset,year,region,installed,technology,capacity
-1,2030,R1,2020,windturbine,18.95930000000
-1,2035,R1,2020,windturbine,18.95930000000
-1,2040,R1,2020,windturbine,18.95930000000
-1,2045,R1,2020,windturbine,18.95930000000
-1,2049,R1,2020,windturbine,18.95930000000
-2,2030,R1,2025,gasCCGT,4.00000000000
-2,2035,R1,2025,gasCCGT,4.00000000000
-2,2040,R1,2025,gasCCGT,4.00000000000
-2,2045,R1,2025,gasCCGT,4.00000000000
-2,2049,R1,2025,gasCCGT,4.00000000000
-2,2050,R1,2025,gasCCGT,4.00000000000
-2,2054,R1,2025,gasCCGT,4.00000000000
-2,2055,R1,2025,gasCCGT,4.00000000000
-2,2064,R1,2025,gasCCGT,4.00000000000
-3,2030,R1,2025,solarPV,13.08140000000
-3,2035,R1,2025,solarPV,13.08140000000
-3,2040,R1,2025,solarPV,13.08140000000
-3,2045,R1,2025,solarPV,13.08140000000
-3,2049,R1,2025,solarPV,13.08140000000
-3,2050,R1,2025,solarPV,13.08140000000
-3,2054,R1,2025,solarPV,13.08140000000
+asset,year,region,technology,installed,capacity
+1,2030,R1,gasCCGT,2025,4.00000000000
+1,2035,R1,gasCCGT,2025,4.00000000000
+1,2040,R1,gasCCGT,2025,4.00000000000
+1,2045,R1,gasCCGT,2025,4.00000000000
+1,2049,R1,gasCCGT,2025,4.00000000000
+1,2050,R1,gasCCGT,2025,4.00000000000
+1,2054,R1,gasCCGT,2025,4.00000000000
+1,2055,R1,gasCCGT,2025,4.00000000000
+1,2064,R1,gasCCGT,2025,4.00000000000
+2,2030,R1,solarPV,2025,13.08140000000
+2,2035,R1,solarPV,2025,13.08140000000
+2,2040,R1,solarPV,2025,13.08140000000
+2,2045,R1,solarPV,2025,13.08140000000
+2,2049,R1,solarPV,2025,13.08140000000
+2,2050,R1,solarPV,2025,13.08140000000
+2,2054,R1,solarPV,2025,13.08140000000
+3,2030,R1,windturbine,2020,18.95930000000
+3,2035,R1,windturbine,2020,18.95930000000
+3,2040,R1,windturbine,2020,18.95930000000
+3,2045,R1,windturbine,2020,18.95930000000
+3,2049,R1,windturbine,2020,18.95930000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2035.csv
index e66e2fa3b..9658f690c 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2035.csv
@@ -1,19 +1,19 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2020,windturbine,18.95930000000
-1,2040,R1,2020,windturbine,18.95930000000
-1,2045,R1,2020,windturbine,18.95930000000
-1,2049,R1,2020,windturbine,18.95930000000
-2,2035,R1,2025,gasCCGT,4.00000000000
-2,2040,R1,2025,gasCCGT,4.00000000000
-2,2045,R1,2025,gasCCGT,4.00000000000
-2,2049,R1,2025,gasCCGT,4.00000000000
-2,2050,R1,2025,gasCCGT,4.00000000000
-2,2054,R1,2025,gasCCGT,4.00000000000
-2,2055,R1,2025,gasCCGT,4.00000000000
-2,2064,R1,2025,gasCCGT,4.00000000000
-3,2035,R1,2025,solarPV,13.08140000000
-3,2040,R1,2025,solarPV,13.08140000000
-3,2045,R1,2025,solarPV,13.08140000000
-3,2049,R1,2025,solarPV,13.08140000000
-3,2050,R1,2025,solarPV,13.08140000000
-3,2054,R1,2025,solarPV,13.08140000000
+asset,year,region,technology,installed,capacity
+1,2035,R1,gasCCGT,2025,4.00000000000
+1,2040,R1,gasCCGT,2025,4.00000000000
+1,2045,R1,gasCCGT,2025,4.00000000000
+1,2049,R1,gasCCGT,2025,4.00000000000
+1,2050,R1,gasCCGT,2025,4.00000000000
+1,2054,R1,gasCCGT,2025,4.00000000000
+1,2055,R1,gasCCGT,2025,4.00000000000
+1,2064,R1,gasCCGT,2025,4.00000000000
+2,2035,R1,solarPV,2025,13.08140000000
+2,2040,R1,solarPV,2025,13.08140000000
+2,2045,R1,solarPV,2025,13.08140000000
+2,2049,R1,solarPV,2025,13.08140000000
+2,2050,R1,solarPV,2025,13.08140000000
+2,2054,R1,solarPV,2025,13.08140000000
+3,2035,R1,windturbine,2020,18.95930000000
+3,2040,R1,windturbine,2020,18.95930000000
+3,2045,R1,windturbine,2020,18.95930000000
+3,2049,R1,windturbine,2020,18.95930000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2040.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2040.csv
index c47110098..b38ab8086 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2040.csv
@@ -1,16 +1,16 @@
-asset,year,region,installed,technology,capacity
-1,2040,R1,2020,windturbine,18.95930000000
-1,2045,R1,2020,windturbine,18.95930000000
-1,2049,R1,2020,windturbine,18.95930000000
-2,2040,R1,2025,gasCCGT,4.00000000000
-2,2045,R1,2025,gasCCGT,4.00000000000
-2,2049,R1,2025,gasCCGT,4.00000000000
-2,2050,R1,2025,gasCCGT,4.00000000000
-2,2054,R1,2025,gasCCGT,4.00000000000
-2,2055,R1,2025,gasCCGT,4.00000000000
-2,2064,R1,2025,gasCCGT,4.00000000000
-3,2040,R1,2025,solarPV,13.08140000000
-3,2045,R1,2025,solarPV,13.08140000000
-3,2049,R1,2025,solarPV,13.08140000000
-3,2050,R1,2025,solarPV,13.08140000000
-3,2054,R1,2025,solarPV,13.08140000000
+asset,year,region,technology,installed,capacity
+1,2040,R1,gasCCGT,2025,4.00000000000
+1,2045,R1,gasCCGT,2025,4.00000000000
+1,2049,R1,gasCCGT,2025,4.00000000000
+1,2050,R1,gasCCGT,2025,4.00000000000
+1,2054,R1,gasCCGT,2025,4.00000000000
+1,2055,R1,gasCCGT,2025,4.00000000000
+1,2064,R1,gasCCGT,2025,4.00000000000
+2,2040,R1,solarPV,2025,13.08140000000
+2,2045,R1,solarPV,2025,13.08140000000
+2,2049,R1,solarPV,2025,13.08140000000
+2,2050,R1,solarPV,2025,13.08140000000
+2,2054,R1,solarPV,2025,13.08140000000
+3,2040,R1,windturbine,2020,18.95930000000
+3,2045,R1,windturbine,2020,18.95930000000
+3,2049,R1,windturbine,2020,18.95930000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2050.csv
index e44406029..f22e262f2 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Power/Capacity/2050.csv
@@ -1,27 +1,27 @@
-asset,year,region,installed,technology,capacity
-1,2050,R1,2025,gasCCGT,4.00000000000
-1,2054,R1,2025,gasCCGT,4.00000000000
-1,2055,R1,2025,gasCCGT,4.00000000000
-1,2064,R1,2025,gasCCGT,4.00000000000
-2,2050,R1,2025,solarPV,13.08140000000
-2,2054,R1,2025,solarPV,13.08140000000
-3,2050,R1,2045,gasCCGT,1.72260000000
-3,2054,R1,2045,gasCCGT,1.72260000000
-3,2055,R1,2045,gasCCGT,1.72260000000
-3,2064,R1,2045,gasCCGT,1.72260000000
-3,2065,R1,2045,gasCCGT,1.72260000000
-3,2074,R1,2045,gasCCGT,1.72260000000
-3,2075,R1,2045,gasCCGT,1.72260000000
-3,2084,R1,2045,gasCCGT,1.72260000000
-4,2050,R1,2045,solarPV,23.22140000000
-4,2054,R1,2045,solarPV,23.22140000000
-4,2055,R1,2045,solarPV,23.22140000000
-4,2064,R1,2045,solarPV,23.22140000000
-4,2065,R1,2045,solarPV,23.22140000000
-4,2074,R1,2045,solarPV,23.22140000000
-5,2050,R1,2045,windturbine,20.00000000000
-5,2054,R1,2045,windturbine,20.00000000000
-5,2055,R1,2045,windturbine,20.00000000000
-5,2064,R1,2045,windturbine,20.00000000000
-5,2065,R1,2045,windturbine,20.00000000000
-5,2074,R1,2045,windturbine,20.00000000000
+asset,year,region,technology,installed,capacity
+0,2050,R1,gasCCGT,2025,4.00000000000
+0,2054,R1,gasCCGT,2025,4.00000000000
+0,2055,R1,gasCCGT,2025,4.00000000000
+0,2064,R1,gasCCGT,2025,4.00000000000
+1,2050,R1,gasCCGT,2045,1.72260000000
+1,2054,R1,gasCCGT,2045,1.72260000000
+1,2055,R1,gasCCGT,2045,1.72260000000
+1,2064,R1,gasCCGT,2045,1.72260000000
+1,2065,R1,gasCCGT,2045,1.72260000000
+1,2074,R1,gasCCGT,2045,1.72260000000
+1,2075,R1,gasCCGT,2045,1.72260000000
+1,2084,R1,gasCCGT,2045,1.72260000000
+2,2050,R1,solarPV,2025,13.08140000000
+2,2054,R1,solarPV,2025,13.08140000000
+3,2050,R1,solarPV,2045,23.22140000000
+3,2054,R1,solarPV,2045,23.22140000000
+3,2055,R1,solarPV,2045,23.22140000000
+3,2064,R1,solarPV,2045,23.22140000000
+3,2065,R1,solarPV,2045,23.22140000000
+3,2074,R1,solarPV,2045,23.22140000000
+5,2050,R1,windturbine,2045,20.00000000000
+5,2054,R1,windturbine,2045,20.00000000000
+5,2055,R1,windturbine,2045,20.00000000000
+5,2064,R1,windturbine,2045,20.00000000000
+5,2065,R1,windturbine,2045,20.00000000000
+5,2074,R1,windturbine,2045,20.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2025.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2025.csv
index 08d92bf42..6e14af344 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2025.csv
@@ -1,5 +1,5 @@
-asset,year,region,installed,technology,capacity
-0,2025,R1,2020,gasboiler,5.00000000000
-1,2025,R1,2020,heatpump,38.00000000000
-1,2030,R1,2020,heatpump,38.00000000000
-1,2034,R1,2020,heatpump,38.00000000000
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2025,R1,heatpump,2020,38.00000000000
+1,2030,R1,heatpump,2020,38.00000000000
+1,2034,R1,heatpump,2020,38.00000000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2035.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2035.csv
index 2363ffb8c..97713bf39 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2035.csv
@@ -1,7 +1,7 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2030,gasboiler,14.40000000000
-1,2040,R1,2030,gasboiler,14.40000000000
-1,2044,R1,2030,gasboiler,14.40000000000
-2,2035,R1,2030,heatpump,57.60000000000
-2,2040,R1,2030,heatpump,57.60000000000
-2,2044,R1,2030,heatpump,57.60000000000
+asset,year,region,technology,installed,capacity
+0,2035,R1,gasboiler,2030,14.40000000000
+0,2040,R1,gasboiler,2030,14.40000000000
+0,2044,R1,gasboiler,2030,14.40000000000
+2,2035,R1,heatpump,2030,57.60000000000
+2,2040,R1,heatpump,2030,57.60000000000
+2,2044,R1,heatpump,2030,57.60000000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2045.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2045.csv
index 939e3e569..3cf573476 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2045.csv
@@ -1,7 +1,7 @@
-asset,year,region,installed,technology,capacity
-2,2045,R1,2040,gasboiler,14.88000000000
-2,2050,R1,2040,gasboiler,14.88000000000
-2,2054,R1,2040,gasboiler,14.88000000000
-3,2045,R1,2040,heatpump,81.12000000000
-3,2050,R1,2040,heatpump,81.12000000000
-3,2054,R1,2040,heatpump,81.12000000000
+asset,year,region,technology,installed,capacity
+1,2045,R1,gasboiler,2040,14.88000000000
+1,2050,R1,gasboiler,2040,14.88000000000
+1,2054,R1,gasboiler,2040,14.88000000000
+3,2045,R1,heatpump,2040,81.12000000000
+3,2050,R1,heatpump,2040,81.12000000000
+3,2054,R1,heatpump,2040,81.12000000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2050.csv
index 6aff13251..dfe77dba5 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Capacity/2050.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-2,2050,R1,2040,gasboiler,14.88000000000
-2,2054,R1,2040,gasboiler,14.88000000000
-3,2050,R1,2040,heatpump,81.12000000000
-3,2054,R1,2040,heatpump,81.12000000000
-4,2055,R1,2050,gasboiler,10.65600000000
-4,2064,R1,2050,gasboiler,10.65600000000
-5,2055,R1,2050,heatpump,97.34400000000
-5,2064,R1,2050,heatpump,97.34400000000
+asset,year,region,technology,installed,capacity
+1,2050,R1,gasboiler,2040,14.88000000000
+1,2054,R1,gasboiler,2040,14.88000000000
+2,2055,R1,gasboiler,2050,10.65600000000
+2,2064,R1,gasboiler,2050,10.65600000000
+4,2050,R1,heatpump,2040,81.12000000000
+4,2054,R1,heatpump,2040,81.12000000000
+5,2055,R1,heatpump,2050,97.34400000000
+5,2064,R1,heatpump,2050,97.34400000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2020.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2020.csv
index 62937431b..4606e6a01 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2020.csv
@@ -1,31 +1,31 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2020,0,R1,gasboiler,2020,all-year,all-week,night,1.00000000000
-0,heat,2025,0,R1,gasboiler,2020,all-year,all-week,night,0.15500000000
-0,heat,2025,1,R1,heatpump,2020,all-year,all-week,night,1.17830000000
-0,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,night,64.71000000000
-0,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,night,10.03260000000
-1,heat,2020,0,R1,gasboiler,2020,all-year,all-week,morning,1.50000000000
-1,heat,2025,0,R1,gasboiler,2020,all-year,all-week,morning,0.23260000000
-1,heat,2025,1,R1,heatpump,2020,all-year,all-week,morning,1.76740000000
-1,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,morning,97.06500000000
-1,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,morning,15.04880000000
-2,heat,2020,0,R1,gasboiler,2020,all-year,all-week,afternoon,1.00000000000
-2,heat,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.15500000000
-2,heat,2025,1,R1,heatpump,2020,all-year,all-week,afternoon,1.17830000000
-2,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,afternoon,64.71000000000
-2,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,10.03260000000
-3,heat,2020,0,R1,gasboiler,2020,all-year,all-week,early-peak,1.50000000000
-3,heat,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.23260000000
-3,heat,2025,1,R1,heatpump,2020,all-year,all-week,early-peak,1.76740000000
-3,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,early-peak,97.06500000000
-3,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,15.04880000000
-4,heat,2020,0,R1,gasboiler,2020,all-year,all-week,late-peak,3.00000000000
-4,heat,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,0.46510000000
-4,heat,2025,1,R1,heatpump,2020,all-year,all-week,late-peak,3.53490000000
-4,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,late-peak,194.13000000000
-4,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,30.09770000000
-5,heat,2020,0,R1,gasboiler,2020,all-year,all-week,evening,2.00000000000
-5,heat,2025,0,R1,gasboiler,2020,all-year,all-week,evening,0.31010000000
-5,heat,2025,1,R1,heatpump,2020,all-year,all-week,evening,2.35660000000
-5,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,evening,129.42000000000
-5,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,evening,20.06510000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,1.00000000000
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.15500000000
+0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.17830000000
+0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,64.71000000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,10.03260000000
+1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.23260000000
+1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.76740000000
+1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,15.04880000000
+2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.15500000000
+2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.17830000000
+2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,10.03260000000
+3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.23260000000
+3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.76740000000
+3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,15.04880000000
+4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.46510000000
+4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.53490000000
+4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,30.09770000000
+5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.31010000000
+5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.35660000000
+5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,20.06510000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2025.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2025.csv
index f9894bba6..7f9bcda14 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2025.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,heat,2025,0,R1,2020,gasboiler,all-year,all-week,night,0.15500000000
-0,heat,2025,1,R1,2020,heatpump,all-year,all-week,night,1.17830000000
-0,heat,2030,1,R1,2020,heatpump,all-year,all-week,night,1.66670000000
-0,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,night,10.03260000000
-1,heat,2025,0,R1,2020,gasboiler,all-year,all-week,morning,0.23260000000
-1,heat,2025,1,R1,2020,heatpump,all-year,all-week,morning,1.76740000000
-1,heat,2030,1,R1,2020,heatpump,all-year,all-week,morning,2.50000000000
-1,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,morning,15.04880000000
-2,heat,2025,0,R1,2020,gasboiler,all-year,all-week,afternoon,0.15500000000
-2,heat,2025,1,R1,2020,heatpump,all-year,all-week,afternoon,1.17830000000
-2,heat,2030,1,R1,2020,heatpump,all-year,all-week,afternoon,1.66670000000
-2,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,afternoon,10.03260000000
-3,heat,2025,0,R1,2020,gasboiler,all-year,all-week,early-peak,0.23260000000
-3,heat,2025,1,R1,2020,heatpump,all-year,all-week,early-peak,1.76740000000
-3,heat,2030,1,R1,2020,heatpump,all-year,all-week,early-peak,2.50000000000
-3,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,early-peak,15.04880000000
-4,heat,2025,0,R1,2020,gasboiler,all-year,all-week,late-peak,0.46510000000
-4,heat,2025,1,R1,2020,heatpump,all-year,all-week,late-peak,3.53490000000
-4,heat,2030,1,R1,2020,heatpump,all-year,all-week,late-peak,5.00000000000
-4,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,late-peak,30.09770000000
-5,heat,2025,0,R1,2020,gasboiler,all-year,all-week,evening,0.31010000000
-5,heat,2025,1,R1,2020,heatpump,all-year,all-week,evening,2.35660000000
-5,heat,2030,1,R1,2020,heatpump,all-year,all-week,evening,3.33330000000
-5,CO2f,2025,0,R1,2020,gasboiler,all-year,all-week,evening,20.06510000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.15500000000
+0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.17830000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.66670000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,10.03260000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.23260000000
+1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.76740000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,2.50000000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,15.04880000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.15500000000
+2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.17830000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.66670000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,10.03260000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.23260000000
+3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.76740000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,2.50000000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,15.04880000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.46510000000
+4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.53490000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,5.00000000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,30.09770000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.31010000000
+5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.35660000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,3.33330000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,20.06510000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2030.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2030.csv
index 514bc0ffa..c8a7993ef 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2030.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2030,1,R1,heatpump,2020,all-year,all-week,night,1.66670000000
-0,heat,2035,0,R1,gasboiler,2030,all-year,all-week,night,0.40000000000
-0,heat,2035,2,R1,heatpump,2030,all-year,all-week,night,1.60000000000
-0,CO2f,2035,0,R1,gasboiler,2030,all-year,all-week,night,25.88400000000
-1,heat,2030,1,R1,heatpump,2020,all-year,all-week,morning,2.50000000000
-1,heat,2035,0,R1,gasboiler,2030,all-year,all-week,morning,0.60000000000
-1,heat,2035,2,R1,heatpump,2030,all-year,all-week,morning,2.40000000000
-1,CO2f,2035,0,R1,gasboiler,2030,all-year,all-week,morning,38.82600000000
-2,heat,2030,1,R1,heatpump,2020,all-year,all-week,afternoon,1.66670000000
-2,heat,2035,0,R1,gasboiler,2030,all-year,all-week,afternoon,0.40000000000
-2,heat,2035,2,R1,heatpump,2030,all-year,all-week,afternoon,1.60000000000
-2,CO2f,2035,0,R1,gasboiler,2030,all-year,all-week,afternoon,25.88400000000
-3,heat,2030,1,R1,heatpump,2020,all-year,all-week,early-peak,2.50000000000
-3,heat,2035,0,R1,gasboiler,2030,all-year,all-week,early-peak,0.60000000000
-3,heat,2035,2,R1,heatpump,2030,all-year,all-week,early-peak,2.40000000000
-3,CO2f,2035,0,R1,gasboiler,2030,all-year,all-week,early-peak,38.82600000000
-4,heat,2030,1,R1,heatpump,2020,all-year,all-week,late-peak,5.00000000000
-4,heat,2035,0,R1,gasboiler,2030,all-year,all-week,late-peak,1.20000000000
-4,heat,2035,2,R1,heatpump,2030,all-year,all-week,late-peak,4.80000000000
-4,CO2f,2035,0,R1,gasboiler,2030,all-year,all-week,late-peak,77.65200000000
-5,heat,2030,1,R1,heatpump,2020,all-year,all-week,evening,3.33330000000
-5,heat,2035,0,R1,gasboiler,2030,all-year,all-week,evening,0.80000000000
-5,heat,2035,2,R1,heatpump,2030,all-year,all-week,evening,3.20000000000
-5,CO2f,2035,0,R1,gasboiler,2030,all-year,all-week,evening,51.76800000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.66670000000
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2030,0.40000000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2030,1.60000000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2030,25.88400000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,2.50000000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2030,0.60000000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2030,2.40000000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2030,38.82600000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.66670000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2030,0.40000000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2030,1.60000000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2030,25.88400000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,2.50000000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2030,0.60000000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2030,2.40000000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2030,38.82600000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,5.00000000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2030,1.20000000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2030,4.80000000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2030,77.65200000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,3.33330000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2030,0.80000000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2030,3.20000000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2030,51.76800000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2035.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2035.csv
index 80e723277..405c4defa 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2035.csv
@@ -1,37 +1,37 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,heat,2035,1,R1,2030,gasboiler,all-year,all-week,night,0.40000000000
-0,heat,2035,2,R1,2030,heatpump,all-year,all-week,night,1.60000000000
-0,heat,2040,1,R1,2030,gasboiler,all-year,all-week,night,0.46670000000
-0,heat,2040,2,R1,2030,heatpump,all-year,all-week,night,1.86670000000
-0,CO2f,2035,1,R1,2030,gasboiler,all-year,all-week,night,25.88400000000
-0,CO2f,2040,1,R1,2030,gasboiler,all-year,all-week,night,30.19800000000
-1,heat,2035,1,R1,2030,gasboiler,all-year,all-week,morning,0.60000000000
-1,heat,2035,2,R1,2030,heatpump,all-year,all-week,morning,2.40000000000
-1,heat,2040,1,R1,2030,gasboiler,all-year,all-week,morning,0.70000000000
-1,heat,2040,2,R1,2030,heatpump,all-year,all-week,morning,2.80000000000
-1,CO2f,2035,1,R1,2030,gasboiler,all-year,all-week,morning,38.82600000000
-1,CO2f,2040,1,R1,2030,gasboiler,all-year,all-week,morning,45.29700000000
-2,heat,2035,1,R1,2030,gasboiler,all-year,all-week,afternoon,0.40000000000
-2,heat,2035,2,R1,2030,heatpump,all-year,all-week,afternoon,1.60000000000
-2,heat,2040,1,R1,2030,gasboiler,all-year,all-week,afternoon,0.46670000000
-2,heat,2040,2,R1,2030,heatpump,all-year,all-week,afternoon,1.86670000000
-2,CO2f,2035,1,R1,2030,gasboiler,all-year,all-week,afternoon,25.88400000000
-2,CO2f,2040,1,R1,2030,gasboiler,all-year,all-week,afternoon,30.19800000000
-3,heat,2035,1,R1,2030,gasboiler,all-year,all-week,early-peak,0.60000000000
-3,heat,2035,2,R1,2030,heatpump,all-year,all-week,early-peak,2.40000000000
-3,heat,2040,1,R1,2030,gasboiler,all-year,all-week,early-peak,0.70000000000
-3,heat,2040,2,R1,2030,heatpump,all-year,all-week,early-peak,2.80000000000
-3,CO2f,2035,1,R1,2030,gasboiler,all-year,all-week,early-peak,38.82600000000
-3,CO2f,2040,1,R1,2030,gasboiler,all-year,all-week,early-peak,45.29700000000
-4,heat,2035,1,R1,2030,gasboiler,all-year,all-week,late-peak,1.20000000000
-4,heat,2035,2,R1,2030,heatpump,all-year,all-week,late-peak,4.80000000000
-4,heat,2040,1,R1,2030,gasboiler,all-year,all-week,late-peak,1.40000000000
-4,heat,2040,2,R1,2030,heatpump,all-year,all-week,late-peak,5.60000000000
-4,CO2f,2035,1,R1,2030,gasboiler,all-year,all-week,late-peak,77.65200000000
-4,CO2f,2040,1,R1,2030,gasboiler,all-year,all-week,late-peak,90.59400000000
-5,heat,2035,1,R1,2030,gasboiler,all-year,all-week,evening,0.80000000000
-5,heat,2035,2,R1,2030,heatpump,all-year,all-week,evening,3.20000000000
-5,heat,2040,1,R1,2030,gasboiler,all-year,all-week,evening,0.93330000000
-5,heat,2040,2,R1,2030,heatpump,all-year,all-week,evening,3.73330000000
-5,CO2f,2035,1,R1,2030,gasboiler,all-year,all-week,evening,51.76800000000
-5,CO2f,2040,1,R1,2030,gasboiler,all-year,all-week,evening,60.39600000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2030,0.40000000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2030,1.60000000000
+0,heat,2040,0,R1,all-year,all-week,night,gasboiler,2030,0.46670000000
+0,heat,2040,2,R1,all-year,all-week,night,heatpump,2030,1.86670000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2030,25.88400000000
+0,CO2f,2040,0,R1,all-year,all-week,night,gasboiler,2030,30.19800000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2030,0.60000000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2030,2.40000000000
+1,heat,2040,0,R1,all-year,all-week,morning,gasboiler,2030,0.70000000000
+1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2030,2.80000000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2030,38.82600000000
+1,CO2f,2040,0,R1,all-year,all-week,morning,gasboiler,2030,45.29700000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2030,0.40000000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2030,1.60000000000
+2,heat,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,0.46670000000
+2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2030,1.86670000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2030,25.88400000000
+2,CO2f,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,30.19800000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2030,0.60000000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2030,2.40000000000
+3,heat,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,0.70000000000
+3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2030,2.80000000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2030,38.82600000000
+3,CO2f,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,45.29700000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2030,1.20000000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2030,4.80000000000
+4,heat,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,1.40000000000
+4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2030,5.60000000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2030,77.65200000000
+4,CO2f,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,90.59400000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2030,0.80000000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2030,3.20000000000
+5,heat,2040,0,R1,all-year,all-week,evening,gasboiler,2030,0.93330000000
+5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2030,3.73330000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2030,51.76800000000
+5,CO2f,2040,0,R1,all-year,all-week,evening,gasboiler,2030,60.39600000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2040.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2040.csv
index 2c074d4db..9e06cf103 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2040.csv
@@ -1,37 +1,37 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2040,0,R1,gasboiler,2030,all-year,all-week,night,0.46670000000
-0,heat,2040,2,R1,heatpump,2030,all-year,all-week,night,1.86670000000
-0,heat,2045,1,R1,gasboiler,2040,all-year,all-week,night,0.41330000000
-0,heat,2045,3,R1,heatpump,2040,all-year,all-week,night,2.25330000000
-0,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,night,30.19800000000
-0,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,night,26.74680000000
-1,heat,2040,0,R1,gasboiler,2030,all-year,all-week,morning,0.70000000000
-1,heat,2040,2,R1,heatpump,2030,all-year,all-week,morning,2.80000000000
-1,heat,2045,1,R1,gasboiler,2040,all-year,all-week,morning,0.62000000000
-1,heat,2045,3,R1,heatpump,2040,all-year,all-week,morning,3.38000000000
-1,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,morning,45.29700000000
-1,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,morning,40.12020000000
-2,heat,2040,0,R1,gasboiler,2030,all-year,all-week,afternoon,0.46670000000
-2,heat,2040,2,R1,heatpump,2030,all-year,all-week,afternoon,1.86670000000
-2,heat,2045,1,R1,gasboiler,2040,all-year,all-week,afternoon,0.41330000000
-2,heat,2045,3,R1,heatpump,2040,all-year,all-week,afternoon,2.25330000000
-2,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,afternoon,30.19800000000
-2,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,afternoon,26.74680000000
-3,heat,2040,0,R1,gasboiler,2030,all-year,all-week,early-peak,0.70000000000
-3,heat,2040,2,R1,heatpump,2030,all-year,all-week,early-peak,2.80000000000
-3,heat,2045,1,R1,gasboiler,2040,all-year,all-week,early-peak,0.62000000000
-3,heat,2045,3,R1,heatpump,2040,all-year,all-week,early-peak,3.38000000000
-3,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,early-peak,45.29700000000
-3,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,early-peak,40.12020000000
-4,heat,2040,0,R1,gasboiler,2030,all-year,all-week,late-peak,1.40000000000
-4,heat,2040,2,R1,heatpump,2030,all-year,all-week,late-peak,5.60000000000
-4,heat,2045,1,R1,gasboiler,2040,all-year,all-week,late-peak,1.24000000000
-4,heat,2045,3,R1,heatpump,2040,all-year,all-week,late-peak,6.76000000000
-4,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,late-peak,90.59400000000
-4,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,late-peak,80.24040000000
-5,heat,2040,0,R1,gasboiler,2030,all-year,all-week,evening,0.93330000000
-5,heat,2040,2,R1,heatpump,2030,all-year,all-week,evening,3.73330000000
-5,heat,2045,1,R1,gasboiler,2040,all-year,all-week,evening,0.82670000000
-5,heat,2045,3,R1,heatpump,2040,all-year,all-week,evening,4.50670000000
-5,CO2f,2040,0,R1,gasboiler,2030,all-year,all-week,evening,60.39600000000
-5,CO2f,2045,1,R1,gasboiler,2040,all-year,all-week,evening,53.49360000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2040,0,R1,all-year,all-week,night,gasboiler,2030,0.46670000000
+0,heat,2040,2,R1,all-year,all-week,night,heatpump,2030,1.86670000000
+0,heat,2045,1,R1,all-year,all-week,night,gasboiler,2040,0.41330000000
+0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,2.25330000000
+0,CO2f,2040,0,R1,all-year,all-week,night,gasboiler,2030,30.19800000000
+0,CO2f,2045,1,R1,all-year,all-week,night,gasboiler,2040,26.74680000000
+1,heat,2040,0,R1,all-year,all-week,morning,gasboiler,2030,0.70000000000
+1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2030,2.80000000000
+1,heat,2045,1,R1,all-year,all-week,morning,gasboiler,2040,0.62000000000
+1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,3.38000000000
+1,CO2f,2040,0,R1,all-year,all-week,morning,gasboiler,2030,45.29700000000
+1,CO2f,2045,1,R1,all-year,all-week,morning,gasboiler,2040,40.12020000000
+2,heat,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,0.46670000000
+2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2030,1.86670000000
+2,heat,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.41330000000
+2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,2.25330000000
+2,CO2f,2040,0,R1,all-year,all-week,afternoon,gasboiler,2030,30.19800000000
+2,CO2f,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,26.74680000000
+3,heat,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,0.70000000000
+3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2030,2.80000000000
+3,heat,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.62000000000
+3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,3.38000000000
+3,CO2f,2040,0,R1,all-year,all-week,early-peak,gasboiler,2030,45.29700000000
+3,CO2f,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,40.12020000000
+4,heat,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,1.40000000000
+4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2030,5.60000000000
+4,heat,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,1.24000000000
+4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,6.76000000000
+4,CO2f,2040,0,R1,all-year,all-week,late-peak,gasboiler,2030,90.59400000000
+4,CO2f,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,80.24040000000
+5,heat,2040,0,R1,all-year,all-week,evening,gasboiler,2030,0.93330000000
+5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2030,3.73330000000
+5,heat,2045,1,R1,all-year,all-week,evening,gasboiler,2040,0.82670000000
+5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,4.50670000000
+5,CO2f,2040,0,R1,all-year,all-week,evening,gasboiler,2030,60.39600000000
+5,CO2f,2045,1,R1,all-year,all-week,evening,gasboiler,2040,53.49360000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2045.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2045.csv
index aa751b654..4e469dbfe 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2045.csv
@@ -1,37 +1,37 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,heat,2045,2,R1,2040,gasboiler,all-year,all-week,night,0.41330000000
-0,heat,2045,3,R1,2040,heatpump,all-year,all-week,night,2.25330000000
-0,heat,2050,2,R1,2040,gasboiler,all-year,all-week,night,0.46500000000
-0,heat,2050,3,R1,2040,heatpump,all-year,all-week,night,2.53500000000
-0,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,night,26.74680000000
-0,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,night,30.09010000000
-1,heat,2045,2,R1,2040,gasboiler,all-year,all-week,morning,0.62000000000
-1,heat,2045,3,R1,2040,heatpump,all-year,all-week,morning,3.38000000000
-1,heat,2050,2,R1,2040,gasboiler,all-year,all-week,morning,0.69750000000
-1,heat,2050,3,R1,2040,heatpump,all-year,all-week,morning,3.80250000000
-1,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,morning,40.12020000000
-1,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,morning,45.13520000000
-2,heat,2045,2,R1,2040,gasboiler,all-year,all-week,afternoon,0.41330000000
-2,heat,2045,3,R1,2040,heatpump,all-year,all-week,afternoon,2.25330000000
-2,heat,2050,2,R1,2040,gasboiler,all-year,all-week,afternoon,0.46500000000
-2,heat,2050,3,R1,2040,heatpump,all-year,all-week,afternoon,2.53500000000
-2,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,afternoon,26.74680000000
-2,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,afternoon,30.09010000000
-3,heat,2045,2,R1,2040,gasboiler,all-year,all-week,early-peak,0.62000000000
-3,heat,2045,3,R1,2040,heatpump,all-year,all-week,early-peak,3.38000000000
-3,heat,2050,2,R1,2040,gasboiler,all-year,all-week,early-peak,0.69750000000
-3,heat,2050,3,R1,2040,heatpump,all-year,all-week,early-peak,3.80250000000
-3,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,early-peak,40.12020000000
-3,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,early-peak,45.13520000000
-4,heat,2045,2,R1,2040,gasboiler,all-year,all-week,late-peak,1.24000000000
-4,heat,2045,3,R1,2040,heatpump,all-year,all-week,late-peak,6.76000000000
-4,heat,2050,2,R1,2040,gasboiler,all-year,all-week,late-peak,1.39500000000
-4,heat,2050,3,R1,2040,heatpump,all-year,all-week,late-peak,7.60500000000
-4,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,late-peak,80.24040000000
-4,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,late-peak,90.27040000000
-5,heat,2045,2,R1,2040,gasboiler,all-year,all-week,evening,0.82670000000
-5,heat,2045,3,R1,2040,heatpump,all-year,all-week,evening,4.50670000000
-5,heat,2050,2,R1,2040,gasboiler,all-year,all-week,evening,0.93000000000
-5,heat,2050,3,R1,2040,heatpump,all-year,all-week,evening,5.07000000000
-5,CO2f,2045,2,R1,2040,gasboiler,all-year,all-week,evening,53.49360000000
-5,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,evening,60.18030000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2045,1,R1,all-year,all-week,night,gasboiler,2040,0.41330000000
+0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,2.25330000000
+0,heat,2050,1,R1,all-year,all-week,night,gasboiler,2040,0.46500000000
+0,heat,2050,3,R1,all-year,all-week,night,heatpump,2040,2.53500000000
+0,CO2f,2045,1,R1,all-year,all-week,night,gasboiler,2040,26.74680000000
+0,CO2f,2050,1,R1,all-year,all-week,night,gasboiler,2040,30.09010000000
+1,heat,2045,1,R1,all-year,all-week,morning,gasboiler,2040,0.62000000000
+1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,3.38000000000
+1,heat,2050,1,R1,all-year,all-week,morning,gasboiler,2040,0.69750000000
+1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2040,3.80250000000
+1,CO2f,2045,1,R1,all-year,all-week,morning,gasboiler,2040,40.12020000000
+1,CO2f,2050,1,R1,all-year,all-week,morning,gasboiler,2040,45.13520000000
+2,heat,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.41330000000
+2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,2.25330000000
+2,heat,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.46500000000
+2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2040,2.53500000000
+2,CO2f,2045,1,R1,all-year,all-week,afternoon,gasboiler,2040,26.74680000000
+2,CO2f,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,30.09010000000
+3,heat,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.62000000000
+3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,3.38000000000
+3,heat,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.69750000000
+3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2040,3.80250000000
+3,CO2f,2045,1,R1,all-year,all-week,early-peak,gasboiler,2040,40.12020000000
+3,CO2f,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,45.13520000000
+4,heat,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,1.24000000000
+4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,6.76000000000
+4,heat,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,1.39500000000
+4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2040,7.60500000000
+4,CO2f,2045,1,R1,all-year,all-week,late-peak,gasboiler,2040,80.24040000000
+4,CO2f,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,90.27040000000
+5,heat,2045,1,R1,all-year,all-week,evening,gasboiler,2040,0.82670000000
+5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,4.50670000000
+5,heat,2050,1,R1,all-year,all-week,evening,gasboiler,2040,0.93000000000
+5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2040,5.07000000000
+5,CO2f,2045,1,R1,all-year,all-week,evening,gasboiler,2040,53.49360000000
+5,CO2f,2050,1,R1,all-year,all-week,evening,gasboiler,2040,60.18030000000
diff --git a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2050.csv b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2050.csv
index 79dedd794..d306c3364 100644
--- a/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/2-add-agent/2-single-objective/Results/Residential/Supply/2050.csv
@@ -1,37 +1,37 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,heat,2050,2,R1,2040,gasboiler,all-year,all-week,night,0.46500000000
-0,heat,2050,3,R1,2040,heatpump,all-year,all-week,night,2.53500000000
-0,heat,2055,4,R1,2050,gasboiler,all-year,all-week,night,0.29600000000
-0,heat,2055,5,R1,2050,heatpump,all-year,all-week,night,2.70400000000
-0,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,night,30.09010000000
-0,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,night,19.15420000000
-1,heat,2050,2,R1,2040,gasboiler,all-year,all-week,morning,0.69750000000
-1,heat,2050,3,R1,2040,heatpump,all-year,all-week,morning,3.80250000000
-1,heat,2055,4,R1,2050,gasboiler,all-year,all-week,morning,0.44400000000
-1,heat,2055,5,R1,2050,heatpump,all-year,all-week,morning,4.05600000000
-1,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,morning,45.13520000000
-1,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,morning,28.73120000000
-2,heat,2050,2,R1,2040,gasboiler,all-year,all-week,afternoon,0.46500000000
-2,heat,2050,3,R1,2040,heatpump,all-year,all-week,afternoon,2.53500000000
-2,heat,2055,4,R1,2050,gasboiler,all-year,all-week,afternoon,0.29600000000
-2,heat,2055,5,R1,2050,heatpump,all-year,all-week,afternoon,2.70400000000
-2,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,afternoon,30.09010000000
-2,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,afternoon,19.15420000000
-3,heat,2050,2,R1,2040,gasboiler,all-year,all-week,early-peak,0.69750000000
-3,heat,2050,3,R1,2040,heatpump,all-year,all-week,early-peak,3.80250000000
-3,heat,2055,4,R1,2050,gasboiler,all-year,all-week,early-peak,0.44400000000
-3,heat,2055,5,R1,2050,heatpump,all-year,all-week,early-peak,4.05600000000
-3,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,early-peak,45.13520000000
-3,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,early-peak,28.73120000000
-4,heat,2050,2,R1,2040,gasboiler,all-year,all-week,late-peak,1.39500000000
-4,heat,2050,3,R1,2040,heatpump,all-year,all-week,late-peak,7.60500000000
-4,heat,2055,4,R1,2050,gasboiler,all-year,all-week,late-peak,0.88800000000
-4,heat,2055,5,R1,2050,heatpump,all-year,all-week,late-peak,8.11200000000
-4,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,late-peak,90.27040000000
-4,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,late-peak,57.46250000000
-5,heat,2050,2,R1,2040,gasboiler,all-year,all-week,evening,0.93000000000
-5,heat,2050,3,R1,2040,heatpump,all-year,all-week,evening,5.07000000000
-5,heat,2055,4,R1,2050,gasboiler,all-year,all-week,evening,0.59200000000
-5,heat,2055,5,R1,2050,heatpump,all-year,all-week,evening,5.40800000000
-5,CO2f,2050,2,R1,2040,gasboiler,all-year,all-week,evening,60.18030000000
-5,CO2f,2055,4,R1,2050,gasboiler,all-year,all-week,evening,38.30830000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2050,1,R1,all-year,all-week,night,gasboiler,2040,0.46500000000
+0,heat,2050,4,R1,all-year,all-week,night,heatpump,2040,2.53500000000
+0,heat,2055,2,R1,all-year,all-week,night,gasboiler,2050,0.29600000000
+0,heat,2055,5,R1,all-year,all-week,night,heatpump,2050,2.70400000000
+0,CO2f,2050,1,R1,all-year,all-week,night,gasboiler,2040,30.09010000000
+0,CO2f,2055,2,R1,all-year,all-week,night,gasboiler,2050,19.15420000000
+1,heat,2050,1,R1,all-year,all-week,morning,gasboiler,2040,0.69750000000
+1,heat,2050,4,R1,all-year,all-week,morning,heatpump,2040,3.80250000000
+1,heat,2055,2,R1,all-year,all-week,morning,gasboiler,2050,0.44400000000
+1,heat,2055,5,R1,all-year,all-week,morning,heatpump,2050,4.05600000000
+1,CO2f,2050,1,R1,all-year,all-week,morning,gasboiler,2040,45.13520000000
+1,CO2f,2055,2,R1,all-year,all-week,morning,gasboiler,2050,28.73120000000
+2,heat,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,0.46500000000
+2,heat,2050,4,R1,all-year,all-week,afternoon,heatpump,2040,2.53500000000
+2,heat,2055,2,R1,all-year,all-week,afternoon,gasboiler,2050,0.29600000000
+2,heat,2055,5,R1,all-year,all-week,afternoon,heatpump,2050,2.70400000000
+2,CO2f,2050,1,R1,all-year,all-week,afternoon,gasboiler,2040,30.09010000000
+2,CO2f,2055,2,R1,all-year,all-week,afternoon,gasboiler,2050,19.15420000000
+3,heat,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,0.69750000000
+3,heat,2050,4,R1,all-year,all-week,early-peak,heatpump,2040,3.80250000000
+3,heat,2055,2,R1,all-year,all-week,early-peak,gasboiler,2050,0.44400000000
+3,heat,2055,5,R1,all-year,all-week,early-peak,heatpump,2050,4.05600000000
+3,CO2f,2050,1,R1,all-year,all-week,early-peak,gasboiler,2040,45.13520000000
+3,CO2f,2055,2,R1,all-year,all-week,early-peak,gasboiler,2050,28.73120000000
+4,heat,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,1.39500000000
+4,heat,2050,4,R1,all-year,all-week,late-peak,heatpump,2040,7.60500000000
+4,heat,2055,2,R1,all-year,all-week,late-peak,gasboiler,2050,0.88800000000
+4,heat,2055,5,R1,all-year,all-week,late-peak,heatpump,2050,8.11200000000
+4,CO2f,2050,1,R1,all-year,all-week,late-peak,gasboiler,2040,90.27040000000
+4,CO2f,2055,2,R1,all-year,all-week,late-peak,gasboiler,2050,57.46250000000
+5,heat,2050,1,R1,all-year,all-week,evening,gasboiler,2040,0.93000000000
+5,heat,2050,4,R1,all-year,all-week,evening,heatpump,2040,5.07000000000
+5,heat,2055,2,R1,all-year,all-week,evening,gasboiler,2050,0.59200000000
+5,heat,2055,5,R1,all-year,all-week,evening,heatpump,2050,5.40800000000
+5,CO2f,2050,1,R1,all-year,all-week,evening,gasboiler,2040,60.18030000000
+5,CO2f,2055,2,R1,all-year,all-week,evening,gasboiler,2050,38.30830000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2020.csv
index 192f9bf99..1d028468e 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2020.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2020.csv
@@ -1,7 +1,7 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gassupply1,15.00000000000
-0,2025,R1,2020,gassupply1,15.00000000000
-0,2030,R1,2020,gassupply1,7.50000000000
-1,2020,R2,2020,gassupply1,15.00000000000
-1,2025,R2,2020,gassupply1,15.00000000000
-1,2030,R2,2020,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2020,R2,gassupply1,2020,15.00000000000
+1,2025,R2,gassupply1,2020,15.00000000000
+1,2030,R2,gassupply1,2020,7.50000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2030.csv
index 223a9793f..03ee962c1 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2030.csv
@@ -1,29 +1,29 @@
-asset,year,region,installed,technology,capacity
-0,2030,R1,2020,gassupply1,7.50000000000
-1,2030,R1,2025,gassupply1,2.79440000000
-1,2035,R1,2025,gassupply1,2.79440000000
-1,2040,R1,2025,gassupply1,2.79440000000
-1,2045,R1,2025,gassupply1,2.79440000000
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2035,R1,2030,gassupply1,7.50000000000
-2,2040,R1,2030,gassupply1,7.50000000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
-3,2030,R2,2020,gassupply1,7.50000000000
-4,2030,R2,2025,gassupply1,2.79440000000
-4,2035,R2,2025,gassupply1,2.79440000000
-4,2040,R2,2025,gassupply1,2.79440000000
-4,2045,R2,2025,gassupply1,2.79440000000
-4,2050,R2,2025,gassupply1,2.79440000000
-4,2064,R2,2025,gassupply1,2.79440000000
-5,2035,R2,2030,gassupply1,7.50000000000
-5,2040,R2,2030,gassupply1,7.50000000000
-5,2045,R2,2030,gassupply1,7.50000000000
-5,2050,R2,2030,gassupply1,7.50000000000
-5,2064,R2,2030,gassupply1,7.50000000000
-5,2065,R2,2030,gassupply1,7.50000000000
-5,2069,R2,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2030,R1,gassupply1,2025,2.79440000000
+1,2035,R1,gassupply1,2025,2.79440000000
+1,2040,R1,gassupply1,2025,2.79440000000
+1,2045,R1,gassupply1,2025,2.79440000000
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2035,R1,gassupply1,2030,7.50000000000
+2,2040,R1,gassupply1,2030,7.50000000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
+3,2030,R2,gassupply1,2020,7.50000000000
+4,2030,R2,gassupply1,2025,2.79440000000
+4,2035,R2,gassupply1,2025,2.79440000000
+4,2040,R2,gassupply1,2025,2.79440000000
+4,2045,R2,gassupply1,2025,2.79440000000
+4,2050,R2,gassupply1,2025,2.79440000000
+4,2064,R2,gassupply1,2025,2.79440000000
+5,2035,R2,gassupply1,2030,7.50000000000
+5,2040,R2,gassupply1,2030,7.50000000000
+5,2045,R2,gassupply1,2030,7.50000000000
+5,2050,R2,gassupply1,2030,7.50000000000
+5,2064,R2,gassupply1,2030,7.50000000000
+5,2065,R2,gassupply1,2030,7.50000000000
+5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2035.csv
index be63ee95e..fbf2a30de 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2035.csv
@@ -1,25 +1,25 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2025,gassupply1,2.79440000000
-1,2040,R1,2025,gassupply1,2.79440000000
-1,2045,R1,2025,gassupply1,2.79440000000
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2035,R1,2030,gassupply1,7.50000000000
-2,2040,R1,2030,gassupply1,7.50000000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
-4,2035,R2,2025,gassupply1,2.79440000000
-4,2040,R2,2025,gassupply1,2.79440000000
-4,2045,R2,2025,gassupply1,2.79440000000
-4,2050,R2,2025,gassupply1,2.79440000000
-4,2064,R2,2025,gassupply1,2.79440000000
-5,2035,R2,2030,gassupply1,7.50000000000
-5,2040,R2,2030,gassupply1,7.50000000000
-5,2045,R2,2030,gassupply1,7.50000000000
-5,2050,R2,2030,gassupply1,7.50000000000
-5,2064,R2,2030,gassupply1,7.50000000000
-5,2065,R2,2030,gassupply1,7.50000000000
-5,2069,R2,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2035,R1,gassupply1,2025,2.79440000000
+1,2040,R1,gassupply1,2025,2.79440000000
+1,2045,R1,gassupply1,2025,2.79440000000
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2035,R1,gassupply1,2030,7.50000000000
+2,2040,R1,gassupply1,2030,7.50000000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
+4,2035,R2,gassupply1,2025,2.79440000000
+4,2040,R2,gassupply1,2025,2.79440000000
+4,2045,R2,gassupply1,2025,2.79440000000
+4,2050,R2,gassupply1,2025,2.79440000000
+4,2064,R2,gassupply1,2025,2.79440000000
+5,2035,R2,gassupply1,2030,7.50000000000
+5,2040,R2,gassupply1,2030,7.50000000000
+5,2045,R2,gassupply1,2030,7.50000000000
+5,2050,R2,gassupply1,2030,7.50000000000
+5,2064,R2,gassupply1,2030,7.50000000000
+5,2065,R2,gassupply1,2030,7.50000000000
+5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2040.csv
index 301ed0412..66e14fbb3 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2040.csv
@@ -1,21 +1,21 @@
-asset,year,region,installed,technology,capacity
-1,2040,R1,2025,gassupply1,2.79440000000
-1,2045,R1,2025,gassupply1,2.79440000000
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2040,R1,2030,gassupply1,7.50000000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
-4,2040,R2,2025,gassupply1,2.79440000000
-4,2045,R2,2025,gassupply1,2.79440000000
-4,2050,R2,2025,gassupply1,2.79440000000
-4,2064,R2,2025,gassupply1,2.79440000000
-5,2040,R2,2030,gassupply1,7.50000000000
-5,2045,R2,2030,gassupply1,7.50000000000
-5,2050,R2,2030,gassupply1,7.50000000000
-5,2064,R2,2030,gassupply1,7.50000000000
-5,2065,R2,2030,gassupply1,7.50000000000
-5,2069,R2,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2040,R1,gassupply1,2025,2.79440000000
+1,2045,R1,gassupply1,2025,2.79440000000
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2040,R1,gassupply1,2030,7.50000000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
+4,2040,R2,gassupply1,2025,2.79440000000
+4,2045,R2,gassupply1,2025,2.79440000000
+4,2050,R2,gassupply1,2025,2.79440000000
+4,2064,R2,gassupply1,2025,2.79440000000
+5,2040,R2,gassupply1,2030,7.50000000000
+5,2045,R2,gassupply1,2030,7.50000000000
+5,2050,R2,gassupply1,2030,7.50000000000
+5,2064,R2,gassupply1,2030,7.50000000000
+5,2065,R2,gassupply1,2030,7.50000000000
+5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2045.csv
index 33d01ddd7..b13eda0e9 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2045.csv
@@ -1,17 +1,17 @@
-asset,year,region,installed,technology,capacity
-1,2045,R1,2025,gassupply1,2.79440000000
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
-4,2045,R2,2025,gassupply1,2.79440000000
-4,2050,R2,2025,gassupply1,2.79440000000
-4,2064,R2,2025,gassupply1,2.79440000000
-5,2045,R2,2030,gassupply1,7.50000000000
-5,2050,R2,2030,gassupply1,7.50000000000
-5,2064,R2,2030,gassupply1,7.50000000000
-5,2065,R2,2030,gassupply1,7.50000000000
-5,2069,R2,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2045,R1,gassupply1,2025,2.79440000000
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
+4,2045,R2,gassupply1,2025,2.79440000000
+4,2050,R2,gassupply1,2025,2.79440000000
+4,2064,R2,gassupply1,2025,2.79440000000
+5,2045,R2,gassupply1,2030,7.50000000000
+5,2050,R2,gassupply1,2030,7.50000000000
+5,2064,R2,gassupply1,2030,7.50000000000
+5,2065,R2,gassupply1,2030,7.50000000000
+5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2050.csv
index 59af61367..5abfb8ed7 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Gas/Capacity/2050.csv
@@ -1,17 +1,17 @@
-asset,year,region,installed,technology,capacity
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2055,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2055,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
-4,2050,R2,2025,gassupply1,2.79440000000
-4,2055,R2,2025,gassupply1,2.79440000000
-4,2064,R2,2025,gassupply1,2.79440000000
-5,2050,R2,2030,gassupply1,7.50000000000
-5,2055,R2,2030,gassupply1,7.50000000000
-5,2064,R2,2030,gassupply1,7.50000000000
-5,2065,R2,2030,gassupply1,7.50000000000
-5,2069,R2,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2055,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2055,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
+4,2050,R2,gassupply1,2025,2.79440000000
+4,2055,R2,gassupply1,2025,2.79440000000
+4,2064,R2,gassupply1,2025,2.79440000000
+5,2050,R2,gassupply1,2030,7.50000000000
+5,2055,R2,gassupply1,2030,7.50000000000
+5,2064,R2,gassupply1,2030,7.50000000000
+5,2065,R2,gassupply1,2030,7.50000000000
+5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/MCACapacity.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/MCACapacity.csv
index c1b43bb27..607c86958 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/MCACapacity.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/MCACapacity.csv
@@ -63,9 +63,8 @@ gasCCGT,R1,R1,A1,power,retrofit,2040,3.00000000000
 solarPV,R1,R1,A1,power,retrofit,2040,6.75000000000
 solarPV,R1,R1,A1,power,retrofit,2040,2.40000000000
 solarPV,R1,R1,A1,power,retrofit,2040,6.00000000000
-solarPV,R1,R1,A1,power,retrofit,2040,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2040,9.19000000000
 windturbine,R1,R1,A1,power,retrofit,2040,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2040,8.38000000000
 gasCCGT,R2,R2,A1,power,retrofit,2040,3.00000000000
 solarPV,R2,R2,A1,power,retrofit,2040,2.40000000000
 solarPV,R2,R2,A1,power,retrofit,2040,2.40000000000
@@ -87,9 +86,9 @@ gasCCGT,R1,R1,A1,power,retrofit,2045,3.00000000000
 solarPV,R1,R1,A1,power,retrofit,2045,6.75000000000
 solarPV,R1,R1,A1,power,retrofit,2045,2.40000000000
 solarPV,R1,R1,A1,power,retrofit,2045,6.00000000000
-solarPV,R1,R1,A1,power,retrofit,2045,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2045,9.19000000000
+solarPV,R1,R1,A1,power,retrofit,2045,6.00000000000
 windturbine,R1,R1,A1,power,retrofit,2045,10.00000000000
-windturbine,R1,R1,A1,power,retrofit,2045,8.38000000000
 gasCCGT,R2,R2,A1,power,retrofit,2045,3.00000000000
 solarPV,R2,R2,A1,power,retrofit,2045,2.40000000000
 solarPV,R2,R2,A1,power,retrofit,2045,2.40000000000
@@ -109,10 +108,10 @@ heatpump,R2,R2,A1,residential,retrofit,2050,23.00000000000
 gasCCGT,R1,R1,A1,power,retrofit,2050,3.00000000000
 solarPV,R1,R1,A1,power,retrofit,2050,2.40000000000
 solarPV,R1,R1,A1,power,retrofit,2050,6.00000000000
-solarPV,R1,R1,A1,power,retrofit,2050,10.00000000000
+solarPV,R1,R1,A1,power,retrofit,2050,9.19000000000
+solarPV,R1,R1,A1,power,retrofit,2050,6.00000000000
 solarPV,R1,R1,A1,power,retrofit,2050,16.91000000000
-windturbine,R1,R1,A1,power,retrofit,2050,8.38000000000
-windturbine,R1,R1,A1,power,retrofit,2050,3.56000000000
+windturbine,R1,R1,A1,power,retrofit,2050,6.75000000000
 gasCCGT,R2,R2,A1,power,retrofit,2050,3.00000000000
 solarPV,R2,R2,A1,power,retrofit,2050,2.40000000000
 solarPV,R2,R2,A1,power,retrofit,2050,2.40000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/MCAPrices.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/MCAPrices.csv
index ce14d096c..2c23130d5 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/MCAPrices.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/MCAPrices.csv
@@ -191,147 +191,147 @@ timeslice,commodity,region,prices,year
 "('all-year', 'all-week', 'evening')",heat,R2,0.43750000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.21490000000,2035
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.21490000000,2035
-"('all-year', 'all-week', 'night')",electricity,R1,0.51750000000,2040
-"('all-year', 'all-week', 'night')",electricity,R2,0.51750000000,2040
+"('all-year', 'all-week', 'night')",electricity,R1,0.55690000000,2040
+"('all-year', 'all-week', 'night')",electricity,R2,0.55690000000,2040
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2040
 "('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2040
 "('all-year', 'all-week', 'night')",heat,R1,0.08410000000,2040
 "('all-year', 'all-week', 'night')",heat,R2,0.08410000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'night')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R1,0.77720000000,2040
-"('all-year', 'all-week', 'morning')",electricity,R2,0.77720000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R1,0.83640000000,2040
+"('all-year', 'all-week', 'morning')",electricity,R2,0.83640000000,2040
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2040
 "('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2040
 "('all-year', 'all-week', 'morning')",heat,R1,0.14270000000,2040
 "('all-year', 'all-week', 'morning')",heat,R2,0.14270000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.51750000000,2040
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.51750000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.55690000000,2040
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.55690000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2040
 "('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2040
 "('all-year', 'all-week', 'afternoon')",heat,R1,0.08410000000,2040
 "('all-year', 'all-week', 'afternoon')",heat,R2,0.08410000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.77720000000,2040
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.77720000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.83640000000,2040
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.83640000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2040
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2040
 "('all-year', 'all-week', 'early-peak')",heat,R1,0.14270000000,2040
 "('all-year', 'all-week', 'early-peak')",heat,R2,0.14270000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.55960000000,2040
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.55960000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.67860000000,2040
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.67860000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2040
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2040
 "('all-year', 'all-week', 'late-peak')",heat,R1,0.38580000000,2040
 "('all-year', 'all-week', 'late-peak')",heat,R2,0.38580000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R1,1.03740000000,2040
-"('all-year', 'all-week', 'evening')",electricity,R2,1.03740000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R1,1.11650000000,2040
+"('all-year', 'all-week', 'evening')",electricity,R2,1.11650000000,2040
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2040
 "('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2040
 "('all-year', 'all-week', 'evening')",heat,R1,0.21250000000,2040
 "('all-year', 'all-week', 'evening')",heat,R2,0.21250000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.27280000000,2040
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.27280000000,2040
-"('all-year', 'all-week', 'night')",electricity,R1,0.59730000000,2045
-"('all-year', 'all-week', 'night')",electricity,R2,0.59730000000,2045
+"('all-year', 'all-week', 'night')",electricity,R1,0.61020000000,2045
+"('all-year', 'all-week', 'night')",electricity,R2,0.61020000000,2045
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2045
 "('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2045
-"('all-year', 'all-week', 'night')",heat,R1,0.08760000000,2045
-"('all-year', 'all-week', 'night')",heat,R2,0.08760000000,2045
+"('all-year', 'all-week', 'night')",heat,R1,0.08920000000,2045
+"('all-year', 'all-week', 'night')",heat,R2,0.08920000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'night')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R1,0.89680000000,2045
-"('all-year', 'all-week', 'morning')",electricity,R2,0.89680000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R1,0.91620000000,2045
+"('all-year', 'all-week', 'morning')",electricity,R2,0.91620000000,2045
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2045
 "('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2045
-"('all-year', 'all-week', 'morning')",heat,R1,0.14680000000,2045
-"('all-year', 'all-week', 'morning')",heat,R2,0.14680000000,2045
+"('all-year', 'all-week', 'morning')",heat,R1,0.15030000000,2045
+"('all-year', 'all-week', 'morning')",heat,R2,0.15030000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.59730000000,2045
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.59730000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.61020000000,2045
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.61020000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2045
 "('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.08760000000,2045
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.08760000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.08920000000,2045
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.08920000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.89680000000,2045
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.89680000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.91620000000,2045
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.91620000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2045
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.14680000000,2045
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.14680000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.15030000000,2045
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.15030000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.79850000000,2045
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.79850000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.83740000000,2045
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.83740000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2045
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.38620000000,2045
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.38620000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.40020000000,2045
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.40020000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R1,1.19680000000,2045
-"('all-year', 'all-week', 'evening')",electricity,R2,1.19680000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R1,1.22270000000,2045
+"('all-year', 'all-week', 'evening')",electricity,R2,1.22270000000,2045
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2045
 "('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2045
-"('all-year', 'all-week', 'evening')",heat,R1,0.21630000000,2045
-"('all-year', 'all-week', 'evening')",heat,R2,0.21630000000,2045
+"('all-year', 'all-week', 'evening')",heat,R1,0.22250000000,2045
+"('all-year', 'all-week', 'evening')",heat,R2,0.22250000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.35390000000,2045
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.35390000000,2045
-"('all-year', 'all-week', 'night')",electricity,R1,0.63780000000,2050
-"('all-year', 'all-week', 'night')",electricity,R2,0.63780000000,2050
+"('all-year', 'all-week', 'night')",electricity,R1,0.63640000000,2050
+"('all-year', 'all-week', 'night')",electricity,R2,0.63640000000,2050
 "('all-year', 'all-week', 'night')",gas,R1,0.04720000000,2050
 "('all-year', 'all-week', 'night')",gas,R2,0.04720000000,2050
-"('all-year', 'all-week', 'night')",heat,R1,0.04790000000,2050
-"('all-year', 'all-week', 'night')",heat,R2,0.04790000000,2050
+"('all-year', 'all-week', 'night')",heat,R1,0.04850000000,2050
+"('all-year', 'all-week', 'night')",heat,R2,0.04850000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'night')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R1,0.95750000000,2050
-"('all-year', 'all-week', 'morning')",electricity,R2,0.95750000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R1,0.95530000000,2050
+"('all-year', 'all-week', 'morning')",electricity,R2,0.95530000000,2050
 "('all-year', 'all-week', 'morning')",gas,R1,0.07080000000,2050
 "('all-year', 'all-week', 'morning')",gas,R2,0.07080000000,2050
-"('all-year', 'all-week', 'morning')",heat,R1,0.08990000000,2050
-"('all-year', 'all-week', 'morning')",heat,R2,0.08990000000,2050
+"('all-year', 'all-week', 'morning')",heat,R1,0.09100000000,2050
+"('all-year', 'all-week', 'morning')",heat,R2,0.09100000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'morning')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63780000000,2050
-"('all-year', 'all-week', 'afternoon')",electricity,R2,0.63780000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R1,0.63640000000,2050
+"('all-year', 'all-week', 'afternoon')",electricity,R2,0.63640000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R1,0.04720000000,2050
 "('all-year', 'all-week', 'afternoon')",gas,R2,0.04720000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R1,0.04790000000,2050
-"('all-year', 'all-week', 'afternoon')",heat,R2,0.04790000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R1,0.04850000000,2050
+"('all-year', 'all-week', 'afternoon')",heat,R2,0.04850000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'afternoon')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R1,0.95750000000,2050
-"('all-year', 'all-week', 'early-peak')",electricity,R2,0.95750000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R1,0.95530000000,2050
+"('all-year', 'all-week', 'early-peak')",electricity,R2,0.95530000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R1,0.07080000000,2050
 "('all-year', 'all-week', 'early-peak')",gas,R2,0.07080000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R1,0.08990000000,2050
-"('all-year', 'all-week', 'early-peak')",heat,R2,0.08990000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R1,0.09100000000,2050
+"('all-year', 'all-week', 'early-peak')",heat,R2,0.09100000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'early-peak')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R1,1.91950000000,2050
-"('all-year', 'all-week', 'late-peak')",electricity,R2,1.91950000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R1,1.91500000000,2050
+"('all-year', 'all-week', 'late-peak')",electricity,R2,1.91500000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R1,0.14170000000,2050
 "('all-year', 'all-week', 'late-peak')",gas,R2,0.14170000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R1,0.28800000000,2050
-"('all-year', 'all-week', 'late-peak')",heat,R2,0.28800000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R1,0.29260000000,2050
+"('all-year', 'all-week', 'late-peak')",heat,R2,0.29260000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'late-peak')",CO2f,R2,0.43510000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R1,1.27770000000,2050
-"('all-year', 'all-week', 'evening')",electricity,R2,1.27770000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R1,1.27470000000,2050
+"('all-year', 'all-week', 'evening')",electricity,R2,1.27470000000,2050
 "('all-year', 'all-week', 'evening')",gas,R1,0.09440000000,2050
 "('all-year', 'all-week', 'evening')",gas,R2,0.09440000000,2050
-"('all-year', 'all-week', 'evening')",heat,R1,0.14380000000,2050
-"('all-year', 'all-week', 'evening')",heat,R2,0.14380000000,2050
+"('all-year', 'all-week', 'evening')",heat,R1,0.14590000000,2050
+"('all-year', 'all-week', 'evening')",heat,R2,0.14590000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R1,0.43510000000,2050
 "('all-year', 'all-week', 'evening')",CO2f,R2,0.43510000000,2050
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2020.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2020.csv
index b5425c1bf..7cbcccfb1 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2020.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2020.csv
@@ -1,23 +1,23 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gasCCGT,1.00000000000
-0,2025,R1,2020,gasCCGT,1.00000000000
-1,2025,R1,2020,solarPV,6.75000000000
-1,2030,R1,2020,solarPV,6.75000000000
-1,2035,R1,2020,solarPV,6.75000000000
-1,2040,R1,2020,solarPV,6.75000000000
-1,2045,R1,2020,solarPV,6.75000000000
-1,2049,R1,2020,solarPV,6.75000000000
-2,2025,R1,2020,windturbine,10.00000000000
-2,2030,R1,2020,windturbine,10.00000000000
-2,2035,R1,2020,windturbine,10.00000000000
-2,2040,R1,2020,windturbine,10.00000000000
-2,2045,R1,2020,windturbine,10.00000000000
-2,2049,R1,2020,windturbine,10.00000000000
-3,2020,R2,2020,gasCCGT,1.00000000000
-3,2025,R2,2020,gasCCGT,1.00000000000
-4,2025,R2,2020,windturbine,16.75000000000
-4,2030,R2,2020,windturbine,16.75000000000
-4,2035,R2,2020,windturbine,16.75000000000
-4,2040,R2,2020,windturbine,16.75000000000
-4,2045,R2,2020,windturbine,16.75000000000
-4,2049,R2,2020,windturbine,16.75000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2025,R1,solarPV,2020,6.75000000000
+1,2030,R1,solarPV,2020,6.75000000000
+1,2035,R1,solarPV,2020,6.75000000000
+1,2040,R1,solarPV,2020,6.75000000000
+1,2045,R1,solarPV,2020,6.75000000000
+1,2049,R1,solarPV,2020,6.75000000000
+2,2025,R1,windturbine,2020,10.00000000000
+2,2030,R1,windturbine,2020,10.00000000000
+2,2035,R1,windturbine,2020,10.00000000000
+2,2040,R1,windturbine,2020,10.00000000000
+2,2045,R1,windturbine,2020,10.00000000000
+2,2049,R1,windturbine,2020,10.00000000000
+3,2020,R2,gasCCGT,2020,1.00000000000
+3,2025,R2,gasCCGT,2020,1.00000000000
+4,2025,R2,windturbine,2020,16.75000000000
+4,2030,R2,windturbine,2020,16.75000000000
+4,2035,R2,windturbine,2020,16.75000000000
+4,2040,R2,windturbine,2020,16.75000000000
+4,2045,R2,windturbine,2020,16.75000000000
+4,2049,R2,windturbine,2020,16.75000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2030.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2030.csv
index ca265d0a5..2bb5bf691 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2030.csv
@@ -1,76 +1,76 @@
-asset,year,region,installed,technology,capacity
-1,2030,R1,2020,solarPV,6.75000000000
-1,2035,R1,2020,solarPV,6.75000000000
-1,2040,R1,2020,solarPV,6.75000000000
-1,2045,R1,2020,solarPV,6.75000000000
-1,2049,R1,2020,solarPV,6.75000000000
-2,2030,R1,2020,windturbine,10.00000000000
-2,2035,R1,2020,windturbine,10.00000000000
-2,2040,R1,2020,windturbine,10.00000000000
-2,2045,R1,2020,windturbine,10.00000000000
-2,2049,R1,2020,windturbine,10.00000000000
-3,2030,R1,2025,gasCCGT,3.00000000000
-3,2035,R1,2025,gasCCGT,3.00000000000
-3,2040,R1,2025,gasCCGT,3.00000000000
-3,2045,R1,2025,gasCCGT,3.00000000000
-3,2049,R1,2025,gasCCGT,3.00000000000
-3,2050,R1,2025,gasCCGT,3.00000000000
-3,2054,R1,2025,gasCCGT,3.00000000000
-3,2055,R1,2025,gasCCGT,3.00000000000
-3,2059,R1,2025,gasCCGT,3.00000000000
-3,2060,R1,2025,gasCCGT,3.00000000000
-3,2064,R1,2025,gasCCGT,3.00000000000
-4,2030,R1,2025,solarPV,2.40000000000
-4,2035,R1,2025,solarPV,2.40000000000
-4,2040,R1,2025,solarPV,2.40000000000
-4,2045,R1,2025,solarPV,2.40000000000
-4,2049,R1,2025,solarPV,2.40000000000
-4,2050,R1,2025,solarPV,2.40000000000
-4,2054,R1,2025,solarPV,2.40000000000
-5,2035,R1,2030,solarPV,6.00000000000
-5,2040,R1,2030,solarPV,6.00000000000
-5,2045,R1,2030,solarPV,6.00000000000
-5,2049,R1,2030,solarPV,6.00000000000
-5,2050,R1,2030,solarPV,6.00000000000
-5,2054,R1,2030,solarPV,6.00000000000
-5,2055,R1,2030,solarPV,6.00000000000
-5,2059,R1,2030,solarPV,6.00000000000
-7,2030,R2,2020,windturbine,16.75000000000
-7,2035,R2,2020,windturbine,16.75000000000
-7,2040,R2,2020,windturbine,16.75000000000
-7,2045,R2,2020,windturbine,16.75000000000
-7,2049,R2,2020,windturbine,16.75000000000
-8,2030,R2,2025,gasCCGT,3.00000000000
-8,2035,R2,2025,gasCCGT,3.00000000000
-8,2040,R2,2025,gasCCGT,3.00000000000
-8,2045,R2,2025,gasCCGT,3.00000000000
-8,2049,R2,2025,gasCCGT,3.00000000000
-8,2050,R2,2025,gasCCGT,3.00000000000
-8,2054,R2,2025,gasCCGT,3.00000000000
-8,2055,R2,2025,gasCCGT,3.00000000000
-8,2059,R2,2025,gasCCGT,3.00000000000
-8,2060,R2,2025,gasCCGT,3.00000000000
-8,2064,R2,2025,gasCCGT,3.00000000000
-9,2030,R2,2025,solarPV,2.40000000000
-9,2035,R2,2025,solarPV,2.40000000000
-9,2040,R2,2025,solarPV,2.40000000000
-9,2045,R2,2025,solarPV,2.40000000000
-9,2049,R2,2025,solarPV,2.40000000000
-9,2050,R2,2025,solarPV,2.40000000000
-9,2054,R2,2025,solarPV,2.40000000000
-10,2035,R2,2030,solarPV,2.40000000000
-10,2040,R2,2030,solarPV,2.40000000000
-10,2045,R2,2030,solarPV,2.40000000000
-10,2049,R2,2030,solarPV,2.40000000000
-10,2050,R2,2030,solarPV,2.40000000000
-10,2054,R2,2030,solarPV,2.40000000000
-10,2055,R2,2030,solarPV,2.40000000000
-10,2059,R2,2030,solarPV,2.40000000000
-11,2035,R2,2030,windturbine,3.60000000000
-11,2040,R2,2030,windturbine,3.60000000000
-11,2045,R2,2030,windturbine,3.60000000000
-11,2049,R2,2030,windturbine,3.60000000000
-11,2050,R2,2030,windturbine,3.60000000000
-11,2054,R2,2030,windturbine,3.60000000000
-11,2055,R2,2030,windturbine,3.60000000000
-11,2059,R2,2030,windturbine,3.60000000000
+asset,year,region,technology,installed,capacity
+1,2030,R1,gasCCGT,2025,3.00000000000
+1,2035,R1,gasCCGT,2025,3.00000000000
+1,2040,R1,gasCCGT,2025,3.00000000000
+1,2045,R1,gasCCGT,2025,3.00000000000
+1,2049,R1,gasCCGT,2025,3.00000000000
+1,2050,R1,gasCCGT,2025,3.00000000000
+1,2054,R1,gasCCGT,2025,3.00000000000
+1,2055,R1,gasCCGT,2025,3.00000000000
+1,2059,R1,gasCCGT,2025,3.00000000000
+1,2060,R1,gasCCGT,2025,3.00000000000
+1,2064,R1,gasCCGT,2025,3.00000000000
+2,2030,R1,solarPV,2020,6.75000000000
+2,2035,R1,solarPV,2020,6.75000000000
+2,2040,R1,solarPV,2020,6.75000000000
+2,2045,R1,solarPV,2020,6.75000000000
+2,2049,R1,solarPV,2020,6.75000000000
+3,2030,R1,solarPV,2025,2.40000000000
+3,2035,R1,solarPV,2025,2.40000000000
+3,2040,R1,solarPV,2025,2.40000000000
+3,2045,R1,solarPV,2025,2.40000000000
+3,2049,R1,solarPV,2025,2.40000000000
+3,2050,R1,solarPV,2025,2.40000000000
+3,2054,R1,solarPV,2025,2.40000000000
+4,2035,R1,solarPV,2030,6.00000000000
+4,2040,R1,solarPV,2030,6.00000000000
+4,2045,R1,solarPV,2030,6.00000000000
+4,2049,R1,solarPV,2030,6.00000000000
+4,2050,R1,solarPV,2030,6.00000000000
+4,2054,R1,solarPV,2030,6.00000000000
+4,2055,R1,solarPV,2030,6.00000000000
+4,2059,R1,solarPV,2030,6.00000000000
+5,2030,R1,windturbine,2020,10.00000000000
+5,2035,R1,windturbine,2020,10.00000000000
+5,2040,R1,windturbine,2020,10.00000000000
+5,2045,R1,windturbine,2020,10.00000000000
+5,2049,R1,windturbine,2020,10.00000000000
+7,2030,R2,gasCCGT,2025,3.00000000000
+7,2035,R2,gasCCGT,2025,3.00000000000
+7,2040,R2,gasCCGT,2025,3.00000000000
+7,2045,R2,gasCCGT,2025,3.00000000000
+7,2049,R2,gasCCGT,2025,3.00000000000
+7,2050,R2,gasCCGT,2025,3.00000000000
+7,2054,R2,gasCCGT,2025,3.00000000000
+7,2055,R2,gasCCGT,2025,3.00000000000
+7,2059,R2,gasCCGT,2025,3.00000000000
+7,2060,R2,gasCCGT,2025,3.00000000000
+7,2064,R2,gasCCGT,2025,3.00000000000
+8,2030,R2,solarPV,2025,2.40000000000
+8,2035,R2,solarPV,2025,2.40000000000
+8,2040,R2,solarPV,2025,2.40000000000
+8,2045,R2,solarPV,2025,2.40000000000
+8,2049,R2,solarPV,2025,2.40000000000
+8,2050,R2,solarPV,2025,2.40000000000
+8,2054,R2,solarPV,2025,2.40000000000
+9,2035,R2,solarPV,2030,2.40000000000
+9,2040,R2,solarPV,2030,2.40000000000
+9,2045,R2,solarPV,2030,2.40000000000
+9,2049,R2,solarPV,2030,2.40000000000
+9,2050,R2,solarPV,2030,2.40000000000
+9,2054,R2,solarPV,2030,2.40000000000
+9,2055,R2,solarPV,2030,2.40000000000
+9,2059,R2,solarPV,2030,2.40000000000
+10,2030,R2,windturbine,2020,16.75000000000
+10,2035,R2,windturbine,2020,16.75000000000
+10,2040,R2,windturbine,2020,16.75000000000
+10,2045,R2,windturbine,2020,16.75000000000
+10,2049,R2,windturbine,2020,16.75000000000
+11,2035,R2,windturbine,2030,3.60000000000
+11,2040,R2,windturbine,2030,3.60000000000
+11,2045,R2,windturbine,2030,3.60000000000
+11,2049,R2,windturbine,2030,3.60000000000
+11,2050,R2,windturbine,2030,3.60000000000
+11,2054,R2,windturbine,2030,3.60000000000
+11,2055,R2,windturbine,2030,3.60000000000
+11,2059,R2,windturbine,2030,3.60000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2035.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2035.csv
index bc71a6d4c..60a03abce 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2035.csv
@@ -1,105 +1,96 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2020,solarPV,6.75000000000
-1,2040,R1,2020,solarPV,6.75000000000
-1,2045,R1,2020,solarPV,6.75000000000
-1,2049,R1,2020,solarPV,6.75000000000
-2,2035,R1,2020,windturbine,10.00000000000
-2,2040,R1,2020,windturbine,10.00000000000
-2,2045,R1,2020,windturbine,10.00000000000
-2,2049,R1,2020,windturbine,10.00000000000
-3,2035,R1,2025,gasCCGT,3.00000000000
-3,2040,R1,2025,gasCCGT,3.00000000000
-3,2045,R1,2025,gasCCGT,3.00000000000
-3,2049,R1,2025,gasCCGT,3.00000000000
-3,2050,R1,2025,gasCCGT,3.00000000000
-3,2054,R1,2025,gasCCGT,3.00000000000
-3,2055,R1,2025,gasCCGT,3.00000000000
-3,2059,R1,2025,gasCCGT,3.00000000000
-3,2060,R1,2025,gasCCGT,3.00000000000
-3,2064,R1,2025,gasCCGT,3.00000000000
-4,2035,R1,2025,solarPV,2.40000000000
-4,2040,R1,2025,solarPV,2.40000000000
-4,2045,R1,2025,solarPV,2.40000000000
-4,2049,R1,2025,solarPV,2.40000000000
-4,2050,R1,2025,solarPV,2.40000000000
-4,2054,R1,2025,solarPV,2.40000000000
-5,2035,R1,2030,solarPV,6.00000000000
-5,2040,R1,2030,solarPV,6.00000000000
-5,2045,R1,2030,solarPV,6.00000000000
-5,2049,R1,2030,solarPV,6.00000000000
-5,2050,R1,2030,solarPV,6.00000000000
-5,2054,R1,2030,solarPV,6.00000000000
-5,2055,R1,2030,solarPV,6.00000000000
-5,2059,R1,2030,solarPV,6.00000000000
-6,2040,R1,2035,solarPV,10.00000000000
-6,2045,R1,2035,solarPV,10.00000000000
-6,2049,R1,2035,solarPV,10.00000000000
-6,2050,R1,2035,solarPV,10.00000000000
-6,2054,R1,2035,solarPV,10.00000000000
-6,2055,R1,2035,solarPV,10.00000000000
-6,2059,R1,2035,solarPV,10.00000000000
-6,2060,R1,2035,solarPV,10.00000000000
-6,2064,R1,2035,solarPV,10.00000000000
-7,2040,R1,2035,windturbine,8.38000000000
-7,2045,R1,2035,windturbine,8.38000000000
-7,2049,R1,2035,windturbine,8.38000000000
-7,2050,R1,2035,windturbine,8.38000000000
-7,2054,R1,2035,windturbine,8.38000000000
-7,2055,R1,2035,windturbine,8.38000000000
-7,2059,R1,2035,windturbine,8.38000000000
-7,2060,R1,2035,windturbine,8.38000000000
-7,2064,R1,2035,windturbine,8.38000000000
-9,2035,R2,2020,windturbine,16.75000000000
-9,2040,R2,2020,windturbine,16.75000000000
-9,2045,R2,2020,windturbine,16.75000000000
-9,2049,R2,2020,windturbine,16.75000000000
-10,2035,R2,2025,gasCCGT,3.00000000000
-10,2040,R2,2025,gasCCGT,3.00000000000
-10,2045,R2,2025,gasCCGT,3.00000000000
-10,2049,R2,2025,gasCCGT,3.00000000000
-10,2050,R2,2025,gasCCGT,3.00000000000
-10,2054,R2,2025,gasCCGT,3.00000000000
-10,2055,R2,2025,gasCCGT,3.00000000000
-10,2059,R2,2025,gasCCGT,3.00000000000
-10,2060,R2,2025,gasCCGT,3.00000000000
-10,2064,R2,2025,gasCCGT,3.00000000000
-11,2035,R2,2025,solarPV,2.40000000000
-11,2040,R2,2025,solarPV,2.40000000000
-11,2045,R2,2025,solarPV,2.40000000000
-11,2049,R2,2025,solarPV,2.40000000000
-11,2050,R2,2025,solarPV,2.40000000000
-11,2054,R2,2025,solarPV,2.40000000000
-12,2035,R2,2030,solarPV,2.40000000000
-12,2040,R2,2030,solarPV,2.40000000000
-12,2045,R2,2030,solarPV,2.40000000000
-12,2049,R2,2030,solarPV,2.40000000000
-12,2050,R2,2030,solarPV,2.40000000000
-12,2054,R2,2030,solarPV,2.40000000000
-12,2055,R2,2030,solarPV,2.40000000000
-12,2059,R2,2030,solarPV,2.40000000000
-13,2035,R2,2030,windturbine,3.60000000000
-13,2040,R2,2030,windturbine,3.60000000000
-13,2045,R2,2030,windturbine,3.60000000000
-13,2049,R2,2030,windturbine,3.60000000000
-13,2050,R2,2030,windturbine,3.60000000000
-13,2054,R2,2030,windturbine,3.60000000000
-13,2055,R2,2030,windturbine,3.60000000000
-13,2059,R2,2030,windturbine,3.60000000000
-14,2040,R2,2035,solarPV,4.80000000000
-14,2045,R2,2035,solarPV,4.80000000000
-14,2049,R2,2035,solarPV,4.80000000000
-14,2050,R2,2035,solarPV,4.80000000000
-14,2054,R2,2035,solarPV,4.80000000000
-14,2055,R2,2035,solarPV,4.80000000000
-14,2059,R2,2035,solarPV,4.80000000000
-14,2060,R2,2035,solarPV,4.80000000000
-14,2064,R2,2035,solarPV,4.80000000000
-15,2040,R2,2035,windturbine,4.39000000000
-15,2045,R2,2035,windturbine,4.39000000000
-15,2049,R2,2035,windturbine,4.39000000000
-15,2050,R2,2035,windturbine,4.39000000000
-15,2054,R2,2035,windturbine,4.39000000000
-15,2055,R2,2035,windturbine,4.39000000000
-15,2059,R2,2035,windturbine,4.39000000000
-15,2060,R2,2035,windturbine,4.39000000000
-15,2064,R2,2035,windturbine,4.39000000000
+asset,year,region,technology,installed,capacity
+1,2035,R1,gasCCGT,2025,3.00000000000
+1,2040,R1,gasCCGT,2025,3.00000000000
+1,2045,R1,gasCCGT,2025,3.00000000000
+1,2049,R1,gasCCGT,2025,3.00000000000
+1,2050,R1,gasCCGT,2025,3.00000000000
+1,2054,R1,gasCCGT,2025,3.00000000000
+1,2055,R1,gasCCGT,2025,3.00000000000
+1,2059,R1,gasCCGT,2025,3.00000000000
+1,2060,R1,gasCCGT,2025,3.00000000000
+1,2064,R1,gasCCGT,2025,3.00000000000
+2,2035,R1,solarPV,2020,6.75000000000
+2,2040,R1,solarPV,2020,6.75000000000
+2,2045,R1,solarPV,2020,6.75000000000
+2,2049,R1,solarPV,2020,6.75000000000
+3,2035,R1,solarPV,2025,2.40000000000
+3,2040,R1,solarPV,2025,2.40000000000
+3,2045,R1,solarPV,2025,2.40000000000
+3,2049,R1,solarPV,2025,2.40000000000
+3,2050,R1,solarPV,2025,2.40000000000
+3,2054,R1,solarPV,2025,2.40000000000
+4,2035,R1,solarPV,2030,6.00000000000
+4,2040,R1,solarPV,2030,6.00000000000
+4,2045,R1,solarPV,2030,6.00000000000
+4,2049,R1,solarPV,2030,6.00000000000
+4,2050,R1,solarPV,2030,6.00000000000
+4,2054,R1,solarPV,2030,6.00000000000
+4,2055,R1,solarPV,2030,6.00000000000
+4,2059,R1,solarPV,2030,6.00000000000
+5,2040,R1,solarPV,2035,9.19000000000
+5,2045,R1,solarPV,2035,9.19000000000
+5,2049,R1,solarPV,2035,9.19000000000
+5,2050,R1,solarPV,2035,9.19000000000
+5,2054,R1,solarPV,2035,9.19000000000
+5,2055,R1,solarPV,2035,9.19000000000
+5,2059,R1,solarPV,2035,9.19000000000
+5,2060,R1,solarPV,2035,9.19000000000
+5,2064,R1,solarPV,2035,9.19000000000
+6,2035,R1,windturbine,2020,10.00000000000
+6,2040,R1,windturbine,2020,10.00000000000
+6,2045,R1,windturbine,2020,10.00000000000
+6,2049,R1,windturbine,2020,10.00000000000
+8,2035,R2,gasCCGT,2025,3.00000000000
+8,2040,R2,gasCCGT,2025,3.00000000000
+8,2045,R2,gasCCGT,2025,3.00000000000
+8,2049,R2,gasCCGT,2025,3.00000000000
+8,2050,R2,gasCCGT,2025,3.00000000000
+8,2054,R2,gasCCGT,2025,3.00000000000
+8,2055,R2,gasCCGT,2025,3.00000000000
+8,2059,R2,gasCCGT,2025,3.00000000000
+8,2060,R2,gasCCGT,2025,3.00000000000
+8,2064,R2,gasCCGT,2025,3.00000000000
+9,2035,R2,solarPV,2025,2.40000000000
+9,2040,R2,solarPV,2025,2.40000000000
+9,2045,R2,solarPV,2025,2.40000000000
+9,2049,R2,solarPV,2025,2.40000000000
+9,2050,R2,solarPV,2025,2.40000000000
+9,2054,R2,solarPV,2025,2.40000000000
+10,2035,R2,solarPV,2030,2.40000000000
+10,2040,R2,solarPV,2030,2.40000000000
+10,2045,R2,solarPV,2030,2.40000000000
+10,2049,R2,solarPV,2030,2.40000000000
+10,2050,R2,solarPV,2030,2.40000000000
+10,2054,R2,solarPV,2030,2.40000000000
+10,2055,R2,solarPV,2030,2.40000000000
+10,2059,R2,solarPV,2030,2.40000000000
+11,2040,R2,solarPV,2035,4.80000000000
+11,2045,R2,solarPV,2035,4.80000000000
+11,2049,R2,solarPV,2035,4.80000000000
+11,2050,R2,solarPV,2035,4.80000000000
+11,2054,R2,solarPV,2035,4.80000000000
+11,2055,R2,solarPV,2035,4.80000000000
+11,2059,R2,solarPV,2035,4.80000000000
+11,2060,R2,solarPV,2035,4.80000000000
+11,2064,R2,solarPV,2035,4.80000000000
+12,2035,R2,windturbine,2020,16.75000000000
+12,2040,R2,windturbine,2020,16.75000000000
+12,2045,R2,windturbine,2020,16.75000000000
+12,2049,R2,windturbine,2020,16.75000000000
+13,2035,R2,windturbine,2030,3.60000000000
+13,2040,R2,windturbine,2030,3.60000000000
+13,2045,R2,windturbine,2030,3.60000000000
+13,2049,R2,windturbine,2030,3.60000000000
+13,2050,R2,windturbine,2030,3.60000000000
+13,2054,R2,windturbine,2030,3.60000000000
+13,2055,R2,windturbine,2030,3.60000000000
+13,2059,R2,windturbine,2030,3.60000000000
+14,2040,R2,windturbine,2035,4.39000000000
+14,2045,R2,windturbine,2035,4.39000000000
+14,2049,R2,windturbine,2035,4.39000000000
+14,2050,R2,windturbine,2035,4.39000000000
+14,2054,R2,windturbine,2035,4.39000000000
+14,2055,R2,windturbine,2035,4.39000000000
+14,2059,R2,windturbine,2035,4.39000000000
+14,2060,R2,windturbine,2035,4.39000000000
+14,2064,R2,windturbine,2035,4.39000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2040.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2040.csv
index bda104159..7758d83e4 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2040.csv
@@ -1,105 +1,106 @@
-asset,year,region,installed,technology,capacity
-1,2040,R1,2020,solarPV,6.75000000000
-1,2045,R1,2020,solarPV,6.75000000000
-1,2049,R1,2020,solarPV,6.75000000000
-2,2040,R1,2020,windturbine,10.00000000000
-2,2045,R1,2020,windturbine,10.00000000000
-2,2049,R1,2020,windturbine,10.00000000000
-3,2040,R1,2025,gasCCGT,3.00000000000
-3,2045,R1,2025,gasCCGT,3.00000000000
-3,2049,R1,2025,gasCCGT,3.00000000000
-3,2050,R1,2025,gasCCGT,3.00000000000
-3,2054,R1,2025,gasCCGT,3.00000000000
-3,2055,R1,2025,gasCCGT,3.00000000000
-3,2059,R1,2025,gasCCGT,3.00000000000
-3,2060,R1,2025,gasCCGT,3.00000000000
-3,2064,R1,2025,gasCCGT,3.00000000000
-4,2040,R1,2025,solarPV,2.40000000000
-4,2045,R1,2025,solarPV,2.40000000000
-4,2049,R1,2025,solarPV,2.40000000000
-4,2050,R1,2025,solarPV,2.40000000000
-4,2054,R1,2025,solarPV,2.40000000000
-5,2040,R1,2030,solarPV,6.00000000000
-5,2045,R1,2030,solarPV,6.00000000000
-5,2049,R1,2030,solarPV,6.00000000000
-5,2050,R1,2030,solarPV,6.00000000000
-5,2054,R1,2030,solarPV,6.00000000000
-5,2055,R1,2030,solarPV,6.00000000000
-5,2059,R1,2030,solarPV,6.00000000000
-6,2040,R1,2035,solarPV,10.00000000000
-6,2045,R1,2035,solarPV,10.00000000000
-6,2049,R1,2035,solarPV,10.00000000000
-6,2050,R1,2035,solarPV,10.00000000000
-6,2054,R1,2035,solarPV,10.00000000000
-6,2055,R1,2035,solarPV,10.00000000000
-6,2059,R1,2035,solarPV,10.00000000000
-6,2060,R1,2035,solarPV,10.00000000000
-6,2064,R1,2035,solarPV,10.00000000000
-7,2040,R1,2035,windturbine,8.38000000000
-7,2045,R1,2035,windturbine,8.38000000000
-7,2049,R1,2035,windturbine,8.38000000000
-7,2050,R1,2035,windturbine,8.38000000000
-7,2054,R1,2035,windturbine,8.38000000000
-7,2055,R1,2035,windturbine,8.38000000000
-7,2059,R1,2035,windturbine,8.38000000000
-7,2060,R1,2035,windturbine,8.38000000000
-7,2064,R1,2035,windturbine,8.38000000000
-9,2040,R2,2020,windturbine,16.75000000000
-9,2045,R2,2020,windturbine,16.75000000000
-9,2049,R2,2020,windturbine,16.75000000000
-10,2040,R2,2025,gasCCGT,3.00000000000
-10,2045,R2,2025,gasCCGT,3.00000000000
-10,2049,R2,2025,gasCCGT,3.00000000000
-10,2050,R2,2025,gasCCGT,3.00000000000
-10,2054,R2,2025,gasCCGT,3.00000000000
-10,2055,R2,2025,gasCCGT,3.00000000000
-10,2059,R2,2025,gasCCGT,3.00000000000
-10,2060,R2,2025,gasCCGT,3.00000000000
-10,2064,R2,2025,gasCCGT,3.00000000000
-11,2040,R2,2025,solarPV,2.40000000000
-11,2045,R2,2025,solarPV,2.40000000000
-11,2049,R2,2025,solarPV,2.40000000000
-11,2050,R2,2025,solarPV,2.40000000000
-11,2054,R2,2025,solarPV,2.40000000000
-12,2040,R2,2030,solarPV,2.40000000000
-12,2045,R2,2030,solarPV,2.40000000000
-12,2049,R2,2030,solarPV,2.40000000000
-12,2050,R2,2030,solarPV,2.40000000000
-12,2054,R2,2030,solarPV,2.40000000000
-12,2055,R2,2030,solarPV,2.40000000000
-12,2059,R2,2030,solarPV,2.40000000000
-13,2040,R2,2030,windturbine,3.60000000000
-13,2045,R2,2030,windturbine,3.60000000000
-13,2049,R2,2030,windturbine,3.60000000000
-13,2050,R2,2030,windturbine,3.60000000000
-13,2054,R2,2030,windturbine,3.60000000000
-13,2055,R2,2030,windturbine,3.60000000000
-13,2059,R2,2030,windturbine,3.60000000000
-14,2040,R2,2035,solarPV,4.80000000000
-14,2045,R2,2035,solarPV,4.80000000000
-14,2049,R2,2035,solarPV,4.80000000000
-14,2050,R2,2035,solarPV,4.80000000000
-14,2054,R2,2035,solarPV,4.80000000000
-14,2055,R2,2035,solarPV,4.80000000000
-14,2059,R2,2035,solarPV,4.80000000000
-14,2060,R2,2035,solarPV,4.80000000000
-14,2064,R2,2035,solarPV,4.80000000000
-15,2040,R2,2035,windturbine,4.39000000000
-15,2045,R2,2035,windturbine,4.39000000000
-15,2049,R2,2035,windturbine,4.39000000000
-15,2050,R2,2035,windturbine,4.39000000000
-15,2054,R2,2035,windturbine,4.39000000000
-15,2055,R2,2035,windturbine,4.39000000000
-15,2059,R2,2035,windturbine,4.39000000000
-15,2060,R2,2035,windturbine,4.39000000000
-15,2064,R2,2035,windturbine,4.39000000000
-16,2045,R2,2040,solarPV,6.00000000000
-16,2049,R2,2040,solarPV,6.00000000000
-16,2050,R2,2040,solarPV,6.00000000000
-16,2054,R2,2040,solarPV,6.00000000000
-16,2055,R2,2040,solarPV,6.00000000000
-16,2059,R2,2040,solarPV,6.00000000000
-16,2060,R2,2040,solarPV,6.00000000000
-16,2064,R2,2040,solarPV,6.00000000000
-16,2065,R2,2040,solarPV,6.00000000000
-16,2069,R2,2040,solarPV,6.00000000000
+asset,year,region,technology,installed,capacity
+1,2040,R1,gasCCGT,2025,3.00000000000
+1,2045,R1,gasCCGT,2025,3.00000000000
+1,2049,R1,gasCCGT,2025,3.00000000000
+1,2050,R1,gasCCGT,2025,3.00000000000
+1,2054,R1,gasCCGT,2025,3.00000000000
+1,2055,R1,gasCCGT,2025,3.00000000000
+1,2059,R1,gasCCGT,2025,3.00000000000
+1,2060,R1,gasCCGT,2025,3.00000000000
+1,2064,R1,gasCCGT,2025,3.00000000000
+2,2040,R1,solarPV,2020,6.75000000000
+2,2045,R1,solarPV,2020,6.75000000000
+2,2049,R1,solarPV,2020,6.75000000000
+3,2040,R1,solarPV,2025,2.40000000000
+3,2045,R1,solarPV,2025,2.40000000000
+3,2049,R1,solarPV,2025,2.40000000000
+3,2050,R1,solarPV,2025,2.40000000000
+3,2054,R1,solarPV,2025,2.40000000000
+4,2040,R1,solarPV,2030,6.00000000000
+4,2045,R1,solarPV,2030,6.00000000000
+4,2049,R1,solarPV,2030,6.00000000000
+4,2050,R1,solarPV,2030,6.00000000000
+4,2054,R1,solarPV,2030,6.00000000000
+4,2055,R1,solarPV,2030,6.00000000000
+4,2059,R1,solarPV,2030,6.00000000000
+5,2040,R1,solarPV,2035,9.19000000000
+5,2045,R1,solarPV,2035,9.19000000000
+5,2049,R1,solarPV,2035,9.19000000000
+5,2050,R1,solarPV,2035,9.19000000000
+5,2054,R1,solarPV,2035,9.19000000000
+5,2055,R1,solarPV,2035,9.19000000000
+5,2059,R1,solarPV,2035,9.19000000000
+5,2060,R1,solarPV,2035,9.19000000000
+5,2064,R1,solarPV,2035,9.19000000000
+6,2045,R1,solarPV,2040,6.00000000000
+6,2049,R1,solarPV,2040,6.00000000000
+6,2050,R1,solarPV,2040,6.00000000000
+6,2054,R1,solarPV,2040,6.00000000000
+6,2055,R1,solarPV,2040,6.00000000000
+6,2059,R1,solarPV,2040,6.00000000000
+6,2060,R1,solarPV,2040,6.00000000000
+6,2064,R1,solarPV,2040,6.00000000000
+6,2065,R1,solarPV,2040,6.00000000000
+6,2069,R1,solarPV,2040,6.00000000000
+7,2040,R1,windturbine,2020,10.00000000000
+7,2045,R1,windturbine,2020,10.00000000000
+7,2049,R1,windturbine,2020,10.00000000000
+9,2040,R2,gasCCGT,2025,3.00000000000
+9,2045,R2,gasCCGT,2025,3.00000000000
+9,2049,R2,gasCCGT,2025,3.00000000000
+9,2050,R2,gasCCGT,2025,3.00000000000
+9,2054,R2,gasCCGT,2025,3.00000000000
+9,2055,R2,gasCCGT,2025,3.00000000000
+9,2059,R2,gasCCGT,2025,3.00000000000
+9,2060,R2,gasCCGT,2025,3.00000000000
+9,2064,R2,gasCCGT,2025,3.00000000000
+10,2040,R2,solarPV,2025,2.40000000000
+10,2045,R2,solarPV,2025,2.40000000000
+10,2049,R2,solarPV,2025,2.40000000000
+10,2050,R2,solarPV,2025,2.40000000000
+10,2054,R2,solarPV,2025,2.40000000000
+11,2040,R2,solarPV,2030,2.40000000000
+11,2045,R2,solarPV,2030,2.40000000000
+11,2049,R2,solarPV,2030,2.40000000000
+11,2050,R2,solarPV,2030,2.40000000000
+11,2054,R2,solarPV,2030,2.40000000000
+11,2055,R2,solarPV,2030,2.40000000000
+11,2059,R2,solarPV,2030,2.40000000000
+12,2040,R2,solarPV,2035,4.80000000000
+12,2045,R2,solarPV,2035,4.80000000000
+12,2049,R2,solarPV,2035,4.80000000000
+12,2050,R2,solarPV,2035,4.80000000000
+12,2054,R2,solarPV,2035,4.80000000000
+12,2055,R2,solarPV,2035,4.80000000000
+12,2059,R2,solarPV,2035,4.80000000000
+12,2060,R2,solarPV,2035,4.80000000000
+12,2064,R2,solarPV,2035,4.80000000000
+13,2045,R2,solarPV,2040,6.00000000000
+13,2049,R2,solarPV,2040,6.00000000000
+13,2050,R2,solarPV,2040,6.00000000000
+13,2054,R2,solarPV,2040,6.00000000000
+13,2055,R2,solarPV,2040,6.00000000000
+13,2059,R2,solarPV,2040,6.00000000000
+13,2060,R2,solarPV,2040,6.00000000000
+13,2064,R2,solarPV,2040,6.00000000000
+13,2065,R2,solarPV,2040,6.00000000000
+13,2069,R2,solarPV,2040,6.00000000000
+14,2040,R2,windturbine,2020,16.75000000000
+14,2045,R2,windturbine,2020,16.75000000000
+14,2049,R2,windturbine,2020,16.75000000000
+15,2040,R2,windturbine,2030,3.60000000000
+15,2045,R2,windturbine,2030,3.60000000000
+15,2049,R2,windturbine,2030,3.60000000000
+15,2050,R2,windturbine,2030,3.60000000000
+15,2054,R2,windturbine,2030,3.60000000000
+15,2055,R2,windturbine,2030,3.60000000000
+15,2059,R2,windturbine,2030,3.60000000000
+16,2040,R2,windturbine,2035,4.39000000000
+16,2045,R2,windturbine,2035,4.39000000000
+16,2049,R2,windturbine,2035,4.39000000000
+16,2050,R2,windturbine,2035,4.39000000000
+16,2054,R2,windturbine,2035,4.39000000000
+16,2055,R2,windturbine,2035,4.39000000000
+16,2059,R2,windturbine,2035,4.39000000000
+16,2060,R2,windturbine,2035,4.39000000000
+16,2064,R2,windturbine,2035,4.39000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2045.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2045.csv
index b04feb4a8..5b7e02f40 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2045.csv
@@ -27,82 +27,84 @@ asset,year,technology,region,installed,capacity
 4,2054,solarPV,R1,2030,6.00000000000
 4,2055,solarPV,R1,2030,6.00000000000
 4,2059,solarPV,R1,2030,6.00000000000
-5,2045,solarPV,R1,2035,10.00000000000
-5,2049,solarPV,R1,2035,10.00000000000
-5,2050,solarPV,R1,2035,10.00000000000
-5,2054,solarPV,R1,2035,10.00000000000
-5,2055,solarPV,R1,2035,10.00000000000
-5,2059,solarPV,R1,2035,10.00000000000
-5,2060,solarPV,R1,2035,10.00000000000
-5,2064,solarPV,R1,2035,10.00000000000
-6,2050,solarPV,R1,2045,16.91000000000
-6,2054,solarPV,R1,2045,16.91000000000
-6,2055,solarPV,R1,2045,16.91000000000
-6,2059,solarPV,R1,2045,16.91000000000
-6,2060,solarPV,R1,2045,16.91000000000
-6,2064,solarPV,R1,2045,16.91000000000
-6,2065,solarPV,R1,2045,16.91000000000
-6,2069,solarPV,R1,2045,16.91000000000
-6,2070,solarPV,R1,2045,16.91000000000
-6,2074,solarPV,R1,2045,16.91000000000
-7,2045,solarPV,R2,2025,2.40000000000
-7,2049,solarPV,R2,2025,2.40000000000
-7,2050,solarPV,R2,2025,2.40000000000
-7,2054,solarPV,R2,2025,2.40000000000
-8,2045,solarPV,R2,2030,2.40000000000
-8,2049,solarPV,R2,2030,2.40000000000
-8,2050,solarPV,R2,2030,2.40000000000
-8,2054,solarPV,R2,2030,2.40000000000
-8,2055,solarPV,R2,2030,2.40000000000
-8,2059,solarPV,R2,2030,2.40000000000
-9,2045,solarPV,R2,2035,4.80000000000
-9,2049,solarPV,R2,2035,4.80000000000
-9,2050,solarPV,R2,2035,4.80000000000
-9,2054,solarPV,R2,2035,4.80000000000
-9,2055,solarPV,R2,2035,4.80000000000
-9,2059,solarPV,R2,2035,4.80000000000
-9,2060,solarPV,R2,2035,4.80000000000
-9,2064,solarPV,R2,2035,4.80000000000
-10,2045,solarPV,R2,2040,6.00000000000
-10,2049,solarPV,R2,2040,6.00000000000
-10,2050,solarPV,R2,2040,6.00000000000
-10,2054,solarPV,R2,2040,6.00000000000
-10,2055,solarPV,R2,2040,6.00000000000
-10,2059,solarPV,R2,2040,6.00000000000
-10,2060,solarPV,R2,2040,6.00000000000
-10,2064,solarPV,R2,2040,6.00000000000
-10,2065,solarPV,R2,2040,6.00000000000
-10,2069,solarPV,R2,2040,6.00000000000
-11,2050,solarPV,R2,2045,16.91000000000
-11,2054,solarPV,R2,2045,16.91000000000
-11,2055,solarPV,R2,2045,16.91000000000
-11,2059,solarPV,R2,2045,16.91000000000
-11,2060,solarPV,R2,2045,16.91000000000
-11,2064,solarPV,R2,2045,16.91000000000
-11,2065,solarPV,R2,2045,16.91000000000
-11,2069,solarPV,R2,2045,16.91000000000
-11,2070,solarPV,R2,2045,16.91000000000
-11,2074,solarPV,R2,2045,16.91000000000
-12,2045,windturbine,R1,2020,10.00000000000
-12,2049,windturbine,R1,2020,10.00000000000
-13,2045,windturbine,R1,2035,8.38000000000
-13,2049,windturbine,R1,2035,8.38000000000
-13,2050,windturbine,R1,2035,8.38000000000
-13,2054,windturbine,R1,2035,8.38000000000
-13,2055,windturbine,R1,2035,8.38000000000
-13,2059,windturbine,R1,2035,8.38000000000
-13,2060,windturbine,R1,2035,8.38000000000
-13,2064,windturbine,R1,2035,8.38000000000
-14,2050,windturbine,R1,2045,3.56000000000
-14,2054,windturbine,R1,2045,3.56000000000
-14,2055,windturbine,R1,2045,3.56000000000
-14,2059,windturbine,R1,2045,3.56000000000
-14,2060,windturbine,R1,2045,3.56000000000
-14,2064,windturbine,R1,2045,3.56000000000
-14,2065,windturbine,R1,2045,3.56000000000
-14,2069,windturbine,R1,2045,3.56000000000
-14,2070,windturbine,R1,2045,3.56000000000
-14,2074,windturbine,R1,2045,3.56000000000
+5,2045,solarPV,R1,2035,9.19000000000
+5,2049,solarPV,R1,2035,9.19000000000
+5,2050,solarPV,R1,2035,9.19000000000
+5,2054,solarPV,R1,2035,9.19000000000
+5,2055,solarPV,R1,2035,9.19000000000
+5,2059,solarPV,R1,2035,9.19000000000
+5,2060,solarPV,R1,2035,9.19000000000
+5,2064,solarPV,R1,2035,9.19000000000
+6,2045,solarPV,R1,2040,6.00000000000
+6,2049,solarPV,R1,2040,6.00000000000
+6,2050,solarPV,R1,2040,6.00000000000
+6,2054,solarPV,R1,2040,6.00000000000
+6,2055,solarPV,R1,2040,6.00000000000
+6,2059,solarPV,R1,2040,6.00000000000
+6,2060,solarPV,R1,2040,6.00000000000
+6,2064,solarPV,R1,2040,6.00000000000
+6,2065,solarPV,R1,2040,6.00000000000
+6,2069,solarPV,R1,2040,6.00000000000
+7,2050,solarPV,R1,2045,16.91000000000
+7,2054,solarPV,R1,2045,16.91000000000
+7,2055,solarPV,R1,2045,16.91000000000
+7,2059,solarPV,R1,2045,16.91000000000
+7,2060,solarPV,R1,2045,16.91000000000
+7,2064,solarPV,R1,2045,16.91000000000
+7,2065,solarPV,R1,2045,16.91000000000
+7,2069,solarPV,R1,2045,16.91000000000
+7,2070,solarPV,R1,2045,16.91000000000
+7,2074,solarPV,R1,2045,16.91000000000
+8,2045,solarPV,R2,2025,2.40000000000
+8,2049,solarPV,R2,2025,2.40000000000
+8,2050,solarPV,R2,2025,2.40000000000
+8,2054,solarPV,R2,2025,2.40000000000
+9,2045,solarPV,R2,2030,2.40000000000
+9,2049,solarPV,R2,2030,2.40000000000
+9,2050,solarPV,R2,2030,2.40000000000
+9,2054,solarPV,R2,2030,2.40000000000
+9,2055,solarPV,R2,2030,2.40000000000
+9,2059,solarPV,R2,2030,2.40000000000
+10,2045,solarPV,R2,2035,4.80000000000
+10,2049,solarPV,R2,2035,4.80000000000
+10,2050,solarPV,R2,2035,4.80000000000
+10,2054,solarPV,R2,2035,4.80000000000
+10,2055,solarPV,R2,2035,4.80000000000
+10,2059,solarPV,R2,2035,4.80000000000
+10,2060,solarPV,R2,2035,4.80000000000
+10,2064,solarPV,R2,2035,4.80000000000
+11,2045,solarPV,R2,2040,6.00000000000
+11,2049,solarPV,R2,2040,6.00000000000
+11,2050,solarPV,R2,2040,6.00000000000
+11,2054,solarPV,R2,2040,6.00000000000
+11,2055,solarPV,R2,2040,6.00000000000
+11,2059,solarPV,R2,2040,6.00000000000
+11,2060,solarPV,R2,2040,6.00000000000
+11,2064,solarPV,R2,2040,6.00000000000
+11,2065,solarPV,R2,2040,6.00000000000
+11,2069,solarPV,R2,2040,6.00000000000
+12,2050,solarPV,R2,2045,16.91000000000
+12,2054,solarPV,R2,2045,16.91000000000
+12,2055,solarPV,R2,2045,16.91000000000
+12,2059,solarPV,R2,2045,16.91000000000
+12,2060,solarPV,R2,2045,16.91000000000
+12,2064,solarPV,R2,2045,16.91000000000
+12,2065,solarPV,R2,2045,16.91000000000
+12,2069,solarPV,R2,2045,16.91000000000
+12,2070,solarPV,R2,2045,16.91000000000
+12,2074,solarPV,R2,2045,16.91000000000
+13,2045,windturbine,R1,2020,10.00000000000
+13,2049,windturbine,R1,2020,10.00000000000
+14,2050,windturbine,R1,2045,6.75000000000
+14,2054,windturbine,R1,2045,6.75000000000
+14,2055,windturbine,R1,2045,6.75000000000
+14,2059,windturbine,R1,2045,6.75000000000
+14,2060,windturbine,R1,2045,6.75000000000
+14,2064,windturbine,R1,2045,6.75000000000
+14,2065,windturbine,R1,2045,6.75000000000
+14,2069,windturbine,R1,2045,6.75000000000
+14,2070,windturbine,R1,2045,6.75000000000
+14,2074,windturbine,R1,2045,6.75000000000
 15,2045,windturbine,R2,2020,16.75000000000
 15,2049,windturbine,R2,2020,16.75000000000
 16,2045,windturbine,R2,2030,3.60000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2050.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2050.csv
index 37b2c93ac..d7a9a1ee9 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Power/Capacity/2050.csv
@@ -1,121 +1,123 @@
-asset,year,region,installed,technology,capacity
-2,2050,R1,2025,gasCCGT,3.00000000000
-2,2054,R1,2025,gasCCGT,3.00000000000
-2,2055,R1,2025,gasCCGT,3.00000000000
-2,2059,R1,2025,gasCCGT,3.00000000000
-2,2060,R1,2025,gasCCGT,3.00000000000
-2,2064,R1,2025,gasCCGT,3.00000000000
-3,2050,R1,2025,solarPV,2.40000000000
-3,2054,R1,2025,solarPV,2.40000000000
-4,2050,R1,2030,solarPV,6.00000000000
-4,2054,R1,2030,solarPV,6.00000000000
-4,2055,R1,2030,solarPV,6.00000000000
-4,2059,R1,2030,solarPV,6.00000000000
-5,2050,R1,2035,solarPV,10.00000000000
-5,2054,R1,2035,solarPV,10.00000000000
-5,2055,R1,2035,solarPV,10.00000000000
-5,2059,R1,2035,solarPV,10.00000000000
-5,2060,R1,2035,solarPV,10.00000000000
-5,2064,R1,2035,solarPV,10.00000000000
-6,2050,R1,2035,windturbine,8.38000000000
-6,2054,R1,2035,windturbine,8.38000000000
-6,2055,R1,2035,windturbine,8.38000000000
-6,2059,R1,2035,windturbine,8.38000000000
-6,2060,R1,2035,windturbine,8.38000000000
-6,2064,R1,2035,windturbine,8.38000000000
-7,2050,R1,2045,solarPV,16.91000000000
-7,2054,R1,2045,solarPV,16.91000000000
-7,2055,R1,2045,solarPV,16.91000000000
-7,2059,R1,2045,solarPV,16.91000000000
-7,2060,R1,2045,solarPV,16.91000000000
-7,2064,R1,2045,solarPV,16.91000000000
-7,2065,R1,2045,solarPV,16.91000000000
-7,2069,R1,2045,solarPV,16.91000000000
-7,2070,R1,2045,solarPV,16.91000000000
-7,2074,R1,2045,solarPV,16.91000000000
-8,2050,R1,2045,windturbine,3.56000000000
-8,2054,R1,2045,windturbine,3.56000000000
-8,2055,R1,2045,windturbine,3.56000000000
-8,2059,R1,2045,windturbine,3.56000000000
-8,2060,R1,2045,windturbine,3.56000000000
-8,2064,R1,2045,windturbine,3.56000000000
-8,2065,R1,2045,windturbine,3.56000000000
-8,2069,R1,2045,windturbine,3.56000000000
-8,2070,R1,2045,windturbine,3.56000000000
-8,2074,R1,2045,windturbine,3.56000000000
-9,2055,R1,2050,solarPV,2.40000000000
-9,2059,R1,2050,solarPV,2.40000000000
-9,2060,R1,2050,solarPV,2.40000000000
-9,2064,R1,2050,solarPV,2.40000000000
-9,2065,R1,2050,solarPV,2.40000000000
-9,2069,R1,2050,solarPV,2.40000000000
-9,2070,R1,2050,solarPV,2.40000000000
-9,2074,R1,2050,solarPV,2.40000000000
-9,2075,R1,2050,solarPV,2.40000000000
-9,2079,R1,2050,solarPV,2.40000000000
-11,2050,R2,2025,gasCCGT,3.00000000000
-11,2054,R2,2025,gasCCGT,3.00000000000
-11,2055,R2,2025,gasCCGT,3.00000000000
-11,2059,R2,2025,gasCCGT,3.00000000000
-11,2060,R2,2025,gasCCGT,3.00000000000
-11,2064,R2,2025,gasCCGT,3.00000000000
-12,2050,R2,2025,solarPV,2.40000000000
-12,2054,R2,2025,solarPV,2.40000000000
-13,2050,R2,2030,solarPV,2.40000000000
-13,2054,R2,2030,solarPV,2.40000000000
-13,2055,R2,2030,solarPV,2.40000000000
-13,2059,R2,2030,solarPV,2.40000000000
-14,2050,R2,2030,windturbine,3.60000000000
-14,2054,R2,2030,windturbine,3.60000000000
-14,2055,R2,2030,windturbine,3.60000000000
-14,2059,R2,2030,windturbine,3.60000000000
-15,2050,R2,2035,solarPV,4.80000000000
-15,2054,R2,2035,solarPV,4.80000000000
-15,2055,R2,2035,solarPV,4.80000000000
-15,2059,R2,2035,solarPV,4.80000000000
-15,2060,R2,2035,solarPV,4.80000000000
-15,2064,R2,2035,solarPV,4.80000000000
-16,2050,R2,2035,windturbine,4.39000000000
-16,2054,R2,2035,windturbine,4.39000000000
-16,2055,R2,2035,windturbine,4.39000000000
-16,2059,R2,2035,windturbine,4.39000000000
-16,2060,R2,2035,windturbine,4.39000000000
-16,2064,R2,2035,windturbine,4.39000000000
-17,2050,R2,2040,solarPV,6.00000000000
-17,2054,R2,2040,solarPV,6.00000000000
-17,2055,R2,2040,solarPV,6.00000000000
-17,2059,R2,2040,solarPV,6.00000000000
-17,2060,R2,2040,solarPV,6.00000000000
-17,2064,R2,2040,solarPV,6.00000000000
-17,2065,R2,2040,solarPV,6.00000000000
-17,2069,R2,2040,solarPV,6.00000000000
-18,2050,R2,2045,solarPV,16.91000000000
-18,2054,R2,2045,solarPV,16.91000000000
-18,2055,R2,2045,solarPV,16.91000000000
-18,2059,R2,2045,solarPV,16.91000000000
-18,2060,R2,2045,solarPV,16.91000000000
-18,2064,R2,2045,solarPV,16.91000000000
-18,2065,R2,2045,solarPV,16.91000000000
-18,2069,R2,2045,solarPV,16.91000000000
-18,2070,R2,2045,solarPV,16.91000000000
-18,2074,R2,2045,solarPV,16.91000000000
-19,2050,R2,2045,windturbine,6.75000000000
-19,2054,R2,2045,windturbine,6.75000000000
-19,2055,R2,2045,windturbine,6.75000000000
-19,2059,R2,2045,windturbine,6.75000000000
-19,2060,R2,2045,windturbine,6.75000000000
-19,2064,R2,2045,windturbine,6.75000000000
-19,2065,R2,2045,windturbine,6.75000000000
-19,2069,R2,2045,windturbine,6.75000000000
-19,2070,R2,2045,windturbine,6.75000000000
-19,2074,R2,2045,windturbine,6.75000000000
-20,2055,R2,2050,solarPV,2.40000000000
-20,2059,R2,2050,solarPV,2.40000000000
-20,2060,R2,2050,solarPV,2.40000000000
-20,2064,R2,2050,solarPV,2.40000000000
-20,2065,R2,2050,solarPV,2.40000000000
-20,2069,R2,2050,solarPV,2.40000000000
-20,2070,R2,2050,solarPV,2.40000000000
-20,2074,R2,2050,solarPV,2.40000000000
-20,2075,R2,2050,solarPV,2.40000000000
-20,2079,R2,2050,solarPV,2.40000000000
+asset,year,region,technology,installed,capacity
+0,2050,R1,gasCCGT,2025,3.00000000000
+0,2054,R1,gasCCGT,2025,3.00000000000
+0,2055,R1,gasCCGT,2025,3.00000000000
+0,2059,R1,gasCCGT,2025,3.00000000000
+0,2060,R1,gasCCGT,2025,3.00000000000
+0,2064,R1,gasCCGT,2025,3.00000000000
+2,2050,R1,solarPV,2025,2.40000000000
+2,2054,R1,solarPV,2025,2.40000000000
+3,2050,R1,solarPV,2030,6.00000000000
+3,2054,R1,solarPV,2030,6.00000000000
+3,2055,R1,solarPV,2030,6.00000000000
+3,2059,R1,solarPV,2030,6.00000000000
+4,2050,R1,solarPV,2035,9.19000000000
+4,2054,R1,solarPV,2035,9.19000000000
+4,2055,R1,solarPV,2035,9.19000000000
+4,2059,R1,solarPV,2035,9.19000000000
+4,2060,R1,solarPV,2035,9.19000000000
+4,2064,R1,solarPV,2035,9.19000000000
+5,2050,R1,solarPV,2040,6.00000000000
+5,2054,R1,solarPV,2040,6.00000000000
+5,2055,R1,solarPV,2040,6.00000000000
+5,2059,R1,solarPV,2040,6.00000000000
+5,2060,R1,solarPV,2040,6.00000000000
+5,2064,R1,solarPV,2040,6.00000000000
+5,2065,R1,solarPV,2040,6.00000000000
+5,2069,R1,solarPV,2040,6.00000000000
+6,2050,R1,solarPV,2045,16.91000000000
+6,2054,R1,solarPV,2045,16.91000000000
+6,2055,R1,solarPV,2045,16.91000000000
+6,2059,R1,solarPV,2045,16.91000000000
+6,2060,R1,solarPV,2045,16.91000000000
+6,2064,R1,solarPV,2045,16.91000000000
+6,2065,R1,solarPV,2045,16.91000000000
+6,2069,R1,solarPV,2045,16.91000000000
+6,2070,R1,solarPV,2045,16.91000000000
+6,2074,R1,solarPV,2045,16.91000000000
+7,2055,R1,solarPV,2050,2.40000000000
+7,2059,R1,solarPV,2050,2.40000000000
+7,2060,R1,solarPV,2050,2.40000000000
+7,2064,R1,solarPV,2050,2.40000000000
+7,2065,R1,solarPV,2050,2.40000000000
+7,2069,R1,solarPV,2050,2.40000000000
+7,2070,R1,solarPV,2050,2.40000000000
+7,2074,R1,solarPV,2050,2.40000000000
+7,2075,R1,solarPV,2050,2.40000000000
+7,2079,R1,solarPV,2050,2.40000000000
+9,2050,R1,windturbine,2045,6.75000000000
+9,2054,R1,windturbine,2045,6.75000000000
+9,2055,R1,windturbine,2045,6.75000000000
+9,2059,R1,windturbine,2045,6.75000000000
+9,2060,R1,windturbine,2045,6.75000000000
+9,2064,R1,windturbine,2045,6.75000000000
+9,2065,R1,windturbine,2045,6.75000000000
+9,2069,R1,windturbine,2045,6.75000000000
+9,2070,R1,windturbine,2045,6.75000000000
+9,2074,R1,windturbine,2045,6.75000000000
+10,2050,R2,gasCCGT,2025,3.00000000000
+10,2054,R2,gasCCGT,2025,3.00000000000
+10,2055,R2,gasCCGT,2025,3.00000000000
+10,2059,R2,gasCCGT,2025,3.00000000000
+10,2060,R2,gasCCGT,2025,3.00000000000
+10,2064,R2,gasCCGT,2025,3.00000000000
+11,2050,R2,solarPV,2025,2.40000000000
+11,2054,R2,solarPV,2025,2.40000000000
+12,2050,R2,solarPV,2030,2.40000000000
+12,2054,R2,solarPV,2030,2.40000000000
+12,2055,R2,solarPV,2030,2.40000000000
+12,2059,R2,solarPV,2030,2.40000000000
+13,2050,R2,solarPV,2035,4.80000000000
+13,2054,R2,solarPV,2035,4.80000000000
+13,2055,R2,solarPV,2035,4.80000000000
+13,2059,R2,solarPV,2035,4.80000000000
+13,2060,R2,solarPV,2035,4.80000000000
+13,2064,R2,solarPV,2035,4.80000000000
+14,2050,R2,solarPV,2040,6.00000000000
+14,2054,R2,solarPV,2040,6.00000000000
+14,2055,R2,solarPV,2040,6.00000000000
+14,2059,R2,solarPV,2040,6.00000000000
+14,2060,R2,solarPV,2040,6.00000000000
+14,2064,R2,solarPV,2040,6.00000000000
+14,2065,R2,solarPV,2040,6.00000000000
+14,2069,R2,solarPV,2040,6.00000000000
+15,2050,R2,solarPV,2045,16.91000000000
+15,2054,R2,solarPV,2045,16.91000000000
+15,2055,R2,solarPV,2045,16.91000000000
+15,2059,R2,solarPV,2045,16.91000000000
+15,2060,R2,solarPV,2045,16.91000000000
+15,2064,R2,solarPV,2045,16.91000000000
+15,2065,R2,solarPV,2045,16.91000000000
+15,2069,R2,solarPV,2045,16.91000000000
+15,2070,R2,solarPV,2045,16.91000000000
+15,2074,R2,solarPV,2045,16.91000000000
+16,2055,R2,solarPV,2050,2.40000000000
+16,2059,R2,solarPV,2050,2.40000000000
+16,2060,R2,solarPV,2050,2.40000000000
+16,2064,R2,solarPV,2050,2.40000000000
+16,2065,R2,solarPV,2050,2.40000000000
+16,2069,R2,solarPV,2050,2.40000000000
+16,2070,R2,solarPV,2050,2.40000000000
+16,2074,R2,solarPV,2050,2.40000000000
+16,2075,R2,solarPV,2050,2.40000000000
+16,2079,R2,solarPV,2050,2.40000000000
+18,2050,R2,windturbine,2030,3.60000000000
+18,2054,R2,windturbine,2030,3.60000000000
+18,2055,R2,windturbine,2030,3.60000000000
+18,2059,R2,windturbine,2030,3.60000000000
+19,2050,R2,windturbine,2035,4.39000000000
+19,2054,R2,windturbine,2035,4.39000000000
+19,2055,R2,windturbine,2035,4.39000000000
+19,2059,R2,windturbine,2035,4.39000000000
+19,2060,R2,windturbine,2035,4.39000000000
+19,2064,R2,windturbine,2035,4.39000000000
+20,2050,R2,windturbine,2045,6.75000000000
+20,2054,R2,windturbine,2045,6.75000000000
+20,2055,R2,windturbine,2045,6.75000000000
+20,2059,R2,windturbine,2045,6.75000000000
+20,2060,R2,windturbine,2045,6.75000000000
+20,2064,R2,windturbine,2045,6.75000000000
+20,2065,R2,windturbine,2045,6.75000000000
+20,2069,R2,windturbine,2045,6.75000000000
+20,2070,R2,windturbine,2045,6.75000000000
+20,2074,R2,windturbine,2045,6.75000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2050.csv
index eb21c4423..2910cd500 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2050.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Capacity/2050.csv
@@ -1,21 +1,21 @@
-asset,year,region,installed,technology,capacity
-2,2050,R1,2040,heatpump,31.00000000000
-2,2054,R1,2040,heatpump,31.00000000000
-3,2050,R1,2045,heatpump,23.00000000000
-3,2054,R1,2045,heatpump,23.00000000000
-3,2055,R1,2045,heatpump,23.00000000000
-3,2059,R1,2045,heatpump,23.00000000000
-4,2055,R1,2050,heatpump,31.00000000000
-4,2059,R1,2050,heatpump,31.00000000000
-4,2060,R1,2050,heatpump,31.00000000000
-4,2064,R1,2050,heatpump,31.00000000000
-7,2050,R2,2040,heatpump,31.00000000000
-7,2054,R2,2040,heatpump,31.00000000000
-8,2050,R2,2045,heatpump,23.00000000000
-8,2054,R2,2045,heatpump,23.00000000000
-8,2055,R2,2045,heatpump,23.00000000000
-8,2059,R2,2045,heatpump,23.00000000000
-9,2055,R2,2050,heatpump,31.00000000000
-9,2059,R2,2050,heatpump,31.00000000000
-9,2060,R2,2050,heatpump,31.00000000000
-9,2064,R2,2050,heatpump,31.00000000000
+asset,year,region,technology,installed,capacity
+2,2050,R1,heatpump,2040,31.00000000000
+2,2054,R1,heatpump,2040,31.00000000000
+3,2050,R1,heatpump,2045,23.00000000000
+3,2054,R1,heatpump,2045,23.00000000000
+3,2055,R1,heatpump,2045,23.00000000000
+3,2059,R1,heatpump,2045,23.00000000000
+4,2055,R1,heatpump,2050,31.00000000000
+4,2059,R1,heatpump,2050,31.00000000000
+4,2060,R1,heatpump,2050,31.00000000000
+4,2064,R1,heatpump,2050,31.00000000000
+7,2050,R2,heatpump,2040,31.00000000000
+7,2054,R2,heatpump,2040,31.00000000000
+8,2050,R2,heatpump,2045,23.00000000000
+8,2054,R2,heatpump,2045,23.00000000000
+8,2055,R2,heatpump,2045,23.00000000000
+8,2059,R2,heatpump,2045,23.00000000000
+9,2055,R2,heatpump,2050,31.00000000000
+9,2059,R2,heatpump,2050,31.00000000000
+9,2060,R2,heatpump,2050,31.00000000000
+9,2064,R2,heatpump,2050,31.00000000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2020.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2020.csv
index 8e6f8adff..84bd25f2d 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2020.csv
@@ -1,121 +1,121 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2020,0,gasboiler,2020,all-year,all-week,night,0.50000000000
-0,heat,R1,2020,1,gasboiler,2020,all-year,all-week,night,0.50000000000
-0,heat,R1,2025,0,gasboiler,2020,all-year,all-week,night,0.13890000000
-0,heat,R1,2025,1,gasboiler,2020,all-year,all-week,night,0.13890000000
-0,heat,R1,2025,2,heatpump,2020,all-year,all-week,night,0.52780000000
-0,heat,R1,2025,3,heatpump,2020,all-year,all-week,night,0.52780000000
-0,heat,R2,2020,0,gasboiler,2020,all-year,all-week,night,0.50000000000
-0,heat,R2,2020,1,gasboiler,2020,all-year,all-week,night,0.50000000000
-0,heat,R2,2025,0,gasboiler,2020,all-year,all-week,night,0.13890000000
-0,heat,R2,2025,1,gasboiler,2020,all-year,all-week,night,0.13890000000
-0,heat,R2,2025,2,heatpump,2020,all-year,all-week,night,0.52780000000
-0,heat,R2,2025,3,heatpump,2020,all-year,all-week,night,0.52780000000
-0,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,night,32.35500000000
-0,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,night,32.35500000000
-0,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,night,8.98750000000
-0,CO2f,R1,2025,1,gasboiler,2020,all-year,all-week,night,8.98750000000
-0,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,night,32.35500000000
-0,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,night,32.35500000000
-0,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,night,8.98750000000
-0,CO2f,R2,2025,1,gasboiler,2020,all-year,all-week,night,8.98750000000
-1,heat,R1,2020,0,gasboiler,2020,all-year,all-week,morning,0.75000000000
-1,heat,R1,2020,1,gasboiler,2020,all-year,all-week,morning,0.75000000000
-1,heat,R1,2025,0,gasboiler,2020,all-year,all-week,morning,0.20830000000
-1,heat,R1,2025,1,gasboiler,2020,all-year,all-week,morning,0.20830000000
-1,heat,R1,2025,2,heatpump,2020,all-year,all-week,morning,0.79170000000
-1,heat,R1,2025,3,heatpump,2020,all-year,all-week,morning,0.79170000000
-1,heat,R2,2020,0,gasboiler,2020,all-year,all-week,morning,0.75000000000
-1,heat,R2,2020,1,gasboiler,2020,all-year,all-week,morning,0.75000000000
-1,heat,R2,2025,0,gasboiler,2020,all-year,all-week,morning,0.20830000000
-1,heat,R2,2025,1,gasboiler,2020,all-year,all-week,morning,0.20830000000
-1,heat,R2,2025,2,heatpump,2020,all-year,all-week,morning,0.79170000000
-1,heat,R2,2025,3,heatpump,2020,all-year,all-week,morning,0.79170000000
-1,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,morning,48.53250000000
-1,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,morning,48.53250000000
-1,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,morning,13.48120000000
-1,CO2f,R1,2025,1,gasboiler,2020,all-year,all-week,morning,13.48120000000
-1,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,morning,48.53250000000
-1,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,morning,48.53250000000
-1,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,morning,13.48120000000
-1,CO2f,R2,2025,1,gasboiler,2020,all-year,all-week,morning,13.48120000000
-2,heat,R1,2020,0,gasboiler,2020,all-year,all-week,afternoon,0.50000000000
-2,heat,R1,2020,1,gasboiler,2020,all-year,all-week,afternoon,0.50000000000
-2,heat,R1,2025,0,gasboiler,2020,all-year,all-week,afternoon,0.13890000000
-2,heat,R1,2025,1,gasboiler,2020,all-year,all-week,afternoon,0.13890000000
-2,heat,R1,2025,2,heatpump,2020,all-year,all-week,afternoon,0.52780000000
-2,heat,R1,2025,3,heatpump,2020,all-year,all-week,afternoon,0.52780000000
-2,heat,R2,2020,0,gasboiler,2020,all-year,all-week,afternoon,0.50000000000
-2,heat,R2,2020,1,gasboiler,2020,all-year,all-week,afternoon,0.50000000000
-2,heat,R2,2025,0,gasboiler,2020,all-year,all-week,afternoon,0.13890000000
-2,heat,R2,2025,1,gasboiler,2020,all-year,all-week,afternoon,0.13890000000
-2,heat,R2,2025,2,heatpump,2020,all-year,all-week,afternoon,0.52780000000
-2,heat,R2,2025,3,heatpump,2020,all-year,all-week,afternoon,0.52780000000
-2,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,afternoon,32.35500000000
-2,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,afternoon,32.35500000000
-2,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,afternoon,8.98750000000
-2,CO2f,R1,2025,1,gasboiler,2020,all-year,all-week,afternoon,8.98750000000
-2,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,afternoon,32.35500000000
-2,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,afternoon,32.35500000000
-2,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,afternoon,8.98750000000
-2,CO2f,R2,2025,1,gasboiler,2020,all-year,all-week,afternoon,8.98750000000
-3,heat,R1,2020,0,gasboiler,2020,all-year,all-week,early-peak,0.75000000000
-3,heat,R1,2020,1,gasboiler,2020,all-year,all-week,early-peak,0.75000000000
-3,heat,R1,2025,0,gasboiler,2020,all-year,all-week,early-peak,0.20830000000
-3,heat,R1,2025,1,gasboiler,2020,all-year,all-week,early-peak,0.20830000000
-3,heat,R1,2025,2,heatpump,2020,all-year,all-week,early-peak,0.79170000000
-3,heat,R1,2025,3,heatpump,2020,all-year,all-week,early-peak,0.79170000000
-3,heat,R2,2020,0,gasboiler,2020,all-year,all-week,early-peak,0.75000000000
-3,heat,R2,2020,1,gasboiler,2020,all-year,all-week,early-peak,0.75000000000
-3,heat,R2,2025,0,gasboiler,2020,all-year,all-week,early-peak,0.20830000000
-3,heat,R2,2025,1,gasboiler,2020,all-year,all-week,early-peak,0.20830000000
-3,heat,R2,2025,2,heatpump,2020,all-year,all-week,early-peak,0.79170000000
-3,heat,R2,2025,3,heatpump,2020,all-year,all-week,early-peak,0.79170000000
-3,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,early-peak,48.53250000000
-3,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,early-peak,48.53250000000
-3,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,early-peak,13.48120000000
-3,CO2f,R1,2025,1,gasboiler,2020,all-year,all-week,early-peak,13.48120000000
-3,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,early-peak,48.53250000000
-3,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,early-peak,48.53250000000
-3,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,early-peak,13.48120000000
-3,CO2f,R2,2025,1,gasboiler,2020,all-year,all-week,early-peak,13.48120000000
-4,heat,R1,2020,0,gasboiler,2020,all-year,all-week,late-peak,1.50000000000
-4,heat,R1,2020,1,gasboiler,2020,all-year,all-week,late-peak,1.50000000000
-4,heat,R1,2025,0,gasboiler,2020,all-year,all-week,late-peak,0.41670000000
-4,heat,R1,2025,1,gasboiler,2020,all-year,all-week,late-peak,0.41670000000
-4,heat,R1,2025,2,heatpump,2020,all-year,all-week,late-peak,1.58330000000
-4,heat,R1,2025,3,heatpump,2020,all-year,all-week,late-peak,1.58330000000
-4,heat,R2,2020,0,gasboiler,2020,all-year,all-week,late-peak,1.50000000000
-4,heat,R2,2020,1,gasboiler,2020,all-year,all-week,late-peak,1.50000000000
-4,heat,R2,2025,0,gasboiler,2020,all-year,all-week,late-peak,0.41670000000
-4,heat,R2,2025,1,gasboiler,2020,all-year,all-week,late-peak,0.41670000000
-4,heat,R2,2025,2,heatpump,2020,all-year,all-week,late-peak,1.58330000000
-4,heat,R2,2025,3,heatpump,2020,all-year,all-week,late-peak,1.58330000000
-4,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,late-peak,97.06500000000
-4,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,late-peak,97.06500000000
-4,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,late-peak,26.96250000000
-4,CO2f,R1,2025,1,gasboiler,2020,all-year,all-week,late-peak,26.96250000000
-4,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,late-peak,97.06500000000
-4,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,late-peak,97.06500000000
-4,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,late-peak,26.96250000000
-4,CO2f,R2,2025,1,gasboiler,2020,all-year,all-week,late-peak,26.96250000000
-5,heat,R1,2020,0,gasboiler,2020,all-year,all-week,evening,1.00000000000
-5,heat,R1,2020,1,gasboiler,2020,all-year,all-week,evening,1.00000000000
-5,heat,R1,2025,0,gasboiler,2020,all-year,all-week,evening,0.27780000000
-5,heat,R1,2025,1,gasboiler,2020,all-year,all-week,evening,0.27780000000
-5,heat,R1,2025,2,heatpump,2020,all-year,all-week,evening,1.05560000000
-5,heat,R1,2025,3,heatpump,2020,all-year,all-week,evening,1.05560000000
-5,heat,R2,2020,0,gasboiler,2020,all-year,all-week,evening,1.00000000000
-5,heat,R2,2020,1,gasboiler,2020,all-year,all-week,evening,1.00000000000
-5,heat,R2,2025,0,gasboiler,2020,all-year,all-week,evening,0.27780000000
-5,heat,R2,2025,1,gasboiler,2020,all-year,all-week,evening,0.27780000000
-5,heat,R2,2025,2,heatpump,2020,all-year,all-week,evening,1.05560000000
-5,heat,R2,2025,3,heatpump,2020,all-year,all-week,evening,1.05560000000
-5,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,evening,64.71000000000
-5,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,evening,64.71000000000
-5,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,evening,17.97500000000
-5,CO2f,R1,2025,1,gasboiler,2020,all-year,all-week,evening,17.97500000000
-5,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,evening,64.71000000000
-5,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,evening,64.71000000000
-5,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,evening,17.97500000000
-5,CO2f,R2,2025,1,gasboiler,2020,all-year,all-week,evening,17.97500000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2020,0,all-year,all-week,night,gasboiler,2020,0.50000000000
+0,heat,R1,2020,1,all-year,all-week,night,gasboiler,2020,0.50000000000
+0,heat,R1,2025,0,all-year,all-week,night,gasboiler,2020,0.13890000000
+0,heat,R1,2025,1,all-year,all-week,night,gasboiler,2020,0.13890000000
+0,heat,R1,2025,2,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R1,2025,3,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R2,2020,0,all-year,all-week,night,gasboiler,2020,0.50000000000
+0,heat,R2,2020,1,all-year,all-week,night,gasboiler,2020,0.50000000000
+0,heat,R2,2025,0,all-year,all-week,night,gasboiler,2020,0.13890000000
+0,heat,R2,2025,1,all-year,all-week,night,gasboiler,2020,0.13890000000
+0,heat,R2,2025,2,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R2,2025,3,all-year,all-week,night,heatpump,2020,0.52780000000
+0,CO2f,R1,2020,0,all-year,all-week,night,gasboiler,2020,32.35500000000
+0,CO2f,R1,2020,1,all-year,all-week,night,gasboiler,2020,32.35500000000
+0,CO2f,R1,2025,0,all-year,all-week,night,gasboiler,2020,8.98750000000
+0,CO2f,R1,2025,1,all-year,all-week,night,gasboiler,2020,8.98750000000
+0,CO2f,R2,2020,0,all-year,all-week,night,gasboiler,2020,32.35500000000
+0,CO2f,R2,2020,1,all-year,all-week,night,gasboiler,2020,32.35500000000
+0,CO2f,R2,2025,0,all-year,all-week,night,gasboiler,2020,8.98750000000
+0,CO2f,R2,2025,1,all-year,all-week,night,gasboiler,2020,8.98750000000
+1,heat,R1,2020,0,all-year,all-week,morning,gasboiler,2020,0.75000000000
+1,heat,R1,2020,1,all-year,all-week,morning,gasboiler,2020,0.75000000000
+1,heat,R1,2025,0,all-year,all-week,morning,gasboiler,2020,0.20830000000
+1,heat,R1,2025,1,all-year,all-week,morning,gasboiler,2020,0.20830000000
+1,heat,R1,2025,2,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R1,2025,3,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R2,2020,0,all-year,all-week,morning,gasboiler,2020,0.75000000000
+1,heat,R2,2020,1,all-year,all-week,morning,gasboiler,2020,0.75000000000
+1,heat,R2,2025,0,all-year,all-week,morning,gasboiler,2020,0.20830000000
+1,heat,R2,2025,1,all-year,all-week,morning,gasboiler,2020,0.20830000000
+1,heat,R2,2025,2,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R2,2025,3,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,CO2f,R1,2020,0,all-year,all-week,morning,gasboiler,2020,48.53250000000
+1,CO2f,R1,2020,1,all-year,all-week,morning,gasboiler,2020,48.53250000000
+1,CO2f,R1,2025,0,all-year,all-week,morning,gasboiler,2020,13.48120000000
+1,CO2f,R1,2025,1,all-year,all-week,morning,gasboiler,2020,13.48120000000
+1,CO2f,R2,2020,0,all-year,all-week,morning,gasboiler,2020,48.53250000000
+1,CO2f,R2,2020,1,all-year,all-week,morning,gasboiler,2020,48.53250000000
+1,CO2f,R2,2025,0,all-year,all-week,morning,gasboiler,2020,13.48120000000
+1,CO2f,R2,2025,1,all-year,all-week,morning,gasboiler,2020,13.48120000000
+2,heat,R1,2020,0,all-year,all-week,afternoon,gasboiler,2020,0.50000000000
+2,heat,R1,2020,1,all-year,all-week,afternoon,gasboiler,2020,0.50000000000
+2,heat,R1,2025,0,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
+2,heat,R1,2025,1,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
+2,heat,R1,2025,2,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R1,2025,3,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R2,2020,0,all-year,all-week,afternoon,gasboiler,2020,0.50000000000
+2,heat,R2,2020,1,all-year,all-week,afternoon,gasboiler,2020,0.50000000000
+2,heat,R2,2025,0,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
+2,heat,R2,2025,1,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
+2,heat,R2,2025,2,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R2,2025,3,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,CO2f,R1,2020,0,all-year,all-week,afternoon,gasboiler,2020,32.35500000000
+2,CO2f,R1,2020,1,all-year,all-week,afternoon,gasboiler,2020,32.35500000000
+2,CO2f,R1,2025,0,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+2,CO2f,R1,2025,1,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+2,CO2f,R2,2020,0,all-year,all-week,afternoon,gasboiler,2020,32.35500000000
+2,CO2f,R2,2020,1,all-year,all-week,afternoon,gasboiler,2020,32.35500000000
+2,CO2f,R2,2025,0,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+2,CO2f,R2,2025,1,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+3,heat,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.75000000000
+3,heat,R1,2020,1,all-year,all-week,early-peak,gasboiler,2020,0.75000000000
+3,heat,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.20830000000
+3,heat,R1,2025,1,all-year,all-week,early-peak,gasboiler,2020,0.20830000000
+3,heat,R1,2025,2,all-year,all-week,early-peak,heatpump,2020,0.79170000000
+3,heat,R1,2025,3,all-year,all-week,early-peak,heatpump,2020,0.79170000000
+3,heat,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.75000000000
+3,heat,R2,2020,1,all-year,all-week,early-peak,gasboiler,2020,0.75000000000
+3,heat,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.20830000000
+3,heat,R2,2025,1,all-year,all-week,early-peak,gasboiler,2020,0.20830000000
+3,heat,R2,2025,2,all-year,all-week,early-peak,heatpump,2020,0.79170000000
+3,heat,R2,2025,3,all-year,all-week,early-peak,heatpump,2020,0.79170000000
+3,CO2f,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,48.53250000000
+3,CO2f,R1,2020,1,all-year,all-week,early-peak,gasboiler,2020,48.53250000000
+3,CO2f,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+3,CO2f,R1,2025,1,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+3,CO2f,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,48.53250000000
+3,CO2f,R2,2020,1,all-year,all-week,early-peak,gasboiler,2020,48.53250000000
+3,CO2f,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+3,CO2f,R2,2025,1,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+4,heat,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.50000000000
+4,heat,R1,2020,1,all-year,all-week,late-peak,gasboiler,2020,1.50000000000
+4,heat,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.41670000000
+4,heat,R1,2025,1,all-year,all-week,late-peak,gasboiler,2020,0.41670000000
+4,heat,R1,2025,2,all-year,all-week,late-peak,heatpump,2020,1.58330000000
+4,heat,R1,2025,3,all-year,all-week,late-peak,heatpump,2020,1.58330000000
+4,heat,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.50000000000
+4,heat,R2,2020,1,all-year,all-week,late-peak,gasboiler,2020,1.50000000000
+4,heat,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.41670000000
+4,heat,R2,2025,1,all-year,all-week,late-peak,gasboiler,2020,0.41670000000
+4,heat,R2,2025,2,all-year,all-week,late-peak,heatpump,2020,1.58330000000
+4,heat,R2,2025,3,all-year,all-week,late-peak,heatpump,2020,1.58330000000
+4,CO2f,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,97.06500000000
+4,CO2f,R1,2020,1,all-year,all-week,late-peak,gasboiler,2020,97.06500000000
+4,CO2f,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+4,CO2f,R1,2025,1,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+4,CO2f,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,97.06500000000
+4,CO2f,R2,2020,1,all-year,all-week,late-peak,gasboiler,2020,97.06500000000
+4,CO2f,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+4,CO2f,R2,2025,1,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+5,heat,R1,2020,0,all-year,all-week,evening,gasboiler,2020,1.00000000000
+5,heat,R1,2020,1,all-year,all-week,evening,gasboiler,2020,1.00000000000
+5,heat,R1,2025,0,all-year,all-week,evening,gasboiler,2020,0.27780000000
+5,heat,R1,2025,1,all-year,all-week,evening,gasboiler,2020,0.27780000000
+5,heat,R1,2025,2,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R1,2025,3,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R2,2020,0,all-year,all-week,evening,gasboiler,2020,1.00000000000
+5,heat,R2,2020,1,all-year,all-week,evening,gasboiler,2020,1.00000000000
+5,heat,R2,2025,0,all-year,all-week,evening,gasboiler,2020,0.27780000000
+5,heat,R2,2025,1,all-year,all-week,evening,gasboiler,2020,0.27780000000
+5,heat,R2,2025,2,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R2,2025,3,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,CO2f,R1,2020,0,all-year,all-week,evening,gasboiler,2020,64.71000000000
+5,CO2f,R1,2020,1,all-year,all-week,evening,gasboiler,2020,64.71000000000
+5,CO2f,R1,2025,0,all-year,all-week,evening,gasboiler,2020,17.97500000000
+5,CO2f,R1,2025,1,all-year,all-week,evening,gasboiler,2020,17.97500000000
+5,CO2f,R2,2020,0,all-year,all-week,evening,gasboiler,2020,64.71000000000
+5,CO2f,R2,2020,1,all-year,all-week,evening,gasboiler,2020,64.71000000000
+5,CO2f,R2,2025,0,all-year,all-week,evening,gasboiler,2020,17.97500000000
+5,CO2f,R2,2025,1,all-year,all-week,evening,gasboiler,2020,17.97500000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2025.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2025.csv
index eb9ddd9da..266a52a2b 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2025.csv
@@ -1,169 +1,169 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2025,0,gasboiler,2020,all-year,all-week,night,0.13890000000
-0,heat,R1,2025,2,gasboiler,2020,all-year,all-week,night,0.13890000000
-0,heat,R1,2025,4,heatpump,2020,all-year,all-week,night,0.52780000000
-0,heat,R1,2025,6,heatpump,2020,all-year,all-week,night,0.52780000000
-0,heat,R1,2030,1,gasboiler,2025,all-year,all-week,night,0.11390000000
-0,heat,R1,2030,3,gasboiler,2025,all-year,all-week,night,0.11390000000
-0,heat,R1,2030,4,heatpump,2020,all-year,all-week,night,0.52780000000
-0,heat,R1,2030,5,heatpump,2025,all-year,all-week,night,0.19170000000
-0,heat,R1,2030,6,heatpump,2020,all-year,all-week,night,0.52780000000
-0,heat,R1,2030,7,heatpump,2025,all-year,all-week,night,0.19170000000
-0,heat,R2,2025,0,gasboiler,2020,all-year,all-week,night,0.13890000000
-0,heat,R2,2025,2,gasboiler,2020,all-year,all-week,night,0.13890000000
-0,heat,R2,2025,4,heatpump,2020,all-year,all-week,night,0.52780000000
-0,heat,R2,2025,6,heatpump,2020,all-year,all-week,night,0.52780000000
-0,heat,R2,2030,1,gasboiler,2025,all-year,all-week,night,0.11390000000
-0,heat,R2,2030,3,gasboiler,2025,all-year,all-week,night,0.11390000000
-0,heat,R2,2030,4,heatpump,2020,all-year,all-week,night,0.52780000000
-0,heat,R2,2030,5,heatpump,2025,all-year,all-week,night,0.19170000000
-0,heat,R2,2030,6,heatpump,2020,all-year,all-week,night,0.52780000000
-0,heat,R2,2030,7,heatpump,2025,all-year,all-week,night,0.19170000000
-0,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,night,8.98750000000
-0,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,night,8.98750000000
-0,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,night,7.36970000000
-0,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,night,7.36970000000
-0,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,night,8.98750000000
-0,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,night,8.98750000000
-0,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,night,7.36970000000
-0,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,night,7.36970000000
-1,heat,R1,2025,0,gasboiler,2020,all-year,all-week,morning,0.20830000000
-1,heat,R1,2025,2,gasboiler,2020,all-year,all-week,morning,0.20830000000
-1,heat,R1,2025,4,heatpump,2020,all-year,all-week,morning,0.79170000000
-1,heat,R1,2025,6,heatpump,2020,all-year,all-week,morning,0.79170000000
-1,heat,R1,2030,1,gasboiler,2025,all-year,all-week,morning,0.17080000000
-1,heat,R1,2030,3,gasboiler,2025,all-year,all-week,morning,0.17080000000
-1,heat,R1,2030,4,heatpump,2020,all-year,all-week,morning,0.79170000000
-1,heat,R1,2030,5,heatpump,2025,all-year,all-week,morning,0.28750000000
-1,heat,R1,2030,6,heatpump,2020,all-year,all-week,morning,0.79170000000
-1,heat,R1,2030,7,heatpump,2025,all-year,all-week,morning,0.28750000000
-1,heat,R2,2025,0,gasboiler,2020,all-year,all-week,morning,0.20830000000
-1,heat,R2,2025,2,gasboiler,2020,all-year,all-week,morning,0.20830000000
-1,heat,R2,2025,4,heatpump,2020,all-year,all-week,morning,0.79170000000
-1,heat,R2,2025,6,heatpump,2020,all-year,all-week,morning,0.79170000000
-1,heat,R2,2030,1,gasboiler,2025,all-year,all-week,morning,0.17080000000
-1,heat,R2,2030,3,gasboiler,2025,all-year,all-week,morning,0.17080000000
-1,heat,R2,2030,4,heatpump,2020,all-year,all-week,morning,0.79170000000
-1,heat,R2,2030,5,heatpump,2025,all-year,all-week,morning,0.28750000000
-1,heat,R2,2030,6,heatpump,2020,all-year,all-week,morning,0.79170000000
-1,heat,R2,2030,7,heatpump,2025,all-year,all-week,morning,0.28750000000
-1,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,morning,13.48120000000
-1,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,morning,13.48120000000
-1,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,morning,11.05460000000
-1,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,morning,11.05460000000
-1,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,morning,13.48120000000
-1,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,morning,13.48120000000
-1,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,morning,11.05460000000
-1,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,morning,11.05460000000
-2,heat,R1,2025,0,gasboiler,2020,all-year,all-week,afternoon,0.13890000000
-2,heat,R1,2025,2,gasboiler,2020,all-year,all-week,afternoon,0.13890000000
-2,heat,R1,2025,4,heatpump,2020,all-year,all-week,afternoon,0.52780000000
-2,heat,R1,2025,6,heatpump,2020,all-year,all-week,afternoon,0.52780000000
-2,heat,R1,2030,1,gasboiler,2025,all-year,all-week,afternoon,0.11390000000
-2,heat,R1,2030,3,gasboiler,2025,all-year,all-week,afternoon,0.11390000000
-2,heat,R1,2030,4,heatpump,2020,all-year,all-week,afternoon,0.52780000000
-2,heat,R1,2030,5,heatpump,2025,all-year,all-week,afternoon,0.19170000000
-2,heat,R1,2030,6,heatpump,2020,all-year,all-week,afternoon,0.52780000000
-2,heat,R1,2030,7,heatpump,2025,all-year,all-week,afternoon,0.19170000000
-2,heat,R2,2025,0,gasboiler,2020,all-year,all-week,afternoon,0.13890000000
-2,heat,R2,2025,2,gasboiler,2020,all-year,all-week,afternoon,0.13890000000
-2,heat,R2,2025,4,heatpump,2020,all-year,all-week,afternoon,0.52780000000
-2,heat,R2,2025,6,heatpump,2020,all-year,all-week,afternoon,0.52780000000
-2,heat,R2,2030,1,gasboiler,2025,all-year,all-week,afternoon,0.11390000000
-2,heat,R2,2030,3,gasboiler,2025,all-year,all-week,afternoon,0.11390000000
-2,heat,R2,2030,4,heatpump,2020,all-year,all-week,afternoon,0.52780000000
-2,heat,R2,2030,5,heatpump,2025,all-year,all-week,afternoon,0.19170000000
-2,heat,R2,2030,6,heatpump,2020,all-year,all-week,afternoon,0.52780000000
-2,heat,R2,2030,7,heatpump,2025,all-year,all-week,afternoon,0.19170000000
-2,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,afternoon,8.98750000000
-2,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,afternoon,8.98750000000
-2,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,afternoon,7.36970000000
-2,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,afternoon,7.36970000000
-2,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,afternoon,8.98750000000
-2,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,afternoon,8.98750000000
-2,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,afternoon,7.36970000000
-2,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,afternoon,7.36970000000
-3,heat,R1,2025,0,gasboiler,2020,all-year,all-week,early-peak,0.20830000000
-3,heat,R1,2025,2,gasboiler,2020,all-year,all-week,early-peak,0.20830000000
-3,heat,R1,2025,4,heatpump,2020,all-year,all-week,early-peak,0.79170000000
-3,heat,R1,2025,6,heatpump,2020,all-year,all-week,early-peak,0.79170000000
-3,heat,R1,2030,1,gasboiler,2025,all-year,all-week,early-peak,0.17080000000
-3,heat,R1,2030,3,gasboiler,2025,all-year,all-week,early-peak,0.17080000000
-3,heat,R1,2030,4,heatpump,2020,all-year,all-week,early-peak,0.79170000000
-3,heat,R1,2030,5,heatpump,2025,all-year,all-week,early-peak,0.28750000000
-3,heat,R1,2030,6,heatpump,2020,all-year,all-week,early-peak,0.79170000000
-3,heat,R1,2030,7,heatpump,2025,all-year,all-week,early-peak,0.28750000000
-3,heat,R2,2025,0,gasboiler,2020,all-year,all-week,early-peak,0.20830000000
-3,heat,R2,2025,2,gasboiler,2020,all-year,all-week,early-peak,0.20830000000
-3,heat,R2,2025,4,heatpump,2020,all-year,all-week,early-peak,0.79170000000
-3,heat,R2,2025,6,heatpump,2020,all-year,all-week,early-peak,0.79170000000
-3,heat,R2,2030,1,gasboiler,2025,all-year,all-week,early-peak,0.17080000000
-3,heat,R2,2030,3,gasboiler,2025,all-year,all-week,early-peak,0.17080000000
-3,heat,R2,2030,4,heatpump,2020,all-year,all-week,early-peak,0.79170000000
-3,heat,R2,2030,5,heatpump,2025,all-year,all-week,early-peak,0.28750000000
-3,heat,R2,2030,6,heatpump,2020,all-year,all-week,early-peak,0.79170000000
-3,heat,R2,2030,7,heatpump,2025,all-year,all-week,early-peak,0.28750000000
-3,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,early-peak,13.48120000000
-3,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,early-peak,13.48120000000
-3,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,early-peak,11.05460000000
-3,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,early-peak,11.05460000000
-3,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,early-peak,13.48120000000
-3,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,early-peak,13.48120000000
-3,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,early-peak,11.05460000000
-3,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,early-peak,11.05460000000
-4,heat,R1,2025,0,gasboiler,2020,all-year,all-week,late-peak,0.41670000000
-4,heat,R1,2025,2,gasboiler,2020,all-year,all-week,late-peak,0.41670000000
-4,heat,R1,2025,4,heatpump,2020,all-year,all-week,late-peak,1.58330000000
-4,heat,R1,2025,6,heatpump,2020,all-year,all-week,late-peak,1.58330000000
-4,heat,R1,2030,1,gasboiler,2025,all-year,all-week,late-peak,0.34170000000
-4,heat,R1,2030,3,gasboiler,2025,all-year,all-week,late-peak,0.34170000000
-4,heat,R1,2030,4,heatpump,2020,all-year,all-week,late-peak,1.58330000000
-4,heat,R1,2030,5,heatpump,2025,all-year,all-week,late-peak,0.57500000000
-4,heat,R1,2030,6,heatpump,2020,all-year,all-week,late-peak,1.58330000000
-4,heat,R1,2030,7,heatpump,2025,all-year,all-week,late-peak,0.57500000000
-4,heat,R2,2025,0,gasboiler,2020,all-year,all-week,late-peak,0.41670000000
-4,heat,R2,2025,2,gasboiler,2020,all-year,all-week,late-peak,0.41670000000
-4,heat,R2,2025,4,heatpump,2020,all-year,all-week,late-peak,1.58330000000
-4,heat,R2,2025,6,heatpump,2020,all-year,all-week,late-peak,1.58330000000
-4,heat,R2,2030,1,gasboiler,2025,all-year,all-week,late-peak,0.34170000000
-4,heat,R2,2030,3,gasboiler,2025,all-year,all-week,late-peak,0.34170000000
-4,heat,R2,2030,4,heatpump,2020,all-year,all-week,late-peak,1.58330000000
-4,heat,R2,2030,5,heatpump,2025,all-year,all-week,late-peak,0.57500000000
-4,heat,R2,2030,6,heatpump,2020,all-year,all-week,late-peak,1.58330000000
-4,heat,R2,2030,7,heatpump,2025,all-year,all-week,late-peak,0.57500000000
-4,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,late-peak,26.96250000000
-4,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,late-peak,26.96250000000
-4,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,late-peak,22.10920000000
-4,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,late-peak,22.10920000000
-4,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,late-peak,26.96250000000
-4,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,late-peak,26.96250000000
-4,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,late-peak,22.10920000000
-4,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,late-peak,22.10920000000
-5,heat,R1,2025,0,gasboiler,2020,all-year,all-week,evening,0.27780000000
-5,heat,R1,2025,2,gasboiler,2020,all-year,all-week,evening,0.27780000000
-5,heat,R1,2025,4,heatpump,2020,all-year,all-week,evening,1.05560000000
-5,heat,R1,2025,6,heatpump,2020,all-year,all-week,evening,1.05560000000
-5,heat,R1,2030,1,gasboiler,2025,all-year,all-week,evening,0.22780000000
-5,heat,R1,2030,3,gasboiler,2025,all-year,all-week,evening,0.22780000000
-5,heat,R1,2030,4,heatpump,2020,all-year,all-week,evening,1.05560000000
-5,heat,R1,2030,5,heatpump,2025,all-year,all-week,evening,0.38330000000
-5,heat,R1,2030,6,heatpump,2020,all-year,all-week,evening,1.05560000000
-5,heat,R1,2030,7,heatpump,2025,all-year,all-week,evening,0.38330000000
-5,heat,R2,2025,0,gasboiler,2020,all-year,all-week,evening,0.27780000000
-5,heat,R2,2025,2,gasboiler,2020,all-year,all-week,evening,0.27780000000
-5,heat,R2,2025,4,heatpump,2020,all-year,all-week,evening,1.05560000000
-5,heat,R2,2025,6,heatpump,2020,all-year,all-week,evening,1.05560000000
-5,heat,R2,2030,1,gasboiler,2025,all-year,all-week,evening,0.22780000000
-5,heat,R2,2030,3,gasboiler,2025,all-year,all-week,evening,0.22780000000
-5,heat,R2,2030,4,heatpump,2020,all-year,all-week,evening,1.05560000000
-5,heat,R2,2030,5,heatpump,2025,all-year,all-week,evening,0.38330000000
-5,heat,R2,2030,6,heatpump,2020,all-year,all-week,evening,1.05560000000
-5,heat,R2,2030,7,heatpump,2025,all-year,all-week,evening,0.38330000000
-5,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,evening,17.97500000000
-5,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,evening,17.97500000000
-5,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,evening,14.73950000000
-5,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,evening,14.73950000000
-5,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,evening,17.97500000000
-5,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,evening,17.97500000000
-5,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,evening,14.73950000000
-5,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,evening,14.73950000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2025,0,all-year,all-week,night,gasboiler,2020,0.13890000000
+0,heat,R1,2025,2,all-year,all-week,night,gasboiler,2020,0.13890000000
+0,heat,R1,2025,4,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R1,2025,6,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R1,2030,1,all-year,all-week,night,gasboiler,2025,0.11390000000
+0,heat,R1,2030,3,all-year,all-week,night,gasboiler,2025,0.11390000000
+0,heat,R1,2030,4,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2025,0.19170000000
+0,heat,R1,2030,6,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R1,2030,7,all-year,all-week,night,heatpump,2025,0.19170000000
+0,heat,R2,2025,0,all-year,all-week,night,gasboiler,2020,0.13890000000
+0,heat,R2,2025,2,all-year,all-week,night,gasboiler,2020,0.13890000000
+0,heat,R2,2025,4,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R2,2025,6,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R2,2030,1,all-year,all-week,night,gasboiler,2025,0.11390000000
+0,heat,R2,2030,3,all-year,all-week,night,gasboiler,2025,0.11390000000
+0,heat,R2,2030,4,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2025,0.19170000000
+0,heat,R2,2030,6,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R2,2030,7,all-year,all-week,night,heatpump,2025,0.19170000000
+0,CO2f,R1,2025,0,all-year,all-week,night,gasboiler,2020,8.98750000000
+0,CO2f,R1,2025,2,all-year,all-week,night,gasboiler,2020,8.98750000000
+0,CO2f,R1,2030,1,all-year,all-week,night,gasboiler,2025,7.36970000000
+0,CO2f,R1,2030,3,all-year,all-week,night,gasboiler,2025,7.36970000000
+0,CO2f,R2,2025,0,all-year,all-week,night,gasboiler,2020,8.98750000000
+0,CO2f,R2,2025,2,all-year,all-week,night,gasboiler,2020,8.98750000000
+0,CO2f,R2,2030,1,all-year,all-week,night,gasboiler,2025,7.36970000000
+0,CO2f,R2,2030,3,all-year,all-week,night,gasboiler,2025,7.36970000000
+1,heat,R1,2025,0,all-year,all-week,morning,gasboiler,2020,0.20830000000
+1,heat,R1,2025,2,all-year,all-week,morning,gasboiler,2020,0.20830000000
+1,heat,R1,2025,4,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R1,2025,6,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R1,2030,1,all-year,all-week,morning,gasboiler,2025,0.17080000000
+1,heat,R1,2030,3,all-year,all-week,morning,gasboiler,2025,0.17080000000
+1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2025,0.28750000000
+1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R1,2030,7,all-year,all-week,morning,heatpump,2025,0.28750000000
+1,heat,R2,2025,0,all-year,all-week,morning,gasboiler,2020,0.20830000000
+1,heat,R2,2025,2,all-year,all-week,morning,gasboiler,2020,0.20830000000
+1,heat,R2,2025,4,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R2,2025,6,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R2,2030,1,all-year,all-week,morning,gasboiler,2025,0.17080000000
+1,heat,R2,2030,3,all-year,all-week,morning,gasboiler,2025,0.17080000000
+1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2025,0.28750000000
+1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R2,2030,7,all-year,all-week,morning,heatpump,2025,0.28750000000
+1,CO2f,R1,2025,0,all-year,all-week,morning,gasboiler,2020,13.48120000000
+1,CO2f,R1,2025,2,all-year,all-week,morning,gasboiler,2020,13.48120000000
+1,CO2f,R1,2030,1,all-year,all-week,morning,gasboiler,2025,11.05460000000
+1,CO2f,R1,2030,3,all-year,all-week,morning,gasboiler,2025,11.05460000000
+1,CO2f,R2,2025,0,all-year,all-week,morning,gasboiler,2020,13.48120000000
+1,CO2f,R2,2025,2,all-year,all-week,morning,gasboiler,2020,13.48120000000
+1,CO2f,R2,2030,1,all-year,all-week,morning,gasboiler,2025,11.05460000000
+1,CO2f,R2,2030,3,all-year,all-week,morning,gasboiler,2025,11.05460000000
+2,heat,R1,2025,0,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
+2,heat,R1,2025,2,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
+2,heat,R1,2025,4,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R1,2025,6,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R1,2030,1,all-year,all-week,afternoon,gasboiler,2025,0.11390000000
+2,heat,R1,2030,3,all-year,all-week,afternoon,gasboiler,2025,0.11390000000
+2,heat,R1,2030,4,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R1,2030,5,all-year,all-week,afternoon,heatpump,2025,0.19170000000
+2,heat,R1,2030,6,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R1,2030,7,all-year,all-week,afternoon,heatpump,2025,0.19170000000
+2,heat,R2,2025,0,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
+2,heat,R2,2025,2,all-year,all-week,afternoon,gasboiler,2020,0.13890000000
+2,heat,R2,2025,4,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R2,2025,6,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R2,2030,1,all-year,all-week,afternoon,gasboiler,2025,0.11390000000
+2,heat,R2,2030,3,all-year,all-week,afternoon,gasboiler,2025,0.11390000000
+2,heat,R2,2030,4,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R2,2030,5,all-year,all-week,afternoon,heatpump,2025,0.19170000000
+2,heat,R2,2030,6,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R2,2030,7,all-year,all-week,afternoon,heatpump,2025,0.19170000000
+2,CO2f,R1,2025,0,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+2,CO2f,R1,2025,2,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+2,CO2f,R1,2030,1,all-year,all-week,afternoon,gasboiler,2025,7.36970000000
+2,CO2f,R1,2030,3,all-year,all-week,afternoon,gasboiler,2025,7.36970000000
+2,CO2f,R2,2025,0,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+2,CO2f,R2,2025,2,all-year,all-week,afternoon,gasboiler,2020,8.98750000000
+2,CO2f,R2,2030,1,all-year,all-week,afternoon,gasboiler,2025,7.36970000000
+2,CO2f,R2,2030,3,all-year,all-week,afternoon,gasboiler,2025,7.36970000000
+3,heat,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.20830000000
+3,heat,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.20830000000
+3,heat,R1,2025,4,all-year,all-week,early-peak,heatpump,2020,0.79170000000
+3,heat,R1,2025,6,all-year,all-week,early-peak,heatpump,2020,0.79170000000
+3,heat,R1,2030,1,all-year,all-week,early-peak,gasboiler,2025,0.17080000000
+3,heat,R1,2030,3,all-year,all-week,early-peak,gasboiler,2025,0.17080000000
+3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2020,0.79170000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2025,0.28750000000
+3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2020,0.79170000000
+3,heat,R1,2030,7,all-year,all-week,early-peak,heatpump,2025,0.28750000000
+3,heat,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.20830000000
+3,heat,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.20830000000
+3,heat,R2,2025,4,all-year,all-week,early-peak,heatpump,2020,0.79170000000
+3,heat,R2,2025,6,all-year,all-week,early-peak,heatpump,2020,0.79170000000
+3,heat,R2,2030,1,all-year,all-week,early-peak,gasboiler,2025,0.17080000000
+3,heat,R2,2030,3,all-year,all-week,early-peak,gasboiler,2025,0.17080000000
+3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2020,0.79170000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2025,0.28750000000
+3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2020,0.79170000000
+3,heat,R2,2030,7,all-year,all-week,early-peak,heatpump,2025,0.28750000000
+3,CO2f,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+3,CO2f,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+3,CO2f,R1,2030,1,all-year,all-week,early-peak,gasboiler,2025,11.05460000000
+3,CO2f,R1,2030,3,all-year,all-week,early-peak,gasboiler,2025,11.05460000000
+3,CO2f,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+3,CO2f,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,13.48120000000
+3,CO2f,R2,2030,1,all-year,all-week,early-peak,gasboiler,2025,11.05460000000
+3,CO2f,R2,2030,3,all-year,all-week,early-peak,gasboiler,2025,11.05460000000
+4,heat,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.41670000000
+4,heat,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.41670000000
+4,heat,R1,2025,4,all-year,all-week,late-peak,heatpump,2020,1.58330000000
+4,heat,R1,2025,6,all-year,all-week,late-peak,heatpump,2020,1.58330000000
+4,heat,R1,2030,1,all-year,all-week,late-peak,gasboiler,2025,0.34170000000
+4,heat,R1,2030,3,all-year,all-week,late-peak,gasboiler,2025,0.34170000000
+4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2020,1.58330000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2025,0.57500000000
+4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2020,1.58330000000
+4,heat,R1,2030,7,all-year,all-week,late-peak,heatpump,2025,0.57500000000
+4,heat,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.41670000000
+4,heat,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.41670000000
+4,heat,R2,2025,4,all-year,all-week,late-peak,heatpump,2020,1.58330000000
+4,heat,R2,2025,6,all-year,all-week,late-peak,heatpump,2020,1.58330000000
+4,heat,R2,2030,1,all-year,all-week,late-peak,gasboiler,2025,0.34170000000
+4,heat,R2,2030,3,all-year,all-week,late-peak,gasboiler,2025,0.34170000000
+4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2020,1.58330000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2025,0.57500000000
+4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2020,1.58330000000
+4,heat,R2,2030,7,all-year,all-week,late-peak,heatpump,2025,0.57500000000
+4,CO2f,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+4,CO2f,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+4,CO2f,R1,2030,1,all-year,all-week,late-peak,gasboiler,2025,22.10920000000
+4,CO2f,R1,2030,3,all-year,all-week,late-peak,gasboiler,2025,22.10920000000
+4,CO2f,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+4,CO2f,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,26.96250000000
+4,CO2f,R2,2030,1,all-year,all-week,late-peak,gasboiler,2025,22.10920000000
+4,CO2f,R2,2030,3,all-year,all-week,late-peak,gasboiler,2025,22.10920000000
+5,heat,R1,2025,0,all-year,all-week,evening,gasboiler,2020,0.27780000000
+5,heat,R1,2025,2,all-year,all-week,evening,gasboiler,2020,0.27780000000
+5,heat,R1,2025,4,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R1,2025,6,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R1,2030,1,all-year,all-week,evening,gasboiler,2025,0.22780000000
+5,heat,R1,2030,3,all-year,all-week,evening,gasboiler,2025,0.22780000000
+5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2025,0.38330000000
+5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R1,2030,7,all-year,all-week,evening,heatpump,2025,0.38330000000
+5,heat,R2,2025,0,all-year,all-week,evening,gasboiler,2020,0.27780000000
+5,heat,R2,2025,2,all-year,all-week,evening,gasboiler,2020,0.27780000000
+5,heat,R2,2025,4,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R2,2025,6,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R2,2030,1,all-year,all-week,evening,gasboiler,2025,0.22780000000
+5,heat,R2,2030,3,all-year,all-week,evening,gasboiler,2025,0.22780000000
+5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2025,0.38330000000
+5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R2,2030,7,all-year,all-week,evening,heatpump,2025,0.38330000000
+5,CO2f,R1,2025,0,all-year,all-week,evening,gasboiler,2020,17.97500000000
+5,CO2f,R1,2025,2,all-year,all-week,evening,gasboiler,2020,17.97500000000
+5,CO2f,R1,2030,1,all-year,all-week,evening,gasboiler,2025,14.73950000000
+5,CO2f,R1,2030,3,all-year,all-week,evening,gasboiler,2025,14.73950000000
+5,CO2f,R2,2025,0,all-year,all-week,evening,gasboiler,2020,17.97500000000
+5,CO2f,R2,2025,2,all-year,all-week,evening,gasboiler,2020,17.97500000000
+5,CO2f,R2,2030,1,all-year,all-week,evening,gasboiler,2025,14.73950000000
+5,CO2f,R2,2030,3,all-year,all-week,evening,gasboiler,2025,14.73950000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2030.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2030.csv
index af0c152bd..993fd4372 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2030.csv
@@ -1,193 +1,193 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2030,0,gasboiler,2025,all-year,all-week,night,0.11390000000
-0,heat,R1,2030,1,gasboiler,2025,all-year,all-week,night,0.11390000000
-0,heat,R1,2030,2,heatpump,2020,all-year,all-week,night,0.52780000000
-0,heat,R1,2030,3,heatpump,2025,all-year,all-week,night,0.19170000000
-0,heat,R1,2030,5,heatpump,2020,all-year,all-week,night,0.52780000000
-0,heat,R1,2030,6,heatpump,2025,all-year,all-week,night,0.19170000000
-0,heat,R1,2035,0,gasboiler,2025,all-year,all-week,night,0.11390000000
-0,heat,R1,2035,1,gasboiler,2025,all-year,all-week,night,0.11390000000
-0,heat,R1,2035,3,heatpump,2025,all-year,all-week,night,0.19170000000
-0,heat,R1,2035,4,heatpump,2030,all-year,all-week,night,0.69440000000
-0,heat,R1,2035,6,heatpump,2025,all-year,all-week,night,0.19170000000
-0,heat,R1,2035,7,heatpump,2030,all-year,all-week,night,0.69440000000
-0,heat,R2,2030,0,gasboiler,2025,all-year,all-week,night,0.11390000000
-0,heat,R2,2030,1,gasboiler,2025,all-year,all-week,night,0.11390000000
-0,heat,R2,2030,2,heatpump,2020,all-year,all-week,night,0.52780000000
-0,heat,R2,2030,3,heatpump,2025,all-year,all-week,night,0.19170000000
-0,heat,R2,2030,5,heatpump,2020,all-year,all-week,night,0.52780000000
-0,heat,R2,2030,6,heatpump,2025,all-year,all-week,night,0.19170000000
-0,heat,R2,2035,0,gasboiler,2025,all-year,all-week,night,0.11390000000
-0,heat,R2,2035,1,gasboiler,2025,all-year,all-week,night,0.11390000000
-0,heat,R2,2035,3,heatpump,2025,all-year,all-week,night,0.19170000000
-0,heat,R2,2035,4,heatpump,2030,all-year,all-week,night,0.69440000000
-0,heat,R2,2035,6,heatpump,2025,all-year,all-week,night,0.19170000000
-0,heat,R2,2035,7,heatpump,2030,all-year,all-week,night,0.69440000000
-0,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,night,7.36970000000
-0,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,night,7.36970000000
-0,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,night,7.36970000000
-0,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,night,7.36970000000
-0,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,night,7.36970000000
-0,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,night,7.36970000000
-0,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,night,7.36970000000
-0,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,night,7.36970000000
-1,heat,R1,2030,0,gasboiler,2025,all-year,all-week,morning,0.17080000000
-1,heat,R1,2030,1,gasboiler,2025,all-year,all-week,morning,0.17080000000
-1,heat,R1,2030,2,heatpump,2020,all-year,all-week,morning,0.79170000000
-1,heat,R1,2030,3,heatpump,2025,all-year,all-week,morning,0.28750000000
-1,heat,R1,2030,5,heatpump,2020,all-year,all-week,morning,0.79170000000
-1,heat,R1,2030,6,heatpump,2025,all-year,all-week,morning,0.28750000000
-1,heat,R1,2035,0,gasboiler,2025,all-year,all-week,morning,0.17080000000
-1,heat,R1,2035,1,gasboiler,2025,all-year,all-week,morning,0.17080000000
-1,heat,R1,2035,3,heatpump,2025,all-year,all-week,morning,0.28750000000
-1,heat,R1,2035,4,heatpump,2030,all-year,all-week,morning,1.04170000000
-1,heat,R1,2035,6,heatpump,2025,all-year,all-week,morning,0.28750000000
-1,heat,R1,2035,7,heatpump,2030,all-year,all-week,morning,1.04170000000
-1,heat,R2,2030,0,gasboiler,2025,all-year,all-week,morning,0.17080000000
-1,heat,R2,2030,1,gasboiler,2025,all-year,all-week,morning,0.17080000000
-1,heat,R2,2030,2,heatpump,2020,all-year,all-week,morning,0.79170000000
-1,heat,R2,2030,3,heatpump,2025,all-year,all-week,morning,0.28750000000
-1,heat,R2,2030,5,heatpump,2020,all-year,all-week,morning,0.79170000000
-1,heat,R2,2030,6,heatpump,2025,all-year,all-week,morning,0.28750000000
-1,heat,R2,2035,0,gasboiler,2025,all-year,all-week,morning,0.17080000000
-1,heat,R2,2035,1,gasboiler,2025,all-year,all-week,morning,0.17080000000
-1,heat,R2,2035,3,heatpump,2025,all-year,all-week,morning,0.28750000000
-1,heat,R2,2035,4,heatpump,2030,all-year,all-week,morning,1.04170000000
-1,heat,R2,2035,6,heatpump,2025,all-year,all-week,morning,0.28750000000
-1,heat,R2,2035,7,heatpump,2030,all-year,all-week,morning,1.04170000000
-1,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,morning,11.05460000000
-1,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,morning,11.05460000000
-1,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,morning,11.05460000000
-1,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,morning,11.05460000000
-1,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,morning,11.05460000000
-1,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,morning,11.05460000000
-1,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,morning,11.05460000000
-1,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,morning,11.05460000000
-2,heat,R1,2030,0,gasboiler,2025,all-year,all-week,afternoon,0.11390000000
-2,heat,R1,2030,1,gasboiler,2025,all-year,all-week,afternoon,0.11390000000
-2,heat,R1,2030,2,heatpump,2020,all-year,all-week,afternoon,0.52780000000
-2,heat,R1,2030,3,heatpump,2025,all-year,all-week,afternoon,0.19170000000
-2,heat,R1,2030,5,heatpump,2020,all-year,all-week,afternoon,0.52780000000
-2,heat,R1,2030,6,heatpump,2025,all-year,all-week,afternoon,0.19170000000
-2,heat,R1,2035,0,gasboiler,2025,all-year,all-week,afternoon,0.11390000000
-2,heat,R1,2035,1,gasboiler,2025,all-year,all-week,afternoon,0.11390000000
-2,heat,R1,2035,3,heatpump,2025,all-year,all-week,afternoon,0.19170000000
-2,heat,R1,2035,4,heatpump,2030,all-year,all-week,afternoon,0.69440000000
-2,heat,R1,2035,6,heatpump,2025,all-year,all-week,afternoon,0.19170000000
-2,heat,R1,2035,7,heatpump,2030,all-year,all-week,afternoon,0.69440000000
-2,heat,R2,2030,0,gasboiler,2025,all-year,all-week,afternoon,0.11390000000
-2,heat,R2,2030,1,gasboiler,2025,all-year,all-week,afternoon,0.11390000000
-2,heat,R2,2030,2,heatpump,2020,all-year,all-week,afternoon,0.52780000000
-2,heat,R2,2030,3,heatpump,2025,all-year,all-week,afternoon,0.19170000000
-2,heat,R2,2030,5,heatpump,2020,all-year,all-week,afternoon,0.52780000000
-2,heat,R2,2030,6,heatpump,2025,all-year,all-week,afternoon,0.19170000000
-2,heat,R2,2035,0,gasboiler,2025,all-year,all-week,afternoon,0.11390000000
-2,heat,R2,2035,1,gasboiler,2025,all-year,all-week,afternoon,0.11390000000
-2,heat,R2,2035,3,heatpump,2025,all-year,all-week,afternoon,0.19170000000
-2,heat,R2,2035,4,heatpump,2030,all-year,all-week,afternoon,0.69440000000
-2,heat,R2,2035,6,heatpump,2025,all-year,all-week,afternoon,0.19170000000
-2,heat,R2,2035,7,heatpump,2030,all-year,all-week,afternoon,0.69440000000
-2,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,afternoon,7.36970000000
-2,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,afternoon,7.36970000000
-2,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,afternoon,7.36970000000
-2,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,afternoon,7.36970000000
-2,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,afternoon,7.36970000000
-2,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,afternoon,7.36970000000
-2,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,afternoon,7.36970000000
-2,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,afternoon,7.36970000000
-3,heat,R1,2030,0,gasboiler,2025,all-year,all-week,early-peak,0.17080000000
-3,heat,R1,2030,1,gasboiler,2025,all-year,all-week,early-peak,0.17080000000
-3,heat,R1,2030,2,heatpump,2020,all-year,all-week,early-peak,0.79170000000
-3,heat,R1,2030,3,heatpump,2025,all-year,all-week,early-peak,0.28750000000
-3,heat,R1,2030,5,heatpump,2020,all-year,all-week,early-peak,0.79170000000
-3,heat,R1,2030,6,heatpump,2025,all-year,all-week,early-peak,0.28750000000
-3,heat,R1,2035,0,gasboiler,2025,all-year,all-week,early-peak,0.17080000000
-3,heat,R1,2035,1,gasboiler,2025,all-year,all-week,early-peak,0.17080000000
-3,heat,R1,2035,3,heatpump,2025,all-year,all-week,early-peak,0.28750000000
-3,heat,R1,2035,4,heatpump,2030,all-year,all-week,early-peak,1.04170000000
-3,heat,R1,2035,6,heatpump,2025,all-year,all-week,early-peak,0.28750000000
-3,heat,R1,2035,7,heatpump,2030,all-year,all-week,early-peak,1.04170000000
-3,heat,R2,2030,0,gasboiler,2025,all-year,all-week,early-peak,0.17080000000
-3,heat,R2,2030,1,gasboiler,2025,all-year,all-week,early-peak,0.17080000000
-3,heat,R2,2030,2,heatpump,2020,all-year,all-week,early-peak,0.79170000000
-3,heat,R2,2030,3,heatpump,2025,all-year,all-week,early-peak,0.28750000000
-3,heat,R2,2030,5,heatpump,2020,all-year,all-week,early-peak,0.79170000000
-3,heat,R2,2030,6,heatpump,2025,all-year,all-week,early-peak,0.28750000000
-3,heat,R2,2035,0,gasboiler,2025,all-year,all-week,early-peak,0.17080000000
-3,heat,R2,2035,1,gasboiler,2025,all-year,all-week,early-peak,0.17080000000
-3,heat,R2,2035,3,heatpump,2025,all-year,all-week,early-peak,0.28750000000
-3,heat,R2,2035,4,heatpump,2030,all-year,all-week,early-peak,1.04170000000
-3,heat,R2,2035,6,heatpump,2025,all-year,all-week,early-peak,0.28750000000
-3,heat,R2,2035,7,heatpump,2030,all-year,all-week,early-peak,1.04170000000
-3,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,early-peak,11.05460000000
-3,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,early-peak,11.05460000000
-3,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,early-peak,11.05460000000
-3,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,early-peak,11.05460000000
-3,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,early-peak,11.05460000000
-3,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,early-peak,11.05460000000
-3,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,early-peak,11.05460000000
-3,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,early-peak,11.05460000000
-4,heat,R1,2030,0,gasboiler,2025,all-year,all-week,late-peak,0.34170000000
-4,heat,R1,2030,1,gasboiler,2025,all-year,all-week,late-peak,0.34170000000
-4,heat,R1,2030,2,heatpump,2020,all-year,all-week,late-peak,1.58330000000
-4,heat,R1,2030,3,heatpump,2025,all-year,all-week,late-peak,0.57500000000
-4,heat,R1,2030,5,heatpump,2020,all-year,all-week,late-peak,1.58330000000
-4,heat,R1,2030,6,heatpump,2025,all-year,all-week,late-peak,0.57500000000
-4,heat,R1,2035,0,gasboiler,2025,all-year,all-week,late-peak,0.34170000000
-4,heat,R1,2035,1,gasboiler,2025,all-year,all-week,late-peak,0.34170000000
-4,heat,R1,2035,3,heatpump,2025,all-year,all-week,late-peak,0.57500000000
-4,heat,R1,2035,4,heatpump,2030,all-year,all-week,late-peak,2.08330000000
-4,heat,R1,2035,6,heatpump,2025,all-year,all-week,late-peak,0.57500000000
-4,heat,R1,2035,7,heatpump,2030,all-year,all-week,late-peak,2.08330000000
-4,heat,R2,2030,0,gasboiler,2025,all-year,all-week,late-peak,0.34170000000
-4,heat,R2,2030,1,gasboiler,2025,all-year,all-week,late-peak,0.34170000000
-4,heat,R2,2030,2,heatpump,2020,all-year,all-week,late-peak,1.58330000000
-4,heat,R2,2030,3,heatpump,2025,all-year,all-week,late-peak,0.57500000000
-4,heat,R2,2030,5,heatpump,2020,all-year,all-week,late-peak,1.58330000000
-4,heat,R2,2030,6,heatpump,2025,all-year,all-week,late-peak,0.57500000000
-4,heat,R2,2035,0,gasboiler,2025,all-year,all-week,late-peak,0.34170000000
-4,heat,R2,2035,1,gasboiler,2025,all-year,all-week,late-peak,0.34170000000
-4,heat,R2,2035,3,heatpump,2025,all-year,all-week,late-peak,0.57500000000
-4,heat,R2,2035,4,heatpump,2030,all-year,all-week,late-peak,2.08330000000
-4,heat,R2,2035,6,heatpump,2025,all-year,all-week,late-peak,0.57500000000
-4,heat,R2,2035,7,heatpump,2030,all-year,all-week,late-peak,2.08330000000
-4,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,late-peak,22.10920000000
-4,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,late-peak,22.10920000000
-4,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,late-peak,22.10920000000
-4,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,late-peak,22.10920000000
-4,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,late-peak,22.10920000000
-4,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,late-peak,22.10920000000
-4,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,late-peak,22.10920000000
-4,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,late-peak,22.10920000000
-5,heat,R1,2030,0,gasboiler,2025,all-year,all-week,evening,0.22780000000
-5,heat,R1,2030,1,gasboiler,2025,all-year,all-week,evening,0.22780000000
-5,heat,R1,2030,2,heatpump,2020,all-year,all-week,evening,1.05560000000
-5,heat,R1,2030,3,heatpump,2025,all-year,all-week,evening,0.38330000000
-5,heat,R1,2030,5,heatpump,2020,all-year,all-week,evening,1.05560000000
-5,heat,R1,2030,6,heatpump,2025,all-year,all-week,evening,0.38330000000
-5,heat,R1,2035,0,gasboiler,2025,all-year,all-week,evening,0.22780000000
-5,heat,R1,2035,1,gasboiler,2025,all-year,all-week,evening,0.22780000000
-5,heat,R1,2035,3,heatpump,2025,all-year,all-week,evening,0.38330000000
-5,heat,R1,2035,4,heatpump,2030,all-year,all-week,evening,1.38890000000
-5,heat,R1,2035,6,heatpump,2025,all-year,all-week,evening,0.38330000000
-5,heat,R1,2035,7,heatpump,2030,all-year,all-week,evening,1.38890000000
-5,heat,R2,2030,0,gasboiler,2025,all-year,all-week,evening,0.22780000000
-5,heat,R2,2030,1,gasboiler,2025,all-year,all-week,evening,0.22780000000
-5,heat,R2,2030,2,heatpump,2020,all-year,all-week,evening,1.05560000000
-5,heat,R2,2030,3,heatpump,2025,all-year,all-week,evening,0.38330000000
-5,heat,R2,2030,5,heatpump,2020,all-year,all-week,evening,1.05560000000
-5,heat,R2,2030,6,heatpump,2025,all-year,all-week,evening,0.38330000000
-5,heat,R2,2035,0,gasboiler,2025,all-year,all-week,evening,0.22780000000
-5,heat,R2,2035,1,gasboiler,2025,all-year,all-week,evening,0.22780000000
-5,heat,R2,2035,3,heatpump,2025,all-year,all-week,evening,0.38330000000
-5,heat,R2,2035,4,heatpump,2030,all-year,all-week,evening,1.38890000000
-5,heat,R2,2035,6,heatpump,2025,all-year,all-week,evening,0.38330000000
-5,heat,R2,2035,7,heatpump,2030,all-year,all-week,evening,1.38890000000
-5,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,evening,14.73950000000
-5,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,evening,14.73950000000
-5,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,evening,14.73950000000
-5,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,evening,14.73950000000
-5,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,evening,14.73950000000
-5,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,evening,14.73950000000
-5,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,evening,14.73950000000
-5,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,evening,14.73950000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2030,0,all-year,all-week,night,gasboiler,2025,0.11390000000
+0,heat,R1,2030,1,all-year,all-week,night,gasboiler,2025,0.11390000000
+0,heat,R1,2030,2,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R1,2030,3,all-year,all-week,night,heatpump,2025,0.19170000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R1,2030,6,all-year,all-week,night,heatpump,2025,0.19170000000
+0,heat,R1,2035,0,all-year,all-week,night,gasboiler,2025,0.11390000000
+0,heat,R1,2035,1,all-year,all-week,night,gasboiler,2025,0.11390000000
+0,heat,R1,2035,3,all-year,all-week,night,heatpump,2025,0.19170000000
+0,heat,R1,2035,4,all-year,all-week,night,heatpump,2030,0.69440000000
+0,heat,R1,2035,6,all-year,all-week,night,heatpump,2025,0.19170000000
+0,heat,R1,2035,7,all-year,all-week,night,heatpump,2030,0.69440000000
+0,heat,R2,2030,0,all-year,all-week,night,gasboiler,2025,0.11390000000
+0,heat,R2,2030,1,all-year,all-week,night,gasboiler,2025,0.11390000000
+0,heat,R2,2030,2,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R2,2030,3,all-year,all-week,night,heatpump,2025,0.19170000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2020,0.52780000000
+0,heat,R2,2030,6,all-year,all-week,night,heatpump,2025,0.19170000000
+0,heat,R2,2035,0,all-year,all-week,night,gasboiler,2025,0.11390000000
+0,heat,R2,2035,1,all-year,all-week,night,gasboiler,2025,0.11390000000
+0,heat,R2,2035,3,all-year,all-week,night,heatpump,2025,0.19170000000
+0,heat,R2,2035,4,all-year,all-week,night,heatpump,2030,0.69440000000
+0,heat,R2,2035,6,all-year,all-week,night,heatpump,2025,0.19170000000
+0,heat,R2,2035,7,all-year,all-week,night,heatpump,2030,0.69440000000
+0,CO2f,R1,2030,0,all-year,all-week,night,gasboiler,2025,7.36970000000
+0,CO2f,R1,2030,1,all-year,all-week,night,gasboiler,2025,7.36970000000
+0,CO2f,R1,2035,0,all-year,all-week,night,gasboiler,2025,7.36970000000
+0,CO2f,R1,2035,1,all-year,all-week,night,gasboiler,2025,7.36970000000
+0,CO2f,R2,2030,0,all-year,all-week,night,gasboiler,2025,7.36970000000
+0,CO2f,R2,2030,1,all-year,all-week,night,gasboiler,2025,7.36970000000
+0,CO2f,R2,2035,0,all-year,all-week,night,gasboiler,2025,7.36970000000
+0,CO2f,R2,2035,1,all-year,all-week,night,gasboiler,2025,7.36970000000
+1,heat,R1,2030,0,all-year,all-week,morning,gasboiler,2025,0.17080000000
+1,heat,R1,2030,1,all-year,all-week,morning,gasboiler,2025,0.17080000000
+1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R1,2030,3,all-year,all-week,morning,heatpump,2025,0.28750000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2025,0.28750000000
+1,heat,R1,2035,0,all-year,all-week,morning,gasboiler,2025,0.17080000000
+1,heat,R1,2035,1,all-year,all-week,morning,gasboiler,2025,0.17080000000
+1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2025,0.28750000000
+1,heat,R1,2035,4,all-year,all-week,morning,heatpump,2030,1.04170000000
+1,heat,R1,2035,6,all-year,all-week,morning,heatpump,2025,0.28750000000
+1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2030,1.04170000000
+1,heat,R2,2030,0,all-year,all-week,morning,gasboiler,2025,0.17080000000
+1,heat,R2,2030,1,all-year,all-week,morning,gasboiler,2025,0.17080000000
+1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R2,2030,3,all-year,all-week,morning,heatpump,2025,0.28750000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2020,0.79170000000
+1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2025,0.28750000000
+1,heat,R2,2035,0,all-year,all-week,morning,gasboiler,2025,0.17080000000
+1,heat,R2,2035,1,all-year,all-week,morning,gasboiler,2025,0.17080000000
+1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2025,0.28750000000
+1,heat,R2,2035,4,all-year,all-week,morning,heatpump,2030,1.04170000000
+1,heat,R2,2035,6,all-year,all-week,morning,heatpump,2025,0.28750000000
+1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2030,1.04170000000
+1,CO2f,R1,2030,0,all-year,all-week,morning,gasboiler,2025,11.05460000000
+1,CO2f,R1,2030,1,all-year,all-week,morning,gasboiler,2025,11.05460000000
+1,CO2f,R1,2035,0,all-year,all-week,morning,gasboiler,2025,11.05460000000
+1,CO2f,R1,2035,1,all-year,all-week,morning,gasboiler,2025,11.05460000000
+1,CO2f,R2,2030,0,all-year,all-week,morning,gasboiler,2025,11.05460000000
+1,CO2f,R2,2030,1,all-year,all-week,morning,gasboiler,2025,11.05460000000
+1,CO2f,R2,2035,0,all-year,all-week,morning,gasboiler,2025,11.05460000000
+1,CO2f,R2,2035,1,all-year,all-week,morning,gasboiler,2025,11.05460000000
+2,heat,R1,2030,0,all-year,all-week,afternoon,gasboiler,2025,0.11390000000
+2,heat,R1,2030,1,all-year,all-week,afternoon,gasboiler,2025,0.11390000000
+2,heat,R1,2030,2,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R1,2030,3,all-year,all-week,afternoon,heatpump,2025,0.19170000000
+2,heat,R1,2030,5,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R1,2030,6,all-year,all-week,afternoon,heatpump,2025,0.19170000000
+2,heat,R1,2035,0,all-year,all-week,afternoon,gasboiler,2025,0.11390000000
+2,heat,R1,2035,1,all-year,all-week,afternoon,gasboiler,2025,0.11390000000
+2,heat,R1,2035,3,all-year,all-week,afternoon,heatpump,2025,0.19170000000
+2,heat,R1,2035,4,all-year,all-week,afternoon,heatpump,2030,0.69440000000
+2,heat,R1,2035,6,all-year,all-week,afternoon,heatpump,2025,0.19170000000
+2,heat,R1,2035,7,all-year,all-week,afternoon,heatpump,2030,0.69440000000
+2,heat,R2,2030,0,all-year,all-week,afternoon,gasboiler,2025,0.11390000000
+2,heat,R2,2030,1,all-year,all-week,afternoon,gasboiler,2025,0.11390000000
+2,heat,R2,2030,2,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R2,2030,3,all-year,all-week,afternoon,heatpump,2025,0.19170000000
+2,heat,R2,2030,5,all-year,all-week,afternoon,heatpump,2020,0.52780000000
+2,heat,R2,2030,6,all-year,all-week,afternoon,heatpump,2025,0.19170000000
+2,heat,R2,2035,0,all-year,all-week,afternoon,gasboiler,2025,0.11390000000
+2,heat,R2,2035,1,all-year,all-week,afternoon,gasboiler,2025,0.11390000000
+2,heat,R2,2035,3,all-year,all-week,afternoon,heatpump,2025,0.19170000000
+2,heat,R2,2035,4,all-year,all-week,afternoon,heatpump,2030,0.69440000000
+2,heat,R2,2035,6,all-year,all-week,afternoon,heatpump,2025,0.19170000000
+2,heat,R2,2035,7,all-year,all-week,afternoon,heatpump,2030,0.69440000000
+2,CO2f,R1,2030,0,all-year,all-week,afternoon,gasboiler,2025,7.36970000000
+2,CO2f,R1,2030,1,all-year,all-week,afternoon,gasboiler,2025,7.36970000000
+2,CO2f,R1,2035,0,all-year,all-week,afternoon,gasboiler,2025,7.36970000000
+2,CO2f,R1,2035,1,all-year,all-week,afternoon,gasboiler,2025,7.36970000000
+2,CO2f,R2,2030,0,all-year,all-week,afternoon,gasboiler,2025,7.36970000000
+2,CO2f,R2,2030,1,all-year,all-week,afternoon,gasboiler,2025,7.36970000000
+2,CO2f,R2,2035,0,all-year,all-week,afternoon,gasboiler,2025,7.36970000000
+2,CO2f,R2,2035,1,all-year,all-week,afternoon,gasboiler,2025,7.36970000000
+3,heat,R1,2030,0,all-year,all-week,early-peak,gasboiler,2025,0.17080000000
+3,heat,R1,2030,1,all-year,all-week,early-peak,gasboiler,2025,0.17080000000
+3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2020,0.79170000000
+3,heat,R1,2030,3,all-year,all-week,early-peak,heatpump,2025,0.28750000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2020,0.79170000000
+3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2025,0.28750000000
+3,heat,R1,2035,0,all-year,all-week,early-peak,gasboiler,2025,0.17080000000
+3,heat,R1,2035,1,all-year,all-week,early-peak,gasboiler,2025,0.17080000000
+3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2025,0.28750000000
+3,heat,R1,2035,4,all-year,all-week,early-peak,heatpump,2030,1.04170000000
+3,heat,R1,2035,6,all-year,all-week,early-peak,heatpump,2025,0.28750000000
+3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2030,1.04170000000
+3,heat,R2,2030,0,all-year,all-week,early-peak,gasboiler,2025,0.17080000000
+3,heat,R2,2030,1,all-year,all-week,early-peak,gasboiler,2025,0.17080000000
+3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2020,0.79170000000
+3,heat,R2,2030,3,all-year,all-week,early-peak,heatpump,2025,0.28750000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2020,0.79170000000
+3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2025,0.28750000000
+3,heat,R2,2035,0,all-year,all-week,early-peak,gasboiler,2025,0.17080000000
+3,heat,R2,2035,1,all-year,all-week,early-peak,gasboiler,2025,0.17080000000
+3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2025,0.28750000000
+3,heat,R2,2035,4,all-year,all-week,early-peak,heatpump,2030,1.04170000000
+3,heat,R2,2035,6,all-year,all-week,early-peak,heatpump,2025,0.28750000000
+3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2030,1.04170000000
+3,CO2f,R1,2030,0,all-year,all-week,early-peak,gasboiler,2025,11.05460000000
+3,CO2f,R1,2030,1,all-year,all-week,early-peak,gasboiler,2025,11.05460000000
+3,CO2f,R1,2035,0,all-year,all-week,early-peak,gasboiler,2025,11.05460000000
+3,CO2f,R1,2035,1,all-year,all-week,early-peak,gasboiler,2025,11.05460000000
+3,CO2f,R2,2030,0,all-year,all-week,early-peak,gasboiler,2025,11.05460000000
+3,CO2f,R2,2030,1,all-year,all-week,early-peak,gasboiler,2025,11.05460000000
+3,CO2f,R2,2035,0,all-year,all-week,early-peak,gasboiler,2025,11.05460000000
+3,CO2f,R2,2035,1,all-year,all-week,early-peak,gasboiler,2025,11.05460000000
+4,heat,R1,2030,0,all-year,all-week,late-peak,gasboiler,2025,0.34170000000
+4,heat,R1,2030,1,all-year,all-week,late-peak,gasboiler,2025,0.34170000000
+4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2020,1.58330000000
+4,heat,R1,2030,3,all-year,all-week,late-peak,heatpump,2025,0.57500000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2020,1.58330000000
+4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2025,0.57500000000
+4,heat,R1,2035,0,all-year,all-week,late-peak,gasboiler,2025,0.34170000000
+4,heat,R1,2035,1,all-year,all-week,late-peak,gasboiler,2025,0.34170000000
+4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2025,0.57500000000
+4,heat,R1,2035,4,all-year,all-week,late-peak,heatpump,2030,2.08330000000
+4,heat,R1,2035,6,all-year,all-week,late-peak,heatpump,2025,0.57500000000
+4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2030,2.08330000000
+4,heat,R2,2030,0,all-year,all-week,late-peak,gasboiler,2025,0.34170000000
+4,heat,R2,2030,1,all-year,all-week,late-peak,gasboiler,2025,0.34170000000
+4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2020,1.58330000000
+4,heat,R2,2030,3,all-year,all-week,late-peak,heatpump,2025,0.57500000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2020,1.58330000000
+4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2025,0.57500000000
+4,heat,R2,2035,0,all-year,all-week,late-peak,gasboiler,2025,0.34170000000
+4,heat,R2,2035,1,all-year,all-week,late-peak,gasboiler,2025,0.34170000000
+4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2025,0.57500000000
+4,heat,R2,2035,4,all-year,all-week,late-peak,heatpump,2030,2.08330000000
+4,heat,R2,2035,6,all-year,all-week,late-peak,heatpump,2025,0.57500000000
+4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2030,2.08330000000
+4,CO2f,R1,2030,0,all-year,all-week,late-peak,gasboiler,2025,22.10920000000
+4,CO2f,R1,2030,1,all-year,all-week,late-peak,gasboiler,2025,22.10920000000
+4,CO2f,R1,2035,0,all-year,all-week,late-peak,gasboiler,2025,22.10920000000
+4,CO2f,R1,2035,1,all-year,all-week,late-peak,gasboiler,2025,22.10920000000
+4,CO2f,R2,2030,0,all-year,all-week,late-peak,gasboiler,2025,22.10920000000
+4,CO2f,R2,2030,1,all-year,all-week,late-peak,gasboiler,2025,22.10920000000
+4,CO2f,R2,2035,0,all-year,all-week,late-peak,gasboiler,2025,22.10920000000
+4,CO2f,R2,2035,1,all-year,all-week,late-peak,gasboiler,2025,22.10920000000
+5,heat,R1,2030,0,all-year,all-week,evening,gasboiler,2025,0.22780000000
+5,heat,R1,2030,1,all-year,all-week,evening,gasboiler,2025,0.22780000000
+5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R1,2030,3,all-year,all-week,evening,heatpump,2025,0.38330000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2025,0.38330000000
+5,heat,R1,2035,0,all-year,all-week,evening,gasboiler,2025,0.22780000000
+5,heat,R1,2035,1,all-year,all-week,evening,gasboiler,2025,0.22780000000
+5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2025,0.38330000000
+5,heat,R1,2035,4,all-year,all-week,evening,heatpump,2030,1.38890000000
+5,heat,R1,2035,6,all-year,all-week,evening,heatpump,2025,0.38330000000
+5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2030,1.38890000000
+5,heat,R2,2030,0,all-year,all-week,evening,gasboiler,2025,0.22780000000
+5,heat,R2,2030,1,all-year,all-week,evening,gasboiler,2025,0.22780000000
+5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R2,2030,3,all-year,all-week,evening,heatpump,2025,0.38330000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2020,1.05560000000
+5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2025,0.38330000000
+5,heat,R2,2035,0,all-year,all-week,evening,gasboiler,2025,0.22780000000
+5,heat,R2,2035,1,all-year,all-week,evening,gasboiler,2025,0.22780000000
+5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2025,0.38330000000
+5,heat,R2,2035,4,all-year,all-week,evening,heatpump,2030,1.38890000000
+5,heat,R2,2035,6,all-year,all-week,evening,heatpump,2025,0.38330000000
+5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2030,1.38890000000
+5,CO2f,R1,2030,0,all-year,all-week,evening,gasboiler,2025,14.73950000000
+5,CO2f,R1,2030,1,all-year,all-week,evening,gasboiler,2025,14.73950000000
+5,CO2f,R1,2035,0,all-year,all-week,evening,gasboiler,2025,14.73950000000
+5,CO2f,R1,2035,1,all-year,all-week,evening,gasboiler,2025,14.73950000000
+5,CO2f,R2,2030,0,all-year,all-week,evening,gasboiler,2025,14.73950000000
+5,CO2f,R2,2030,1,all-year,all-week,evening,gasboiler,2025,14.73950000000
+5,CO2f,R2,2035,0,all-year,all-week,evening,gasboiler,2025,14.73950000000
+5,CO2f,R2,2035,1,all-year,all-week,evening,gasboiler,2025,14.73950000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2035.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2035.csv
index 21119f08b..953fbe67c 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2035.csv
@@ -1,193 +1,193 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2035,0,gasboiler,2025,all-year,all-week,night,0.11390000000
-0,heat,R1,2035,2,gasboiler,2025,all-year,all-week,night,0.11390000000
-0,heat,R1,2035,4,heatpump,2025,all-year,all-week,night,0.19170000000
-0,heat,R1,2035,5,heatpump,2030,all-year,all-week,night,0.69440000000
-0,heat,R1,2035,7,heatpump,2025,all-year,all-week,night,0.19170000000
-0,heat,R1,2035,8,heatpump,2030,all-year,all-week,night,0.69440000000
-0,heat,R1,2040,1,gasboiler,2035,all-year,all-week,night,0.02530000000
-0,heat,R1,2040,3,gasboiler,2035,all-year,all-week,night,0.02530000000
-0,heat,R1,2040,5,heatpump,2030,all-year,all-week,night,0.69440000000
-0,heat,R1,2040,6,heatpump,2035,all-year,all-week,night,0.44690000000
-0,heat,R1,2040,8,heatpump,2030,all-year,all-week,night,0.69440000000
-0,heat,R1,2040,9,heatpump,2035,all-year,all-week,night,0.44690000000
-0,heat,R2,2035,0,gasboiler,2025,all-year,all-week,night,0.11390000000
-0,heat,R2,2035,2,gasboiler,2025,all-year,all-week,night,0.11390000000
-0,heat,R2,2035,4,heatpump,2025,all-year,all-week,night,0.19170000000
-0,heat,R2,2035,5,heatpump,2030,all-year,all-week,night,0.69440000000
-0,heat,R2,2035,7,heatpump,2025,all-year,all-week,night,0.19170000000
-0,heat,R2,2035,8,heatpump,2030,all-year,all-week,night,0.69440000000
-0,heat,R2,2040,1,gasboiler,2035,all-year,all-week,night,0.02530000000
-0,heat,R2,2040,3,gasboiler,2035,all-year,all-week,night,0.02530000000
-0,heat,R2,2040,5,heatpump,2030,all-year,all-week,night,0.69440000000
-0,heat,R2,2040,6,heatpump,2035,all-year,all-week,night,0.44690000000
-0,heat,R2,2040,8,heatpump,2030,all-year,all-week,night,0.69440000000
-0,heat,R2,2040,9,heatpump,2035,all-year,all-week,night,0.44690000000
-0,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,night,7.36970000000
-0,CO2f,R1,2035,2,gasboiler,2025,all-year,all-week,night,7.36970000000
-0,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,night,1.63570000000
-0,CO2f,R1,2040,3,gasboiler,2035,all-year,all-week,night,1.63570000000
-0,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,night,7.36970000000
-0,CO2f,R2,2035,2,gasboiler,2025,all-year,all-week,night,7.36970000000
-0,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,night,1.63570000000
-0,CO2f,R2,2040,3,gasboiler,2035,all-year,all-week,night,1.63570000000
-1,heat,R1,2035,0,gasboiler,2025,all-year,all-week,morning,0.17080000000
-1,heat,R1,2035,2,gasboiler,2025,all-year,all-week,morning,0.17080000000
-1,heat,R1,2035,4,heatpump,2025,all-year,all-week,morning,0.28750000000
-1,heat,R1,2035,5,heatpump,2030,all-year,all-week,morning,1.04170000000
-1,heat,R1,2035,7,heatpump,2025,all-year,all-week,morning,0.28750000000
-1,heat,R1,2035,8,heatpump,2030,all-year,all-week,morning,1.04170000000
-1,heat,R1,2040,1,gasboiler,2035,all-year,all-week,morning,0.03790000000
-1,heat,R1,2040,3,gasboiler,2035,all-year,all-week,morning,0.03790000000
-1,heat,R1,2040,5,heatpump,2030,all-year,all-week,morning,1.04170000000
-1,heat,R1,2040,6,heatpump,2035,all-year,all-week,morning,0.67040000000
-1,heat,R1,2040,8,heatpump,2030,all-year,all-week,morning,1.04170000000
-1,heat,R1,2040,9,heatpump,2035,all-year,all-week,morning,0.67040000000
-1,heat,R2,2035,0,gasboiler,2025,all-year,all-week,morning,0.17080000000
-1,heat,R2,2035,2,gasboiler,2025,all-year,all-week,morning,0.17080000000
-1,heat,R2,2035,4,heatpump,2025,all-year,all-week,morning,0.28750000000
-1,heat,R2,2035,5,heatpump,2030,all-year,all-week,morning,1.04170000000
-1,heat,R2,2035,7,heatpump,2025,all-year,all-week,morning,0.28750000000
-1,heat,R2,2035,8,heatpump,2030,all-year,all-week,morning,1.04170000000
-1,heat,R2,2040,1,gasboiler,2035,all-year,all-week,morning,0.03790000000
-1,heat,R2,2040,3,gasboiler,2035,all-year,all-week,morning,0.03790000000
-1,heat,R2,2040,5,heatpump,2030,all-year,all-week,morning,1.04170000000
-1,heat,R2,2040,6,heatpump,2035,all-year,all-week,morning,0.67040000000
-1,heat,R2,2040,8,heatpump,2030,all-year,all-week,morning,1.04170000000
-1,heat,R2,2040,9,heatpump,2035,all-year,all-week,morning,0.67040000000
-1,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,morning,11.05460000000
-1,CO2f,R1,2035,2,gasboiler,2025,all-year,all-week,morning,11.05460000000
-1,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,morning,2.45360000000
-1,CO2f,R1,2040,3,gasboiler,2035,all-year,all-week,morning,2.45360000000
-1,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,morning,11.05460000000
-1,CO2f,R2,2035,2,gasboiler,2025,all-year,all-week,morning,11.05460000000
-1,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,morning,2.45360000000
-1,CO2f,R2,2040,3,gasboiler,2035,all-year,all-week,morning,2.45360000000
-2,heat,R1,2035,0,gasboiler,2025,all-year,all-week,afternoon,0.11390000000
-2,heat,R1,2035,2,gasboiler,2025,all-year,all-week,afternoon,0.11390000000
-2,heat,R1,2035,4,heatpump,2025,all-year,all-week,afternoon,0.19170000000
-2,heat,R1,2035,5,heatpump,2030,all-year,all-week,afternoon,0.69440000000
-2,heat,R1,2035,7,heatpump,2025,all-year,all-week,afternoon,0.19170000000
-2,heat,R1,2035,8,heatpump,2030,all-year,all-week,afternoon,0.69440000000
-2,heat,R1,2040,1,gasboiler,2035,all-year,all-week,afternoon,0.02530000000
-2,heat,R1,2040,3,gasboiler,2035,all-year,all-week,afternoon,0.02530000000
-2,heat,R1,2040,5,heatpump,2030,all-year,all-week,afternoon,0.69440000000
-2,heat,R1,2040,6,heatpump,2035,all-year,all-week,afternoon,0.44690000000
-2,heat,R1,2040,8,heatpump,2030,all-year,all-week,afternoon,0.69440000000
-2,heat,R1,2040,9,heatpump,2035,all-year,all-week,afternoon,0.44690000000
-2,heat,R2,2035,0,gasboiler,2025,all-year,all-week,afternoon,0.11390000000
-2,heat,R2,2035,2,gasboiler,2025,all-year,all-week,afternoon,0.11390000000
-2,heat,R2,2035,4,heatpump,2025,all-year,all-week,afternoon,0.19170000000
-2,heat,R2,2035,5,heatpump,2030,all-year,all-week,afternoon,0.69440000000
-2,heat,R2,2035,7,heatpump,2025,all-year,all-week,afternoon,0.19170000000
-2,heat,R2,2035,8,heatpump,2030,all-year,all-week,afternoon,0.69440000000
-2,heat,R2,2040,1,gasboiler,2035,all-year,all-week,afternoon,0.02530000000
-2,heat,R2,2040,3,gasboiler,2035,all-year,all-week,afternoon,0.02530000000
-2,heat,R2,2040,5,heatpump,2030,all-year,all-week,afternoon,0.69440000000
-2,heat,R2,2040,6,heatpump,2035,all-year,all-week,afternoon,0.44690000000
-2,heat,R2,2040,8,heatpump,2030,all-year,all-week,afternoon,0.69440000000
-2,heat,R2,2040,9,heatpump,2035,all-year,all-week,afternoon,0.44690000000
-2,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,afternoon,7.36970000000
-2,CO2f,R1,2035,2,gasboiler,2025,all-year,all-week,afternoon,7.36970000000
-2,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,afternoon,1.63570000000
-2,CO2f,R1,2040,3,gasboiler,2035,all-year,all-week,afternoon,1.63570000000
-2,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,afternoon,7.36970000000
-2,CO2f,R2,2035,2,gasboiler,2025,all-year,all-week,afternoon,7.36970000000
-2,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,afternoon,1.63570000000
-2,CO2f,R2,2040,3,gasboiler,2035,all-year,all-week,afternoon,1.63570000000
-3,heat,R1,2035,0,gasboiler,2025,all-year,all-week,early-peak,0.17080000000
-3,heat,R1,2035,2,gasboiler,2025,all-year,all-week,early-peak,0.17080000000
-3,heat,R1,2035,4,heatpump,2025,all-year,all-week,early-peak,0.28750000000
-3,heat,R1,2035,5,heatpump,2030,all-year,all-week,early-peak,1.04170000000
-3,heat,R1,2035,7,heatpump,2025,all-year,all-week,early-peak,0.28750000000
-3,heat,R1,2035,8,heatpump,2030,all-year,all-week,early-peak,1.04170000000
-3,heat,R1,2040,1,gasboiler,2035,all-year,all-week,early-peak,0.03790000000
-3,heat,R1,2040,3,gasboiler,2035,all-year,all-week,early-peak,0.03790000000
-3,heat,R1,2040,5,heatpump,2030,all-year,all-week,early-peak,1.04170000000
-3,heat,R1,2040,6,heatpump,2035,all-year,all-week,early-peak,0.67040000000
-3,heat,R1,2040,8,heatpump,2030,all-year,all-week,early-peak,1.04170000000
-3,heat,R1,2040,9,heatpump,2035,all-year,all-week,early-peak,0.67040000000
-3,heat,R2,2035,0,gasboiler,2025,all-year,all-week,early-peak,0.17080000000
-3,heat,R2,2035,2,gasboiler,2025,all-year,all-week,early-peak,0.17080000000
-3,heat,R2,2035,4,heatpump,2025,all-year,all-week,early-peak,0.28750000000
-3,heat,R2,2035,5,heatpump,2030,all-year,all-week,early-peak,1.04170000000
-3,heat,R2,2035,7,heatpump,2025,all-year,all-week,early-peak,0.28750000000
-3,heat,R2,2035,8,heatpump,2030,all-year,all-week,early-peak,1.04170000000
-3,heat,R2,2040,1,gasboiler,2035,all-year,all-week,early-peak,0.03790000000
-3,heat,R2,2040,3,gasboiler,2035,all-year,all-week,early-peak,0.03790000000
-3,heat,R2,2040,5,heatpump,2030,all-year,all-week,early-peak,1.04170000000
-3,heat,R2,2040,6,heatpump,2035,all-year,all-week,early-peak,0.67040000000
-3,heat,R2,2040,8,heatpump,2030,all-year,all-week,early-peak,1.04170000000
-3,heat,R2,2040,9,heatpump,2035,all-year,all-week,early-peak,0.67040000000
-3,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,early-peak,11.05460000000
-3,CO2f,R1,2035,2,gasboiler,2025,all-year,all-week,early-peak,11.05460000000
-3,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,early-peak,2.45360000000
-3,CO2f,R1,2040,3,gasboiler,2035,all-year,all-week,early-peak,2.45360000000
-3,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,early-peak,11.05460000000
-3,CO2f,R2,2035,2,gasboiler,2025,all-year,all-week,early-peak,11.05460000000
-3,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,early-peak,2.45360000000
-3,CO2f,R2,2040,3,gasboiler,2035,all-year,all-week,early-peak,2.45360000000
-4,heat,R1,2035,0,gasboiler,2025,all-year,all-week,late-peak,0.34170000000
-4,heat,R1,2035,2,gasboiler,2025,all-year,all-week,late-peak,0.34170000000
-4,heat,R1,2035,4,heatpump,2025,all-year,all-week,late-peak,0.57500000000
-4,heat,R1,2035,5,heatpump,2030,all-year,all-week,late-peak,2.08330000000
-4,heat,R1,2035,7,heatpump,2025,all-year,all-week,late-peak,0.57500000000
-4,heat,R1,2035,8,heatpump,2030,all-year,all-week,late-peak,2.08330000000
-4,heat,R1,2040,1,gasboiler,2035,all-year,all-week,late-peak,0.07580000000
-4,heat,R1,2040,3,gasboiler,2035,all-year,all-week,late-peak,0.07580000000
-4,heat,R1,2040,5,heatpump,2030,all-year,all-week,late-peak,2.08330000000
-4,heat,R1,2040,6,heatpump,2035,all-year,all-week,late-peak,1.34080000000
-4,heat,R1,2040,8,heatpump,2030,all-year,all-week,late-peak,2.08330000000
-4,heat,R1,2040,9,heatpump,2035,all-year,all-week,late-peak,1.34080000000
-4,heat,R2,2035,0,gasboiler,2025,all-year,all-week,late-peak,0.34170000000
-4,heat,R2,2035,2,gasboiler,2025,all-year,all-week,late-peak,0.34170000000
-4,heat,R2,2035,4,heatpump,2025,all-year,all-week,late-peak,0.57500000000
-4,heat,R2,2035,5,heatpump,2030,all-year,all-week,late-peak,2.08330000000
-4,heat,R2,2035,7,heatpump,2025,all-year,all-week,late-peak,0.57500000000
-4,heat,R2,2035,8,heatpump,2030,all-year,all-week,late-peak,2.08330000000
-4,heat,R2,2040,1,gasboiler,2035,all-year,all-week,late-peak,0.07580000000
-4,heat,R2,2040,3,gasboiler,2035,all-year,all-week,late-peak,0.07580000000
-4,heat,R2,2040,5,heatpump,2030,all-year,all-week,late-peak,2.08330000000
-4,heat,R2,2040,6,heatpump,2035,all-year,all-week,late-peak,1.34080000000
-4,heat,R2,2040,8,heatpump,2030,all-year,all-week,late-peak,2.08330000000
-4,heat,R2,2040,9,heatpump,2035,all-year,all-week,late-peak,1.34080000000
-4,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,late-peak,22.10920000000
-4,CO2f,R1,2035,2,gasboiler,2025,all-year,all-week,late-peak,22.10920000000
-4,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,late-peak,4.90720000000
-4,CO2f,R1,2040,3,gasboiler,2035,all-year,all-week,late-peak,4.90720000000
-4,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,late-peak,22.10920000000
-4,CO2f,R2,2035,2,gasboiler,2025,all-year,all-week,late-peak,22.10920000000
-4,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,late-peak,4.90720000000
-4,CO2f,R2,2040,3,gasboiler,2035,all-year,all-week,late-peak,4.90720000000
-5,heat,R1,2035,0,gasboiler,2025,all-year,all-week,evening,0.22780000000
-5,heat,R1,2035,2,gasboiler,2025,all-year,all-week,evening,0.22780000000
-5,heat,R1,2035,4,heatpump,2025,all-year,all-week,evening,0.38330000000
-5,heat,R1,2035,5,heatpump,2030,all-year,all-week,evening,1.38890000000
-5,heat,R1,2035,7,heatpump,2025,all-year,all-week,evening,0.38330000000
-5,heat,R1,2035,8,heatpump,2030,all-year,all-week,evening,1.38890000000
-5,heat,R1,2040,1,gasboiler,2035,all-year,all-week,evening,0.05060000000
-5,heat,R1,2040,3,gasboiler,2035,all-year,all-week,evening,0.05060000000
-5,heat,R1,2040,5,heatpump,2030,all-year,all-week,evening,1.38890000000
-5,heat,R1,2040,6,heatpump,2035,all-year,all-week,evening,0.89390000000
-5,heat,R1,2040,8,heatpump,2030,all-year,all-week,evening,1.38890000000
-5,heat,R1,2040,9,heatpump,2035,all-year,all-week,evening,0.89390000000
-5,heat,R2,2035,0,gasboiler,2025,all-year,all-week,evening,0.22780000000
-5,heat,R2,2035,2,gasboiler,2025,all-year,all-week,evening,0.22780000000
-5,heat,R2,2035,4,heatpump,2025,all-year,all-week,evening,0.38330000000
-5,heat,R2,2035,5,heatpump,2030,all-year,all-week,evening,1.38890000000
-5,heat,R2,2035,7,heatpump,2025,all-year,all-week,evening,0.38330000000
-5,heat,R2,2035,8,heatpump,2030,all-year,all-week,evening,1.38890000000
-5,heat,R2,2040,1,gasboiler,2035,all-year,all-week,evening,0.05060000000
-5,heat,R2,2040,3,gasboiler,2035,all-year,all-week,evening,0.05060000000
-5,heat,R2,2040,5,heatpump,2030,all-year,all-week,evening,1.38890000000
-5,heat,R2,2040,6,heatpump,2035,all-year,all-week,evening,0.89390000000
-5,heat,R2,2040,8,heatpump,2030,all-year,all-week,evening,1.38890000000
-5,heat,R2,2040,9,heatpump,2035,all-year,all-week,evening,0.89390000000
-5,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,evening,14.73950000000
-5,CO2f,R1,2035,2,gasboiler,2025,all-year,all-week,evening,14.73950000000
-5,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,evening,3.27140000000
-5,CO2f,R1,2040,3,gasboiler,2035,all-year,all-week,evening,3.27140000000
-5,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,evening,14.73950000000
-5,CO2f,R2,2035,2,gasboiler,2025,all-year,all-week,evening,14.73950000000
-5,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,evening,3.27140000000
-5,CO2f,R2,2040,3,gasboiler,2035,all-year,all-week,evening,3.27140000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2035,0,all-year,all-week,night,gasboiler,2025,0.11390000000
+0,heat,R1,2035,2,all-year,all-week,night,gasboiler,2025,0.11390000000
+0,heat,R1,2035,4,all-year,all-week,night,heatpump,2025,0.19170000000
+0,heat,R1,2035,5,all-year,all-week,night,heatpump,2030,0.69440000000
+0,heat,R1,2035,7,all-year,all-week,night,heatpump,2025,0.19170000000
+0,heat,R1,2035,8,all-year,all-week,night,heatpump,2030,0.69440000000
+0,heat,R1,2040,1,all-year,all-week,night,gasboiler,2035,0.02530000000
+0,heat,R1,2040,3,all-year,all-week,night,gasboiler,2035,0.02530000000
+0,heat,R1,2040,5,all-year,all-week,night,heatpump,2030,0.69440000000
+0,heat,R1,2040,6,all-year,all-week,night,heatpump,2035,0.44690000000
+0,heat,R1,2040,8,all-year,all-week,night,heatpump,2030,0.69440000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2035,0.44690000000
+0,heat,R2,2035,0,all-year,all-week,night,gasboiler,2025,0.11390000000
+0,heat,R2,2035,2,all-year,all-week,night,gasboiler,2025,0.11390000000
+0,heat,R2,2035,4,all-year,all-week,night,heatpump,2025,0.19170000000
+0,heat,R2,2035,5,all-year,all-week,night,heatpump,2030,0.69440000000
+0,heat,R2,2035,7,all-year,all-week,night,heatpump,2025,0.19170000000
+0,heat,R2,2035,8,all-year,all-week,night,heatpump,2030,0.69440000000
+0,heat,R2,2040,1,all-year,all-week,night,gasboiler,2035,0.02530000000
+0,heat,R2,2040,3,all-year,all-week,night,gasboiler,2035,0.02530000000
+0,heat,R2,2040,5,all-year,all-week,night,heatpump,2030,0.69440000000
+0,heat,R2,2040,6,all-year,all-week,night,heatpump,2035,0.44690000000
+0,heat,R2,2040,8,all-year,all-week,night,heatpump,2030,0.69440000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2035,0.44690000000
+0,CO2f,R1,2035,0,all-year,all-week,night,gasboiler,2025,7.36970000000
+0,CO2f,R1,2035,2,all-year,all-week,night,gasboiler,2025,7.36970000000
+0,CO2f,R1,2040,1,all-year,all-week,night,gasboiler,2035,1.63570000000
+0,CO2f,R1,2040,3,all-year,all-week,night,gasboiler,2035,1.63570000000
+0,CO2f,R2,2035,0,all-year,all-week,night,gasboiler,2025,7.36970000000
+0,CO2f,R2,2035,2,all-year,all-week,night,gasboiler,2025,7.36970000000
+0,CO2f,R2,2040,1,all-year,all-week,night,gasboiler,2035,1.63570000000
+0,CO2f,R2,2040,3,all-year,all-week,night,gasboiler,2035,1.63570000000
+1,heat,R1,2035,0,all-year,all-week,morning,gasboiler,2025,0.17080000000
+1,heat,R1,2035,2,all-year,all-week,morning,gasboiler,2025,0.17080000000
+1,heat,R1,2035,4,all-year,all-week,morning,heatpump,2025,0.28750000000
+1,heat,R1,2035,5,all-year,all-week,morning,heatpump,2030,1.04170000000
+1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2025,0.28750000000
+1,heat,R1,2035,8,all-year,all-week,morning,heatpump,2030,1.04170000000
+1,heat,R1,2040,1,all-year,all-week,morning,gasboiler,2035,0.03790000000
+1,heat,R1,2040,3,all-year,all-week,morning,gasboiler,2035,0.03790000000
+1,heat,R1,2040,5,all-year,all-week,morning,heatpump,2030,1.04170000000
+1,heat,R1,2040,6,all-year,all-week,morning,heatpump,2035,0.67040000000
+1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2030,1.04170000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2035,0.67040000000
+1,heat,R2,2035,0,all-year,all-week,morning,gasboiler,2025,0.17080000000
+1,heat,R2,2035,2,all-year,all-week,morning,gasboiler,2025,0.17080000000
+1,heat,R2,2035,4,all-year,all-week,morning,heatpump,2025,0.28750000000
+1,heat,R2,2035,5,all-year,all-week,morning,heatpump,2030,1.04170000000
+1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2025,0.28750000000
+1,heat,R2,2035,8,all-year,all-week,morning,heatpump,2030,1.04170000000
+1,heat,R2,2040,1,all-year,all-week,morning,gasboiler,2035,0.03790000000
+1,heat,R2,2040,3,all-year,all-week,morning,gasboiler,2035,0.03790000000
+1,heat,R2,2040,5,all-year,all-week,morning,heatpump,2030,1.04170000000
+1,heat,R2,2040,6,all-year,all-week,morning,heatpump,2035,0.67040000000
+1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2030,1.04170000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2035,0.67040000000
+1,CO2f,R1,2035,0,all-year,all-week,morning,gasboiler,2025,11.05460000000
+1,CO2f,R1,2035,2,all-year,all-week,morning,gasboiler,2025,11.05460000000
+1,CO2f,R1,2040,1,all-year,all-week,morning,gasboiler,2035,2.45360000000
+1,CO2f,R1,2040,3,all-year,all-week,morning,gasboiler,2035,2.45360000000
+1,CO2f,R2,2035,0,all-year,all-week,morning,gasboiler,2025,11.05460000000
+1,CO2f,R2,2035,2,all-year,all-week,morning,gasboiler,2025,11.05460000000
+1,CO2f,R2,2040,1,all-year,all-week,morning,gasboiler,2035,2.45360000000
+1,CO2f,R2,2040,3,all-year,all-week,morning,gasboiler,2035,2.45360000000
+2,heat,R1,2035,0,all-year,all-week,afternoon,gasboiler,2025,0.11390000000
+2,heat,R1,2035,2,all-year,all-week,afternoon,gasboiler,2025,0.11390000000
+2,heat,R1,2035,4,all-year,all-week,afternoon,heatpump,2025,0.19170000000
+2,heat,R1,2035,5,all-year,all-week,afternoon,heatpump,2030,0.69440000000
+2,heat,R1,2035,7,all-year,all-week,afternoon,heatpump,2025,0.19170000000
+2,heat,R1,2035,8,all-year,all-week,afternoon,heatpump,2030,0.69440000000
+2,heat,R1,2040,1,all-year,all-week,afternoon,gasboiler,2035,0.02530000000
+2,heat,R1,2040,3,all-year,all-week,afternoon,gasboiler,2035,0.02530000000
+2,heat,R1,2040,5,all-year,all-week,afternoon,heatpump,2030,0.69440000000
+2,heat,R1,2040,6,all-year,all-week,afternoon,heatpump,2035,0.44690000000
+2,heat,R1,2040,8,all-year,all-week,afternoon,heatpump,2030,0.69440000000
+2,heat,R1,2040,9,all-year,all-week,afternoon,heatpump,2035,0.44690000000
+2,heat,R2,2035,0,all-year,all-week,afternoon,gasboiler,2025,0.11390000000
+2,heat,R2,2035,2,all-year,all-week,afternoon,gasboiler,2025,0.11390000000
+2,heat,R2,2035,4,all-year,all-week,afternoon,heatpump,2025,0.19170000000
+2,heat,R2,2035,5,all-year,all-week,afternoon,heatpump,2030,0.69440000000
+2,heat,R2,2035,7,all-year,all-week,afternoon,heatpump,2025,0.19170000000
+2,heat,R2,2035,8,all-year,all-week,afternoon,heatpump,2030,0.69440000000
+2,heat,R2,2040,1,all-year,all-week,afternoon,gasboiler,2035,0.02530000000
+2,heat,R2,2040,3,all-year,all-week,afternoon,gasboiler,2035,0.02530000000
+2,heat,R2,2040,5,all-year,all-week,afternoon,heatpump,2030,0.69440000000
+2,heat,R2,2040,6,all-year,all-week,afternoon,heatpump,2035,0.44690000000
+2,heat,R2,2040,8,all-year,all-week,afternoon,heatpump,2030,0.69440000000
+2,heat,R2,2040,9,all-year,all-week,afternoon,heatpump,2035,0.44690000000
+2,CO2f,R1,2035,0,all-year,all-week,afternoon,gasboiler,2025,7.36970000000
+2,CO2f,R1,2035,2,all-year,all-week,afternoon,gasboiler,2025,7.36970000000
+2,CO2f,R1,2040,1,all-year,all-week,afternoon,gasboiler,2035,1.63570000000
+2,CO2f,R1,2040,3,all-year,all-week,afternoon,gasboiler,2035,1.63570000000
+2,CO2f,R2,2035,0,all-year,all-week,afternoon,gasboiler,2025,7.36970000000
+2,CO2f,R2,2035,2,all-year,all-week,afternoon,gasboiler,2025,7.36970000000
+2,CO2f,R2,2040,1,all-year,all-week,afternoon,gasboiler,2035,1.63570000000
+2,CO2f,R2,2040,3,all-year,all-week,afternoon,gasboiler,2035,1.63570000000
+3,heat,R1,2035,0,all-year,all-week,early-peak,gasboiler,2025,0.17080000000
+3,heat,R1,2035,2,all-year,all-week,early-peak,gasboiler,2025,0.17080000000
+3,heat,R1,2035,4,all-year,all-week,early-peak,heatpump,2025,0.28750000000
+3,heat,R1,2035,5,all-year,all-week,early-peak,heatpump,2030,1.04170000000
+3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2025,0.28750000000
+3,heat,R1,2035,8,all-year,all-week,early-peak,heatpump,2030,1.04170000000
+3,heat,R1,2040,1,all-year,all-week,early-peak,gasboiler,2035,0.03790000000
+3,heat,R1,2040,3,all-year,all-week,early-peak,gasboiler,2035,0.03790000000
+3,heat,R1,2040,5,all-year,all-week,early-peak,heatpump,2030,1.04170000000
+3,heat,R1,2040,6,all-year,all-week,early-peak,heatpump,2035,0.67040000000
+3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2030,1.04170000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2035,0.67040000000
+3,heat,R2,2035,0,all-year,all-week,early-peak,gasboiler,2025,0.17080000000
+3,heat,R2,2035,2,all-year,all-week,early-peak,gasboiler,2025,0.17080000000
+3,heat,R2,2035,4,all-year,all-week,early-peak,heatpump,2025,0.28750000000
+3,heat,R2,2035,5,all-year,all-week,early-peak,heatpump,2030,1.04170000000
+3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2025,0.28750000000
+3,heat,R2,2035,8,all-year,all-week,early-peak,heatpump,2030,1.04170000000
+3,heat,R2,2040,1,all-year,all-week,early-peak,gasboiler,2035,0.03790000000
+3,heat,R2,2040,3,all-year,all-week,early-peak,gasboiler,2035,0.03790000000
+3,heat,R2,2040,5,all-year,all-week,early-peak,heatpump,2030,1.04170000000
+3,heat,R2,2040,6,all-year,all-week,early-peak,heatpump,2035,0.67040000000
+3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2030,1.04170000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2035,0.67040000000
+3,CO2f,R1,2035,0,all-year,all-week,early-peak,gasboiler,2025,11.05460000000
+3,CO2f,R1,2035,2,all-year,all-week,early-peak,gasboiler,2025,11.05460000000
+3,CO2f,R1,2040,1,all-year,all-week,early-peak,gasboiler,2035,2.45360000000
+3,CO2f,R1,2040,3,all-year,all-week,early-peak,gasboiler,2035,2.45360000000
+3,CO2f,R2,2035,0,all-year,all-week,early-peak,gasboiler,2025,11.05460000000
+3,CO2f,R2,2035,2,all-year,all-week,early-peak,gasboiler,2025,11.05460000000
+3,CO2f,R2,2040,1,all-year,all-week,early-peak,gasboiler,2035,2.45360000000
+3,CO2f,R2,2040,3,all-year,all-week,early-peak,gasboiler,2035,2.45360000000
+4,heat,R1,2035,0,all-year,all-week,late-peak,gasboiler,2025,0.34170000000
+4,heat,R1,2035,2,all-year,all-week,late-peak,gasboiler,2025,0.34170000000
+4,heat,R1,2035,4,all-year,all-week,late-peak,heatpump,2025,0.57500000000
+4,heat,R1,2035,5,all-year,all-week,late-peak,heatpump,2030,2.08330000000
+4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2025,0.57500000000
+4,heat,R1,2035,8,all-year,all-week,late-peak,heatpump,2030,2.08330000000
+4,heat,R1,2040,1,all-year,all-week,late-peak,gasboiler,2035,0.07580000000
+4,heat,R1,2040,3,all-year,all-week,late-peak,gasboiler,2035,0.07580000000
+4,heat,R1,2040,5,all-year,all-week,late-peak,heatpump,2030,2.08330000000
+4,heat,R1,2040,6,all-year,all-week,late-peak,heatpump,2035,1.34080000000
+4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2030,2.08330000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2035,1.34080000000
+4,heat,R2,2035,0,all-year,all-week,late-peak,gasboiler,2025,0.34170000000
+4,heat,R2,2035,2,all-year,all-week,late-peak,gasboiler,2025,0.34170000000
+4,heat,R2,2035,4,all-year,all-week,late-peak,heatpump,2025,0.57500000000
+4,heat,R2,2035,5,all-year,all-week,late-peak,heatpump,2030,2.08330000000
+4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2025,0.57500000000
+4,heat,R2,2035,8,all-year,all-week,late-peak,heatpump,2030,2.08330000000
+4,heat,R2,2040,1,all-year,all-week,late-peak,gasboiler,2035,0.07580000000
+4,heat,R2,2040,3,all-year,all-week,late-peak,gasboiler,2035,0.07580000000
+4,heat,R2,2040,5,all-year,all-week,late-peak,heatpump,2030,2.08330000000
+4,heat,R2,2040,6,all-year,all-week,late-peak,heatpump,2035,1.34080000000
+4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2030,2.08330000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2035,1.34080000000
+4,CO2f,R1,2035,0,all-year,all-week,late-peak,gasboiler,2025,22.10920000000
+4,CO2f,R1,2035,2,all-year,all-week,late-peak,gasboiler,2025,22.10920000000
+4,CO2f,R1,2040,1,all-year,all-week,late-peak,gasboiler,2035,4.90720000000
+4,CO2f,R1,2040,3,all-year,all-week,late-peak,gasboiler,2035,4.90720000000
+4,CO2f,R2,2035,0,all-year,all-week,late-peak,gasboiler,2025,22.10920000000
+4,CO2f,R2,2035,2,all-year,all-week,late-peak,gasboiler,2025,22.10920000000
+4,CO2f,R2,2040,1,all-year,all-week,late-peak,gasboiler,2035,4.90720000000
+4,CO2f,R2,2040,3,all-year,all-week,late-peak,gasboiler,2035,4.90720000000
+5,heat,R1,2035,0,all-year,all-week,evening,gasboiler,2025,0.22780000000
+5,heat,R1,2035,2,all-year,all-week,evening,gasboiler,2025,0.22780000000
+5,heat,R1,2035,4,all-year,all-week,evening,heatpump,2025,0.38330000000
+5,heat,R1,2035,5,all-year,all-week,evening,heatpump,2030,1.38890000000
+5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2025,0.38330000000
+5,heat,R1,2035,8,all-year,all-week,evening,heatpump,2030,1.38890000000
+5,heat,R1,2040,1,all-year,all-week,evening,gasboiler,2035,0.05060000000
+5,heat,R1,2040,3,all-year,all-week,evening,gasboiler,2035,0.05060000000
+5,heat,R1,2040,5,all-year,all-week,evening,heatpump,2030,1.38890000000
+5,heat,R1,2040,6,all-year,all-week,evening,heatpump,2035,0.89390000000
+5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2030,1.38890000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2035,0.89390000000
+5,heat,R2,2035,0,all-year,all-week,evening,gasboiler,2025,0.22780000000
+5,heat,R2,2035,2,all-year,all-week,evening,gasboiler,2025,0.22780000000
+5,heat,R2,2035,4,all-year,all-week,evening,heatpump,2025,0.38330000000
+5,heat,R2,2035,5,all-year,all-week,evening,heatpump,2030,1.38890000000
+5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2025,0.38330000000
+5,heat,R2,2035,8,all-year,all-week,evening,heatpump,2030,1.38890000000
+5,heat,R2,2040,1,all-year,all-week,evening,gasboiler,2035,0.05060000000
+5,heat,R2,2040,3,all-year,all-week,evening,gasboiler,2035,0.05060000000
+5,heat,R2,2040,5,all-year,all-week,evening,heatpump,2030,1.38890000000
+5,heat,R2,2040,6,all-year,all-week,evening,heatpump,2035,0.89390000000
+5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2030,1.38890000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2035,0.89390000000
+5,CO2f,R1,2035,0,all-year,all-week,evening,gasboiler,2025,14.73950000000
+5,CO2f,R1,2035,2,all-year,all-week,evening,gasboiler,2025,14.73950000000
+5,CO2f,R1,2040,1,all-year,all-week,evening,gasboiler,2035,3.27140000000
+5,CO2f,R1,2040,3,all-year,all-week,evening,gasboiler,2035,3.27140000000
+5,CO2f,R2,2035,0,all-year,all-week,evening,gasboiler,2025,14.73950000000
+5,CO2f,R2,2035,2,all-year,all-week,evening,gasboiler,2025,14.73950000000
+5,CO2f,R2,2040,1,all-year,all-week,evening,gasboiler,2035,3.27140000000
+5,CO2f,R2,2040,3,all-year,all-week,evening,gasboiler,2035,3.27140000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2040.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2040.csv
index 503b4b8c3..af3cd1082 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2040.csv
@@ -1,193 +1,193 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2040,0,gasboiler,2035,all-year,all-week,night,0.02530000000
-0,heat,R1,2040,1,gasboiler,2035,all-year,all-week,night,0.02530000000
-0,heat,R1,2040,2,heatpump,2030,all-year,all-week,night,0.69440000000
-0,heat,R1,2040,3,heatpump,2035,all-year,all-week,night,0.44690000000
-0,heat,R1,2040,5,heatpump,2030,all-year,all-week,night,0.69440000000
-0,heat,R1,2040,6,heatpump,2035,all-year,all-week,night,0.44690000000
-0,heat,R1,2045,0,gasboiler,2035,all-year,all-week,night,0.02530000000
-0,heat,R1,2045,1,gasboiler,2035,all-year,all-week,night,0.02530000000
-0,heat,R1,2045,3,heatpump,2035,all-year,all-week,night,0.44690000000
-0,heat,R1,2045,4,heatpump,2040,all-year,all-week,night,0.86110000000
-0,heat,R1,2045,6,heatpump,2035,all-year,all-week,night,0.44690000000
-0,heat,R1,2045,7,heatpump,2040,all-year,all-week,night,0.86110000000
-0,heat,R2,2040,0,gasboiler,2035,all-year,all-week,night,0.02530000000
-0,heat,R2,2040,1,gasboiler,2035,all-year,all-week,night,0.02530000000
-0,heat,R2,2040,2,heatpump,2030,all-year,all-week,night,0.69440000000
-0,heat,R2,2040,3,heatpump,2035,all-year,all-week,night,0.44690000000
-0,heat,R2,2040,5,heatpump,2030,all-year,all-week,night,0.69440000000
-0,heat,R2,2040,6,heatpump,2035,all-year,all-week,night,0.44690000000
-0,heat,R2,2045,0,gasboiler,2035,all-year,all-week,night,0.02530000000
-0,heat,R2,2045,1,gasboiler,2035,all-year,all-week,night,0.02530000000
-0,heat,R2,2045,3,heatpump,2035,all-year,all-week,night,0.44690000000
-0,heat,R2,2045,4,heatpump,2040,all-year,all-week,night,0.86110000000
-0,heat,R2,2045,6,heatpump,2035,all-year,all-week,night,0.44690000000
-0,heat,R2,2045,7,heatpump,2040,all-year,all-week,night,0.86110000000
-0,CO2f,R1,2040,0,gasboiler,2035,all-year,all-week,night,1.63570000000
-0,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,night,1.63570000000
-0,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,night,1.63570000000
-0,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,night,1.63570000000
-0,CO2f,R2,2040,0,gasboiler,2035,all-year,all-week,night,1.63570000000
-0,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,night,1.63570000000
-0,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,night,1.63570000000
-0,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,night,1.63570000000
-1,heat,R1,2040,0,gasboiler,2035,all-year,all-week,morning,0.03790000000
-1,heat,R1,2040,1,gasboiler,2035,all-year,all-week,morning,0.03790000000
-1,heat,R1,2040,2,heatpump,2030,all-year,all-week,morning,1.04170000000
-1,heat,R1,2040,3,heatpump,2035,all-year,all-week,morning,0.67040000000
-1,heat,R1,2040,5,heatpump,2030,all-year,all-week,morning,1.04170000000
-1,heat,R1,2040,6,heatpump,2035,all-year,all-week,morning,0.67040000000
-1,heat,R1,2045,0,gasboiler,2035,all-year,all-week,morning,0.03790000000
-1,heat,R1,2045,1,gasboiler,2035,all-year,all-week,morning,0.03790000000
-1,heat,R1,2045,3,heatpump,2035,all-year,all-week,morning,0.67040000000
-1,heat,R1,2045,4,heatpump,2040,all-year,all-week,morning,1.29170000000
-1,heat,R1,2045,6,heatpump,2035,all-year,all-week,morning,0.67040000000
-1,heat,R1,2045,7,heatpump,2040,all-year,all-week,morning,1.29170000000
-1,heat,R2,2040,0,gasboiler,2035,all-year,all-week,morning,0.03790000000
-1,heat,R2,2040,1,gasboiler,2035,all-year,all-week,morning,0.03790000000
-1,heat,R2,2040,2,heatpump,2030,all-year,all-week,morning,1.04170000000
-1,heat,R2,2040,3,heatpump,2035,all-year,all-week,morning,0.67040000000
-1,heat,R2,2040,5,heatpump,2030,all-year,all-week,morning,1.04170000000
-1,heat,R2,2040,6,heatpump,2035,all-year,all-week,morning,0.67040000000
-1,heat,R2,2045,0,gasboiler,2035,all-year,all-week,morning,0.03790000000
-1,heat,R2,2045,1,gasboiler,2035,all-year,all-week,morning,0.03790000000
-1,heat,R2,2045,3,heatpump,2035,all-year,all-week,morning,0.67040000000
-1,heat,R2,2045,4,heatpump,2040,all-year,all-week,morning,1.29170000000
-1,heat,R2,2045,6,heatpump,2035,all-year,all-week,morning,0.67040000000
-1,heat,R2,2045,7,heatpump,2040,all-year,all-week,morning,1.29170000000
-1,CO2f,R1,2040,0,gasboiler,2035,all-year,all-week,morning,2.45360000000
-1,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,morning,2.45360000000
-1,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,morning,2.45360000000
-1,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,morning,2.45360000000
-1,CO2f,R2,2040,0,gasboiler,2035,all-year,all-week,morning,2.45360000000
-1,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,morning,2.45360000000
-1,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,morning,2.45360000000
-1,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,morning,2.45360000000
-2,heat,R1,2040,0,gasboiler,2035,all-year,all-week,afternoon,0.02530000000
-2,heat,R1,2040,1,gasboiler,2035,all-year,all-week,afternoon,0.02530000000
-2,heat,R1,2040,2,heatpump,2030,all-year,all-week,afternoon,0.69440000000
-2,heat,R1,2040,3,heatpump,2035,all-year,all-week,afternoon,0.44690000000
-2,heat,R1,2040,5,heatpump,2030,all-year,all-week,afternoon,0.69440000000
-2,heat,R1,2040,6,heatpump,2035,all-year,all-week,afternoon,0.44690000000
-2,heat,R1,2045,0,gasboiler,2035,all-year,all-week,afternoon,0.02530000000
-2,heat,R1,2045,1,gasboiler,2035,all-year,all-week,afternoon,0.02530000000
-2,heat,R1,2045,3,heatpump,2035,all-year,all-week,afternoon,0.44690000000
-2,heat,R1,2045,4,heatpump,2040,all-year,all-week,afternoon,0.86110000000
-2,heat,R1,2045,6,heatpump,2035,all-year,all-week,afternoon,0.44690000000
-2,heat,R1,2045,7,heatpump,2040,all-year,all-week,afternoon,0.86110000000
-2,heat,R2,2040,0,gasboiler,2035,all-year,all-week,afternoon,0.02530000000
-2,heat,R2,2040,1,gasboiler,2035,all-year,all-week,afternoon,0.02530000000
-2,heat,R2,2040,2,heatpump,2030,all-year,all-week,afternoon,0.69440000000
-2,heat,R2,2040,3,heatpump,2035,all-year,all-week,afternoon,0.44690000000
-2,heat,R2,2040,5,heatpump,2030,all-year,all-week,afternoon,0.69440000000
-2,heat,R2,2040,6,heatpump,2035,all-year,all-week,afternoon,0.44690000000
-2,heat,R2,2045,0,gasboiler,2035,all-year,all-week,afternoon,0.02530000000
-2,heat,R2,2045,1,gasboiler,2035,all-year,all-week,afternoon,0.02530000000
-2,heat,R2,2045,3,heatpump,2035,all-year,all-week,afternoon,0.44690000000
-2,heat,R2,2045,4,heatpump,2040,all-year,all-week,afternoon,0.86110000000
-2,heat,R2,2045,6,heatpump,2035,all-year,all-week,afternoon,0.44690000000
-2,heat,R2,2045,7,heatpump,2040,all-year,all-week,afternoon,0.86110000000
-2,CO2f,R1,2040,0,gasboiler,2035,all-year,all-week,afternoon,1.63570000000
-2,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,afternoon,1.63570000000
-2,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,afternoon,1.63570000000
-2,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,afternoon,1.63570000000
-2,CO2f,R2,2040,0,gasboiler,2035,all-year,all-week,afternoon,1.63570000000
-2,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,afternoon,1.63570000000
-2,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,afternoon,1.63570000000
-2,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,afternoon,1.63570000000
-3,heat,R1,2040,0,gasboiler,2035,all-year,all-week,early-peak,0.03790000000
-3,heat,R1,2040,1,gasboiler,2035,all-year,all-week,early-peak,0.03790000000
-3,heat,R1,2040,2,heatpump,2030,all-year,all-week,early-peak,1.04170000000
-3,heat,R1,2040,3,heatpump,2035,all-year,all-week,early-peak,0.67040000000
-3,heat,R1,2040,5,heatpump,2030,all-year,all-week,early-peak,1.04170000000
-3,heat,R1,2040,6,heatpump,2035,all-year,all-week,early-peak,0.67040000000
-3,heat,R1,2045,0,gasboiler,2035,all-year,all-week,early-peak,0.03790000000
-3,heat,R1,2045,1,gasboiler,2035,all-year,all-week,early-peak,0.03790000000
-3,heat,R1,2045,3,heatpump,2035,all-year,all-week,early-peak,0.67040000000
-3,heat,R1,2045,4,heatpump,2040,all-year,all-week,early-peak,1.29170000000
-3,heat,R1,2045,6,heatpump,2035,all-year,all-week,early-peak,0.67040000000
-3,heat,R1,2045,7,heatpump,2040,all-year,all-week,early-peak,1.29170000000
-3,heat,R2,2040,0,gasboiler,2035,all-year,all-week,early-peak,0.03790000000
-3,heat,R2,2040,1,gasboiler,2035,all-year,all-week,early-peak,0.03790000000
-3,heat,R2,2040,2,heatpump,2030,all-year,all-week,early-peak,1.04170000000
-3,heat,R2,2040,3,heatpump,2035,all-year,all-week,early-peak,0.67040000000
-3,heat,R2,2040,5,heatpump,2030,all-year,all-week,early-peak,1.04170000000
-3,heat,R2,2040,6,heatpump,2035,all-year,all-week,early-peak,0.67040000000
-3,heat,R2,2045,0,gasboiler,2035,all-year,all-week,early-peak,0.03790000000
-3,heat,R2,2045,1,gasboiler,2035,all-year,all-week,early-peak,0.03790000000
-3,heat,R2,2045,3,heatpump,2035,all-year,all-week,early-peak,0.67040000000
-3,heat,R2,2045,4,heatpump,2040,all-year,all-week,early-peak,1.29170000000
-3,heat,R2,2045,6,heatpump,2035,all-year,all-week,early-peak,0.67040000000
-3,heat,R2,2045,7,heatpump,2040,all-year,all-week,early-peak,1.29170000000
-3,CO2f,R1,2040,0,gasboiler,2035,all-year,all-week,early-peak,2.45360000000
-3,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,early-peak,2.45360000000
-3,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,early-peak,2.45360000000
-3,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,early-peak,2.45360000000
-3,CO2f,R2,2040,0,gasboiler,2035,all-year,all-week,early-peak,2.45360000000
-3,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,early-peak,2.45360000000
-3,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,early-peak,2.45360000000
-3,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,early-peak,2.45360000000
-4,heat,R1,2040,0,gasboiler,2035,all-year,all-week,late-peak,0.07580000000
-4,heat,R1,2040,1,gasboiler,2035,all-year,all-week,late-peak,0.07580000000
-4,heat,R1,2040,2,heatpump,2030,all-year,all-week,late-peak,2.08330000000
-4,heat,R1,2040,3,heatpump,2035,all-year,all-week,late-peak,1.34080000000
-4,heat,R1,2040,5,heatpump,2030,all-year,all-week,late-peak,2.08330000000
-4,heat,R1,2040,6,heatpump,2035,all-year,all-week,late-peak,1.34080000000
-4,heat,R1,2045,0,gasboiler,2035,all-year,all-week,late-peak,0.07580000000
-4,heat,R1,2045,1,gasboiler,2035,all-year,all-week,late-peak,0.07580000000
-4,heat,R1,2045,3,heatpump,2035,all-year,all-week,late-peak,1.34080000000
-4,heat,R1,2045,4,heatpump,2040,all-year,all-week,late-peak,2.58330000000
-4,heat,R1,2045,6,heatpump,2035,all-year,all-week,late-peak,1.34080000000
-4,heat,R1,2045,7,heatpump,2040,all-year,all-week,late-peak,2.58330000000
-4,heat,R2,2040,0,gasboiler,2035,all-year,all-week,late-peak,0.07580000000
-4,heat,R2,2040,1,gasboiler,2035,all-year,all-week,late-peak,0.07580000000
-4,heat,R2,2040,2,heatpump,2030,all-year,all-week,late-peak,2.08330000000
-4,heat,R2,2040,3,heatpump,2035,all-year,all-week,late-peak,1.34080000000
-4,heat,R2,2040,5,heatpump,2030,all-year,all-week,late-peak,2.08330000000
-4,heat,R2,2040,6,heatpump,2035,all-year,all-week,late-peak,1.34080000000
-4,heat,R2,2045,0,gasboiler,2035,all-year,all-week,late-peak,0.07580000000
-4,heat,R2,2045,1,gasboiler,2035,all-year,all-week,late-peak,0.07580000000
-4,heat,R2,2045,3,heatpump,2035,all-year,all-week,late-peak,1.34080000000
-4,heat,R2,2045,4,heatpump,2040,all-year,all-week,late-peak,2.58330000000
-4,heat,R2,2045,6,heatpump,2035,all-year,all-week,late-peak,1.34080000000
-4,heat,R2,2045,7,heatpump,2040,all-year,all-week,late-peak,2.58330000000
-4,CO2f,R1,2040,0,gasboiler,2035,all-year,all-week,late-peak,4.90720000000
-4,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,late-peak,4.90720000000
-4,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,late-peak,4.90720000000
-4,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,late-peak,4.90720000000
-4,CO2f,R2,2040,0,gasboiler,2035,all-year,all-week,late-peak,4.90720000000
-4,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,late-peak,4.90720000000
-4,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,late-peak,4.90720000000
-4,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,late-peak,4.90720000000
-5,heat,R1,2040,0,gasboiler,2035,all-year,all-week,evening,0.05060000000
-5,heat,R1,2040,1,gasboiler,2035,all-year,all-week,evening,0.05060000000
-5,heat,R1,2040,2,heatpump,2030,all-year,all-week,evening,1.38890000000
-5,heat,R1,2040,3,heatpump,2035,all-year,all-week,evening,0.89390000000
-5,heat,R1,2040,5,heatpump,2030,all-year,all-week,evening,1.38890000000
-5,heat,R1,2040,6,heatpump,2035,all-year,all-week,evening,0.89390000000
-5,heat,R1,2045,0,gasboiler,2035,all-year,all-week,evening,0.05060000000
-5,heat,R1,2045,1,gasboiler,2035,all-year,all-week,evening,0.05060000000
-5,heat,R1,2045,3,heatpump,2035,all-year,all-week,evening,0.89390000000
-5,heat,R1,2045,4,heatpump,2040,all-year,all-week,evening,1.72220000000
-5,heat,R1,2045,6,heatpump,2035,all-year,all-week,evening,0.89390000000
-5,heat,R1,2045,7,heatpump,2040,all-year,all-week,evening,1.72220000000
-5,heat,R2,2040,0,gasboiler,2035,all-year,all-week,evening,0.05060000000
-5,heat,R2,2040,1,gasboiler,2035,all-year,all-week,evening,0.05060000000
-5,heat,R2,2040,2,heatpump,2030,all-year,all-week,evening,1.38890000000
-5,heat,R2,2040,3,heatpump,2035,all-year,all-week,evening,0.89390000000
-5,heat,R2,2040,5,heatpump,2030,all-year,all-week,evening,1.38890000000
-5,heat,R2,2040,6,heatpump,2035,all-year,all-week,evening,0.89390000000
-5,heat,R2,2045,0,gasboiler,2035,all-year,all-week,evening,0.05060000000
-5,heat,R2,2045,1,gasboiler,2035,all-year,all-week,evening,0.05060000000
-5,heat,R2,2045,3,heatpump,2035,all-year,all-week,evening,0.89390000000
-5,heat,R2,2045,4,heatpump,2040,all-year,all-week,evening,1.72220000000
-5,heat,R2,2045,6,heatpump,2035,all-year,all-week,evening,0.89390000000
-5,heat,R2,2045,7,heatpump,2040,all-year,all-week,evening,1.72220000000
-5,CO2f,R1,2040,0,gasboiler,2035,all-year,all-week,evening,3.27140000000
-5,CO2f,R1,2040,1,gasboiler,2035,all-year,all-week,evening,3.27140000000
-5,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,evening,3.27140000000
-5,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,evening,3.27140000000
-5,CO2f,R2,2040,0,gasboiler,2035,all-year,all-week,evening,3.27140000000
-5,CO2f,R2,2040,1,gasboiler,2035,all-year,all-week,evening,3.27140000000
-5,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,evening,3.27140000000
-5,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,evening,3.27140000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2040,0,all-year,all-week,night,gasboiler,2035,0.02530000000
+0,heat,R1,2040,1,all-year,all-week,night,gasboiler,2035,0.02530000000
+0,heat,R1,2040,2,all-year,all-week,night,heatpump,2030,0.69440000000
+0,heat,R1,2040,3,all-year,all-week,night,heatpump,2035,0.44690000000
+0,heat,R1,2040,5,all-year,all-week,night,heatpump,2030,0.69440000000
+0,heat,R1,2040,6,all-year,all-week,night,heatpump,2035,0.44690000000
+0,heat,R1,2045,0,all-year,all-week,night,gasboiler,2035,0.02530000000
+0,heat,R1,2045,1,all-year,all-week,night,gasboiler,2035,0.02530000000
+0,heat,R1,2045,3,all-year,all-week,night,heatpump,2035,0.44690000000
+0,heat,R1,2045,4,all-year,all-week,night,heatpump,2040,0.86110000000
+0,heat,R1,2045,6,all-year,all-week,night,heatpump,2035,0.44690000000
+0,heat,R1,2045,7,all-year,all-week,night,heatpump,2040,0.86110000000
+0,heat,R2,2040,0,all-year,all-week,night,gasboiler,2035,0.02530000000
+0,heat,R2,2040,1,all-year,all-week,night,gasboiler,2035,0.02530000000
+0,heat,R2,2040,2,all-year,all-week,night,heatpump,2030,0.69440000000
+0,heat,R2,2040,3,all-year,all-week,night,heatpump,2035,0.44690000000
+0,heat,R2,2040,5,all-year,all-week,night,heatpump,2030,0.69440000000
+0,heat,R2,2040,6,all-year,all-week,night,heatpump,2035,0.44690000000
+0,heat,R2,2045,0,all-year,all-week,night,gasboiler,2035,0.02530000000
+0,heat,R2,2045,1,all-year,all-week,night,gasboiler,2035,0.02530000000
+0,heat,R2,2045,3,all-year,all-week,night,heatpump,2035,0.44690000000
+0,heat,R2,2045,4,all-year,all-week,night,heatpump,2040,0.86110000000
+0,heat,R2,2045,6,all-year,all-week,night,heatpump,2035,0.44690000000
+0,heat,R2,2045,7,all-year,all-week,night,heatpump,2040,0.86110000000
+0,CO2f,R1,2040,0,all-year,all-week,night,gasboiler,2035,1.63570000000
+0,CO2f,R1,2040,1,all-year,all-week,night,gasboiler,2035,1.63570000000
+0,CO2f,R1,2045,0,all-year,all-week,night,gasboiler,2035,1.63570000000
+0,CO2f,R1,2045,1,all-year,all-week,night,gasboiler,2035,1.63570000000
+0,CO2f,R2,2040,0,all-year,all-week,night,gasboiler,2035,1.63570000000
+0,CO2f,R2,2040,1,all-year,all-week,night,gasboiler,2035,1.63570000000
+0,CO2f,R2,2045,0,all-year,all-week,night,gasboiler,2035,1.63570000000
+0,CO2f,R2,2045,1,all-year,all-week,night,gasboiler,2035,1.63570000000
+1,heat,R1,2040,0,all-year,all-week,morning,gasboiler,2035,0.03790000000
+1,heat,R1,2040,1,all-year,all-week,morning,gasboiler,2035,0.03790000000
+1,heat,R1,2040,2,all-year,all-week,morning,heatpump,2030,1.04170000000
+1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2035,0.67040000000
+1,heat,R1,2040,5,all-year,all-week,morning,heatpump,2030,1.04170000000
+1,heat,R1,2040,6,all-year,all-week,morning,heatpump,2035,0.67040000000
+1,heat,R1,2045,0,all-year,all-week,morning,gasboiler,2035,0.03790000000
+1,heat,R1,2045,1,all-year,all-week,morning,gasboiler,2035,0.03790000000
+1,heat,R1,2045,3,all-year,all-week,morning,heatpump,2035,0.67040000000
+1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2040,1.29170000000
+1,heat,R1,2045,6,all-year,all-week,morning,heatpump,2035,0.67040000000
+1,heat,R1,2045,7,all-year,all-week,morning,heatpump,2040,1.29170000000
+1,heat,R2,2040,0,all-year,all-week,morning,gasboiler,2035,0.03790000000
+1,heat,R2,2040,1,all-year,all-week,morning,gasboiler,2035,0.03790000000
+1,heat,R2,2040,2,all-year,all-week,morning,heatpump,2030,1.04170000000
+1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2035,0.67040000000
+1,heat,R2,2040,5,all-year,all-week,morning,heatpump,2030,1.04170000000
+1,heat,R2,2040,6,all-year,all-week,morning,heatpump,2035,0.67040000000
+1,heat,R2,2045,0,all-year,all-week,morning,gasboiler,2035,0.03790000000
+1,heat,R2,2045,1,all-year,all-week,morning,gasboiler,2035,0.03790000000
+1,heat,R2,2045,3,all-year,all-week,morning,heatpump,2035,0.67040000000
+1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2040,1.29170000000
+1,heat,R2,2045,6,all-year,all-week,morning,heatpump,2035,0.67040000000
+1,heat,R2,2045,7,all-year,all-week,morning,heatpump,2040,1.29170000000
+1,CO2f,R1,2040,0,all-year,all-week,morning,gasboiler,2035,2.45360000000
+1,CO2f,R1,2040,1,all-year,all-week,morning,gasboiler,2035,2.45360000000
+1,CO2f,R1,2045,0,all-year,all-week,morning,gasboiler,2035,2.45360000000
+1,CO2f,R1,2045,1,all-year,all-week,morning,gasboiler,2035,2.45360000000
+1,CO2f,R2,2040,0,all-year,all-week,morning,gasboiler,2035,2.45360000000
+1,CO2f,R2,2040,1,all-year,all-week,morning,gasboiler,2035,2.45360000000
+1,CO2f,R2,2045,0,all-year,all-week,morning,gasboiler,2035,2.45360000000
+1,CO2f,R2,2045,1,all-year,all-week,morning,gasboiler,2035,2.45360000000
+2,heat,R1,2040,0,all-year,all-week,afternoon,gasboiler,2035,0.02530000000
+2,heat,R1,2040,1,all-year,all-week,afternoon,gasboiler,2035,0.02530000000
+2,heat,R1,2040,2,all-year,all-week,afternoon,heatpump,2030,0.69440000000
+2,heat,R1,2040,3,all-year,all-week,afternoon,heatpump,2035,0.44690000000
+2,heat,R1,2040,5,all-year,all-week,afternoon,heatpump,2030,0.69440000000
+2,heat,R1,2040,6,all-year,all-week,afternoon,heatpump,2035,0.44690000000
+2,heat,R1,2045,0,all-year,all-week,afternoon,gasboiler,2035,0.02530000000
+2,heat,R1,2045,1,all-year,all-week,afternoon,gasboiler,2035,0.02530000000
+2,heat,R1,2045,3,all-year,all-week,afternoon,heatpump,2035,0.44690000000
+2,heat,R1,2045,4,all-year,all-week,afternoon,heatpump,2040,0.86110000000
+2,heat,R1,2045,6,all-year,all-week,afternoon,heatpump,2035,0.44690000000
+2,heat,R1,2045,7,all-year,all-week,afternoon,heatpump,2040,0.86110000000
+2,heat,R2,2040,0,all-year,all-week,afternoon,gasboiler,2035,0.02530000000
+2,heat,R2,2040,1,all-year,all-week,afternoon,gasboiler,2035,0.02530000000
+2,heat,R2,2040,2,all-year,all-week,afternoon,heatpump,2030,0.69440000000
+2,heat,R2,2040,3,all-year,all-week,afternoon,heatpump,2035,0.44690000000
+2,heat,R2,2040,5,all-year,all-week,afternoon,heatpump,2030,0.69440000000
+2,heat,R2,2040,6,all-year,all-week,afternoon,heatpump,2035,0.44690000000
+2,heat,R2,2045,0,all-year,all-week,afternoon,gasboiler,2035,0.02530000000
+2,heat,R2,2045,1,all-year,all-week,afternoon,gasboiler,2035,0.02530000000
+2,heat,R2,2045,3,all-year,all-week,afternoon,heatpump,2035,0.44690000000
+2,heat,R2,2045,4,all-year,all-week,afternoon,heatpump,2040,0.86110000000
+2,heat,R2,2045,6,all-year,all-week,afternoon,heatpump,2035,0.44690000000
+2,heat,R2,2045,7,all-year,all-week,afternoon,heatpump,2040,0.86110000000
+2,CO2f,R1,2040,0,all-year,all-week,afternoon,gasboiler,2035,1.63570000000
+2,CO2f,R1,2040,1,all-year,all-week,afternoon,gasboiler,2035,1.63570000000
+2,CO2f,R1,2045,0,all-year,all-week,afternoon,gasboiler,2035,1.63570000000
+2,CO2f,R1,2045,1,all-year,all-week,afternoon,gasboiler,2035,1.63570000000
+2,CO2f,R2,2040,0,all-year,all-week,afternoon,gasboiler,2035,1.63570000000
+2,CO2f,R2,2040,1,all-year,all-week,afternoon,gasboiler,2035,1.63570000000
+2,CO2f,R2,2045,0,all-year,all-week,afternoon,gasboiler,2035,1.63570000000
+2,CO2f,R2,2045,1,all-year,all-week,afternoon,gasboiler,2035,1.63570000000
+3,heat,R1,2040,0,all-year,all-week,early-peak,gasboiler,2035,0.03790000000
+3,heat,R1,2040,1,all-year,all-week,early-peak,gasboiler,2035,0.03790000000
+3,heat,R1,2040,2,all-year,all-week,early-peak,heatpump,2030,1.04170000000
+3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2035,0.67040000000
+3,heat,R1,2040,5,all-year,all-week,early-peak,heatpump,2030,1.04170000000
+3,heat,R1,2040,6,all-year,all-week,early-peak,heatpump,2035,0.67040000000
+3,heat,R1,2045,0,all-year,all-week,early-peak,gasboiler,2035,0.03790000000
+3,heat,R1,2045,1,all-year,all-week,early-peak,gasboiler,2035,0.03790000000
+3,heat,R1,2045,3,all-year,all-week,early-peak,heatpump,2035,0.67040000000
+3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2040,1.29170000000
+3,heat,R1,2045,6,all-year,all-week,early-peak,heatpump,2035,0.67040000000
+3,heat,R1,2045,7,all-year,all-week,early-peak,heatpump,2040,1.29170000000
+3,heat,R2,2040,0,all-year,all-week,early-peak,gasboiler,2035,0.03790000000
+3,heat,R2,2040,1,all-year,all-week,early-peak,gasboiler,2035,0.03790000000
+3,heat,R2,2040,2,all-year,all-week,early-peak,heatpump,2030,1.04170000000
+3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2035,0.67040000000
+3,heat,R2,2040,5,all-year,all-week,early-peak,heatpump,2030,1.04170000000
+3,heat,R2,2040,6,all-year,all-week,early-peak,heatpump,2035,0.67040000000
+3,heat,R2,2045,0,all-year,all-week,early-peak,gasboiler,2035,0.03790000000
+3,heat,R2,2045,1,all-year,all-week,early-peak,gasboiler,2035,0.03790000000
+3,heat,R2,2045,3,all-year,all-week,early-peak,heatpump,2035,0.67040000000
+3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2040,1.29170000000
+3,heat,R2,2045,6,all-year,all-week,early-peak,heatpump,2035,0.67040000000
+3,heat,R2,2045,7,all-year,all-week,early-peak,heatpump,2040,1.29170000000
+3,CO2f,R1,2040,0,all-year,all-week,early-peak,gasboiler,2035,2.45360000000
+3,CO2f,R1,2040,1,all-year,all-week,early-peak,gasboiler,2035,2.45360000000
+3,CO2f,R1,2045,0,all-year,all-week,early-peak,gasboiler,2035,2.45360000000
+3,CO2f,R1,2045,1,all-year,all-week,early-peak,gasboiler,2035,2.45360000000
+3,CO2f,R2,2040,0,all-year,all-week,early-peak,gasboiler,2035,2.45360000000
+3,CO2f,R2,2040,1,all-year,all-week,early-peak,gasboiler,2035,2.45360000000
+3,CO2f,R2,2045,0,all-year,all-week,early-peak,gasboiler,2035,2.45360000000
+3,CO2f,R2,2045,1,all-year,all-week,early-peak,gasboiler,2035,2.45360000000
+4,heat,R1,2040,0,all-year,all-week,late-peak,gasboiler,2035,0.07580000000
+4,heat,R1,2040,1,all-year,all-week,late-peak,gasboiler,2035,0.07580000000
+4,heat,R1,2040,2,all-year,all-week,late-peak,heatpump,2030,2.08330000000
+4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2035,1.34080000000
+4,heat,R1,2040,5,all-year,all-week,late-peak,heatpump,2030,2.08330000000
+4,heat,R1,2040,6,all-year,all-week,late-peak,heatpump,2035,1.34080000000
+4,heat,R1,2045,0,all-year,all-week,late-peak,gasboiler,2035,0.07580000000
+4,heat,R1,2045,1,all-year,all-week,late-peak,gasboiler,2035,0.07580000000
+4,heat,R1,2045,3,all-year,all-week,late-peak,heatpump,2035,1.34080000000
+4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2040,2.58330000000
+4,heat,R1,2045,6,all-year,all-week,late-peak,heatpump,2035,1.34080000000
+4,heat,R1,2045,7,all-year,all-week,late-peak,heatpump,2040,2.58330000000
+4,heat,R2,2040,0,all-year,all-week,late-peak,gasboiler,2035,0.07580000000
+4,heat,R2,2040,1,all-year,all-week,late-peak,gasboiler,2035,0.07580000000
+4,heat,R2,2040,2,all-year,all-week,late-peak,heatpump,2030,2.08330000000
+4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2035,1.34080000000
+4,heat,R2,2040,5,all-year,all-week,late-peak,heatpump,2030,2.08330000000
+4,heat,R2,2040,6,all-year,all-week,late-peak,heatpump,2035,1.34080000000
+4,heat,R2,2045,0,all-year,all-week,late-peak,gasboiler,2035,0.07580000000
+4,heat,R2,2045,1,all-year,all-week,late-peak,gasboiler,2035,0.07580000000
+4,heat,R2,2045,3,all-year,all-week,late-peak,heatpump,2035,1.34080000000
+4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2040,2.58330000000
+4,heat,R2,2045,6,all-year,all-week,late-peak,heatpump,2035,1.34080000000
+4,heat,R2,2045,7,all-year,all-week,late-peak,heatpump,2040,2.58330000000
+4,CO2f,R1,2040,0,all-year,all-week,late-peak,gasboiler,2035,4.90720000000
+4,CO2f,R1,2040,1,all-year,all-week,late-peak,gasboiler,2035,4.90720000000
+4,CO2f,R1,2045,0,all-year,all-week,late-peak,gasboiler,2035,4.90720000000
+4,CO2f,R1,2045,1,all-year,all-week,late-peak,gasboiler,2035,4.90720000000
+4,CO2f,R2,2040,0,all-year,all-week,late-peak,gasboiler,2035,4.90720000000
+4,CO2f,R2,2040,1,all-year,all-week,late-peak,gasboiler,2035,4.90720000000
+4,CO2f,R2,2045,0,all-year,all-week,late-peak,gasboiler,2035,4.90720000000
+4,CO2f,R2,2045,1,all-year,all-week,late-peak,gasboiler,2035,4.90720000000
+5,heat,R1,2040,0,all-year,all-week,evening,gasboiler,2035,0.05060000000
+5,heat,R1,2040,1,all-year,all-week,evening,gasboiler,2035,0.05060000000
+5,heat,R1,2040,2,all-year,all-week,evening,heatpump,2030,1.38890000000
+5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2035,0.89390000000
+5,heat,R1,2040,5,all-year,all-week,evening,heatpump,2030,1.38890000000
+5,heat,R1,2040,6,all-year,all-week,evening,heatpump,2035,0.89390000000
+5,heat,R1,2045,0,all-year,all-week,evening,gasboiler,2035,0.05060000000
+5,heat,R1,2045,1,all-year,all-week,evening,gasboiler,2035,0.05060000000
+5,heat,R1,2045,3,all-year,all-week,evening,heatpump,2035,0.89390000000
+5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2040,1.72220000000
+5,heat,R1,2045,6,all-year,all-week,evening,heatpump,2035,0.89390000000
+5,heat,R1,2045,7,all-year,all-week,evening,heatpump,2040,1.72220000000
+5,heat,R2,2040,0,all-year,all-week,evening,gasboiler,2035,0.05060000000
+5,heat,R2,2040,1,all-year,all-week,evening,gasboiler,2035,0.05060000000
+5,heat,R2,2040,2,all-year,all-week,evening,heatpump,2030,1.38890000000
+5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2035,0.89390000000
+5,heat,R2,2040,5,all-year,all-week,evening,heatpump,2030,1.38890000000
+5,heat,R2,2040,6,all-year,all-week,evening,heatpump,2035,0.89390000000
+5,heat,R2,2045,0,all-year,all-week,evening,gasboiler,2035,0.05060000000
+5,heat,R2,2045,1,all-year,all-week,evening,gasboiler,2035,0.05060000000
+5,heat,R2,2045,3,all-year,all-week,evening,heatpump,2035,0.89390000000
+5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2040,1.72220000000
+5,heat,R2,2045,6,all-year,all-week,evening,heatpump,2035,0.89390000000
+5,heat,R2,2045,7,all-year,all-week,evening,heatpump,2040,1.72220000000
+5,CO2f,R1,2040,0,all-year,all-week,evening,gasboiler,2035,3.27140000000
+5,CO2f,R1,2040,1,all-year,all-week,evening,gasboiler,2035,3.27140000000
+5,CO2f,R1,2045,0,all-year,all-week,evening,gasboiler,2035,3.27140000000
+5,CO2f,R1,2045,1,all-year,all-week,evening,gasboiler,2035,3.27140000000
+5,CO2f,R2,2040,0,all-year,all-week,evening,gasboiler,2035,3.27140000000
+5,CO2f,R2,2040,1,all-year,all-week,evening,gasboiler,2035,3.27140000000
+5,CO2f,R2,2045,0,all-year,all-week,evening,gasboiler,2035,3.27140000000
+5,CO2f,R2,2045,1,all-year,all-week,evening,gasboiler,2035,3.27140000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2045.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2045.csv
index 98be95de8..9d3de5da0 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2045.csv
@@ -1,145 +1,145 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2045,0,gasboiler,2035,all-year,all-week,night,0.02530000000
-0,heat,R1,2045,1,gasboiler,2035,all-year,all-week,night,0.02530000000
-0,heat,R1,2045,2,heatpump,2035,all-year,all-week,night,0.44690000000
-0,heat,R1,2045,3,heatpump,2040,all-year,all-week,night,0.86110000000
-0,heat,R1,2045,5,heatpump,2035,all-year,all-week,night,0.44690000000
-0,heat,R1,2045,6,heatpump,2040,all-year,all-week,night,0.86110000000
-0,heat,R1,2050,3,heatpump,2040,all-year,all-week,night,0.86110000000
-0,heat,R1,2050,4,heatpump,2045,all-year,all-week,night,0.63890000000
-0,heat,R1,2050,6,heatpump,2040,all-year,all-week,night,0.86110000000
-0,heat,R1,2050,7,heatpump,2045,all-year,all-week,night,0.63890000000
-0,heat,R2,2045,0,gasboiler,2035,all-year,all-week,night,0.02530000000
-0,heat,R2,2045,1,gasboiler,2035,all-year,all-week,night,0.02530000000
-0,heat,R2,2045,2,heatpump,2035,all-year,all-week,night,0.44690000000
-0,heat,R2,2045,3,heatpump,2040,all-year,all-week,night,0.86110000000
-0,heat,R2,2045,5,heatpump,2035,all-year,all-week,night,0.44690000000
-0,heat,R2,2045,6,heatpump,2040,all-year,all-week,night,0.86110000000
-0,heat,R2,2050,3,heatpump,2040,all-year,all-week,night,0.86110000000
-0,heat,R2,2050,4,heatpump,2045,all-year,all-week,night,0.63890000000
-0,heat,R2,2050,6,heatpump,2040,all-year,all-week,night,0.86110000000
-0,heat,R2,2050,7,heatpump,2045,all-year,all-week,night,0.63890000000
-0,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,night,1.63570000000
-0,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,night,1.63570000000
-0,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,night,1.63570000000
-0,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,night,1.63570000000
-1,heat,R1,2045,0,gasboiler,2035,all-year,all-week,morning,0.03790000000
-1,heat,R1,2045,1,gasboiler,2035,all-year,all-week,morning,0.03790000000
-1,heat,R1,2045,2,heatpump,2035,all-year,all-week,morning,0.67040000000
-1,heat,R1,2045,3,heatpump,2040,all-year,all-week,morning,1.29170000000
-1,heat,R1,2045,5,heatpump,2035,all-year,all-week,morning,0.67040000000
-1,heat,R1,2045,6,heatpump,2040,all-year,all-week,morning,1.29170000000
-1,heat,R1,2050,3,heatpump,2040,all-year,all-week,morning,1.29170000000
-1,heat,R1,2050,4,heatpump,2045,all-year,all-week,morning,0.95830000000
-1,heat,R1,2050,6,heatpump,2040,all-year,all-week,morning,1.29170000000
-1,heat,R1,2050,7,heatpump,2045,all-year,all-week,morning,0.95830000000
-1,heat,R2,2045,0,gasboiler,2035,all-year,all-week,morning,0.03790000000
-1,heat,R2,2045,1,gasboiler,2035,all-year,all-week,morning,0.03790000000
-1,heat,R2,2045,2,heatpump,2035,all-year,all-week,morning,0.67040000000
-1,heat,R2,2045,3,heatpump,2040,all-year,all-week,morning,1.29170000000
-1,heat,R2,2045,5,heatpump,2035,all-year,all-week,morning,0.67040000000
-1,heat,R2,2045,6,heatpump,2040,all-year,all-week,morning,1.29170000000
-1,heat,R2,2050,3,heatpump,2040,all-year,all-week,morning,1.29170000000
-1,heat,R2,2050,4,heatpump,2045,all-year,all-week,morning,0.95830000000
-1,heat,R2,2050,6,heatpump,2040,all-year,all-week,morning,1.29170000000
-1,heat,R2,2050,7,heatpump,2045,all-year,all-week,morning,0.95830000000
-1,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,morning,2.45360000000
-1,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,morning,2.45360000000
-1,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,morning,2.45360000000
-1,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,morning,2.45360000000
-2,heat,R1,2045,0,gasboiler,2035,all-year,all-week,afternoon,0.02530000000
-2,heat,R1,2045,1,gasboiler,2035,all-year,all-week,afternoon,0.02530000000
-2,heat,R1,2045,2,heatpump,2035,all-year,all-week,afternoon,0.44690000000
-2,heat,R1,2045,3,heatpump,2040,all-year,all-week,afternoon,0.86110000000
-2,heat,R1,2045,5,heatpump,2035,all-year,all-week,afternoon,0.44690000000
-2,heat,R1,2045,6,heatpump,2040,all-year,all-week,afternoon,0.86110000000
-2,heat,R1,2050,3,heatpump,2040,all-year,all-week,afternoon,0.86110000000
-2,heat,R1,2050,4,heatpump,2045,all-year,all-week,afternoon,0.63890000000
-2,heat,R1,2050,6,heatpump,2040,all-year,all-week,afternoon,0.86110000000
-2,heat,R1,2050,7,heatpump,2045,all-year,all-week,afternoon,0.63890000000
-2,heat,R2,2045,0,gasboiler,2035,all-year,all-week,afternoon,0.02530000000
-2,heat,R2,2045,1,gasboiler,2035,all-year,all-week,afternoon,0.02530000000
-2,heat,R2,2045,2,heatpump,2035,all-year,all-week,afternoon,0.44690000000
-2,heat,R2,2045,3,heatpump,2040,all-year,all-week,afternoon,0.86110000000
-2,heat,R2,2045,5,heatpump,2035,all-year,all-week,afternoon,0.44690000000
-2,heat,R2,2045,6,heatpump,2040,all-year,all-week,afternoon,0.86110000000
-2,heat,R2,2050,3,heatpump,2040,all-year,all-week,afternoon,0.86110000000
-2,heat,R2,2050,4,heatpump,2045,all-year,all-week,afternoon,0.63890000000
-2,heat,R2,2050,6,heatpump,2040,all-year,all-week,afternoon,0.86110000000
-2,heat,R2,2050,7,heatpump,2045,all-year,all-week,afternoon,0.63890000000
-2,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,afternoon,1.63570000000
-2,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,afternoon,1.63570000000
-2,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,afternoon,1.63570000000
-2,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,afternoon,1.63570000000
-3,heat,R1,2045,0,gasboiler,2035,all-year,all-week,early-peak,0.03790000000
-3,heat,R1,2045,1,gasboiler,2035,all-year,all-week,early-peak,0.03790000000
-3,heat,R1,2045,2,heatpump,2035,all-year,all-week,early-peak,0.67040000000
-3,heat,R1,2045,3,heatpump,2040,all-year,all-week,early-peak,1.29170000000
-3,heat,R1,2045,5,heatpump,2035,all-year,all-week,early-peak,0.67040000000
-3,heat,R1,2045,6,heatpump,2040,all-year,all-week,early-peak,1.29170000000
-3,heat,R1,2050,3,heatpump,2040,all-year,all-week,early-peak,1.29170000000
-3,heat,R1,2050,4,heatpump,2045,all-year,all-week,early-peak,0.95830000000
-3,heat,R1,2050,6,heatpump,2040,all-year,all-week,early-peak,1.29170000000
-3,heat,R1,2050,7,heatpump,2045,all-year,all-week,early-peak,0.95830000000
-3,heat,R2,2045,0,gasboiler,2035,all-year,all-week,early-peak,0.03790000000
-3,heat,R2,2045,1,gasboiler,2035,all-year,all-week,early-peak,0.03790000000
-3,heat,R2,2045,2,heatpump,2035,all-year,all-week,early-peak,0.67040000000
-3,heat,R2,2045,3,heatpump,2040,all-year,all-week,early-peak,1.29170000000
-3,heat,R2,2045,5,heatpump,2035,all-year,all-week,early-peak,0.67040000000
-3,heat,R2,2045,6,heatpump,2040,all-year,all-week,early-peak,1.29170000000
-3,heat,R2,2050,3,heatpump,2040,all-year,all-week,early-peak,1.29170000000
-3,heat,R2,2050,4,heatpump,2045,all-year,all-week,early-peak,0.95830000000
-3,heat,R2,2050,6,heatpump,2040,all-year,all-week,early-peak,1.29170000000
-3,heat,R2,2050,7,heatpump,2045,all-year,all-week,early-peak,0.95830000000
-3,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,early-peak,2.45360000000
-3,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,early-peak,2.45360000000
-3,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,early-peak,2.45360000000
-3,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,early-peak,2.45360000000
-4,heat,R1,2045,0,gasboiler,2035,all-year,all-week,late-peak,0.07580000000
-4,heat,R1,2045,1,gasboiler,2035,all-year,all-week,late-peak,0.07580000000
-4,heat,R1,2045,2,heatpump,2035,all-year,all-week,late-peak,1.34080000000
-4,heat,R1,2045,3,heatpump,2040,all-year,all-week,late-peak,2.58330000000
-4,heat,R1,2045,5,heatpump,2035,all-year,all-week,late-peak,1.34080000000
-4,heat,R1,2045,6,heatpump,2040,all-year,all-week,late-peak,2.58330000000
-4,heat,R1,2050,3,heatpump,2040,all-year,all-week,late-peak,2.58330000000
-4,heat,R1,2050,4,heatpump,2045,all-year,all-week,late-peak,1.91670000000
-4,heat,R1,2050,6,heatpump,2040,all-year,all-week,late-peak,2.58330000000
-4,heat,R1,2050,7,heatpump,2045,all-year,all-week,late-peak,1.91670000000
-4,heat,R2,2045,0,gasboiler,2035,all-year,all-week,late-peak,0.07580000000
-4,heat,R2,2045,1,gasboiler,2035,all-year,all-week,late-peak,0.07580000000
-4,heat,R2,2045,2,heatpump,2035,all-year,all-week,late-peak,1.34080000000
-4,heat,R2,2045,3,heatpump,2040,all-year,all-week,late-peak,2.58330000000
-4,heat,R2,2045,5,heatpump,2035,all-year,all-week,late-peak,1.34080000000
-4,heat,R2,2045,6,heatpump,2040,all-year,all-week,late-peak,2.58330000000
-4,heat,R2,2050,3,heatpump,2040,all-year,all-week,late-peak,2.58330000000
-4,heat,R2,2050,4,heatpump,2045,all-year,all-week,late-peak,1.91670000000
-4,heat,R2,2050,6,heatpump,2040,all-year,all-week,late-peak,2.58330000000
-4,heat,R2,2050,7,heatpump,2045,all-year,all-week,late-peak,1.91670000000
-4,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,late-peak,4.90720000000
-4,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,late-peak,4.90720000000
-4,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,late-peak,4.90720000000
-4,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,late-peak,4.90720000000
-5,heat,R1,2045,0,gasboiler,2035,all-year,all-week,evening,0.05060000000
-5,heat,R1,2045,1,gasboiler,2035,all-year,all-week,evening,0.05060000000
-5,heat,R1,2045,2,heatpump,2035,all-year,all-week,evening,0.89390000000
-5,heat,R1,2045,3,heatpump,2040,all-year,all-week,evening,1.72220000000
-5,heat,R1,2045,5,heatpump,2035,all-year,all-week,evening,0.89390000000
-5,heat,R1,2045,6,heatpump,2040,all-year,all-week,evening,1.72220000000
-5,heat,R1,2050,3,heatpump,2040,all-year,all-week,evening,1.72220000000
-5,heat,R1,2050,4,heatpump,2045,all-year,all-week,evening,1.27780000000
-5,heat,R1,2050,6,heatpump,2040,all-year,all-week,evening,1.72220000000
-5,heat,R1,2050,7,heatpump,2045,all-year,all-week,evening,1.27780000000
-5,heat,R2,2045,0,gasboiler,2035,all-year,all-week,evening,0.05060000000
-5,heat,R2,2045,1,gasboiler,2035,all-year,all-week,evening,0.05060000000
-5,heat,R2,2045,2,heatpump,2035,all-year,all-week,evening,0.89390000000
-5,heat,R2,2045,3,heatpump,2040,all-year,all-week,evening,1.72220000000
-5,heat,R2,2045,5,heatpump,2035,all-year,all-week,evening,0.89390000000
-5,heat,R2,2045,6,heatpump,2040,all-year,all-week,evening,1.72220000000
-5,heat,R2,2050,3,heatpump,2040,all-year,all-week,evening,1.72220000000
-5,heat,R2,2050,4,heatpump,2045,all-year,all-week,evening,1.27780000000
-5,heat,R2,2050,6,heatpump,2040,all-year,all-week,evening,1.72220000000
-5,heat,R2,2050,7,heatpump,2045,all-year,all-week,evening,1.27780000000
-5,CO2f,R1,2045,0,gasboiler,2035,all-year,all-week,evening,3.27140000000
-5,CO2f,R1,2045,1,gasboiler,2035,all-year,all-week,evening,3.27140000000
-5,CO2f,R2,2045,0,gasboiler,2035,all-year,all-week,evening,3.27140000000
-5,CO2f,R2,2045,1,gasboiler,2035,all-year,all-week,evening,3.27140000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2045,0,all-year,all-week,night,gasboiler,2035,0.02530000000
+0,heat,R1,2045,1,all-year,all-week,night,gasboiler,2035,0.02530000000
+0,heat,R1,2045,2,all-year,all-week,night,heatpump,2035,0.44690000000
+0,heat,R1,2045,3,all-year,all-week,night,heatpump,2040,0.86110000000
+0,heat,R1,2045,5,all-year,all-week,night,heatpump,2035,0.44690000000
+0,heat,R1,2045,6,all-year,all-week,night,heatpump,2040,0.86110000000
+0,heat,R1,2050,3,all-year,all-week,night,heatpump,2040,0.86110000000
+0,heat,R1,2050,4,all-year,all-week,night,heatpump,2045,0.63890000000
+0,heat,R1,2050,6,all-year,all-week,night,heatpump,2040,0.86110000000
+0,heat,R1,2050,7,all-year,all-week,night,heatpump,2045,0.63890000000
+0,heat,R2,2045,0,all-year,all-week,night,gasboiler,2035,0.02530000000
+0,heat,R2,2045,1,all-year,all-week,night,gasboiler,2035,0.02530000000
+0,heat,R2,2045,2,all-year,all-week,night,heatpump,2035,0.44690000000
+0,heat,R2,2045,3,all-year,all-week,night,heatpump,2040,0.86110000000
+0,heat,R2,2045,5,all-year,all-week,night,heatpump,2035,0.44690000000
+0,heat,R2,2045,6,all-year,all-week,night,heatpump,2040,0.86110000000
+0,heat,R2,2050,3,all-year,all-week,night,heatpump,2040,0.86110000000
+0,heat,R2,2050,4,all-year,all-week,night,heatpump,2045,0.63890000000
+0,heat,R2,2050,6,all-year,all-week,night,heatpump,2040,0.86110000000
+0,heat,R2,2050,7,all-year,all-week,night,heatpump,2045,0.63890000000
+0,CO2f,R1,2045,0,all-year,all-week,night,gasboiler,2035,1.63570000000
+0,CO2f,R1,2045,1,all-year,all-week,night,gasboiler,2035,1.63570000000
+0,CO2f,R2,2045,0,all-year,all-week,night,gasboiler,2035,1.63570000000
+0,CO2f,R2,2045,1,all-year,all-week,night,gasboiler,2035,1.63570000000
+1,heat,R1,2045,0,all-year,all-week,morning,gasboiler,2035,0.03790000000
+1,heat,R1,2045,1,all-year,all-week,morning,gasboiler,2035,0.03790000000
+1,heat,R1,2045,2,all-year,all-week,morning,heatpump,2035,0.67040000000
+1,heat,R1,2045,3,all-year,all-week,morning,heatpump,2040,1.29170000000
+1,heat,R1,2045,5,all-year,all-week,morning,heatpump,2035,0.67040000000
+1,heat,R1,2045,6,all-year,all-week,morning,heatpump,2040,1.29170000000
+1,heat,R1,2050,3,all-year,all-week,morning,heatpump,2040,1.29170000000
+1,heat,R1,2050,4,all-year,all-week,morning,heatpump,2045,0.95830000000
+1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2040,1.29170000000
+1,heat,R1,2050,7,all-year,all-week,morning,heatpump,2045,0.95830000000
+1,heat,R2,2045,0,all-year,all-week,morning,gasboiler,2035,0.03790000000
+1,heat,R2,2045,1,all-year,all-week,morning,gasboiler,2035,0.03790000000
+1,heat,R2,2045,2,all-year,all-week,morning,heatpump,2035,0.67040000000
+1,heat,R2,2045,3,all-year,all-week,morning,heatpump,2040,1.29170000000
+1,heat,R2,2045,5,all-year,all-week,morning,heatpump,2035,0.67040000000
+1,heat,R2,2045,6,all-year,all-week,morning,heatpump,2040,1.29170000000
+1,heat,R2,2050,3,all-year,all-week,morning,heatpump,2040,1.29170000000
+1,heat,R2,2050,4,all-year,all-week,morning,heatpump,2045,0.95830000000
+1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2040,1.29170000000
+1,heat,R2,2050,7,all-year,all-week,morning,heatpump,2045,0.95830000000
+1,CO2f,R1,2045,0,all-year,all-week,morning,gasboiler,2035,2.45360000000
+1,CO2f,R1,2045,1,all-year,all-week,morning,gasboiler,2035,2.45360000000
+1,CO2f,R2,2045,0,all-year,all-week,morning,gasboiler,2035,2.45360000000
+1,CO2f,R2,2045,1,all-year,all-week,morning,gasboiler,2035,2.45360000000
+2,heat,R1,2045,0,all-year,all-week,afternoon,gasboiler,2035,0.02530000000
+2,heat,R1,2045,1,all-year,all-week,afternoon,gasboiler,2035,0.02530000000
+2,heat,R1,2045,2,all-year,all-week,afternoon,heatpump,2035,0.44690000000
+2,heat,R1,2045,3,all-year,all-week,afternoon,heatpump,2040,0.86110000000
+2,heat,R1,2045,5,all-year,all-week,afternoon,heatpump,2035,0.44690000000
+2,heat,R1,2045,6,all-year,all-week,afternoon,heatpump,2040,0.86110000000
+2,heat,R1,2050,3,all-year,all-week,afternoon,heatpump,2040,0.86110000000
+2,heat,R1,2050,4,all-year,all-week,afternoon,heatpump,2045,0.63890000000
+2,heat,R1,2050,6,all-year,all-week,afternoon,heatpump,2040,0.86110000000
+2,heat,R1,2050,7,all-year,all-week,afternoon,heatpump,2045,0.63890000000
+2,heat,R2,2045,0,all-year,all-week,afternoon,gasboiler,2035,0.02530000000
+2,heat,R2,2045,1,all-year,all-week,afternoon,gasboiler,2035,0.02530000000
+2,heat,R2,2045,2,all-year,all-week,afternoon,heatpump,2035,0.44690000000
+2,heat,R2,2045,3,all-year,all-week,afternoon,heatpump,2040,0.86110000000
+2,heat,R2,2045,5,all-year,all-week,afternoon,heatpump,2035,0.44690000000
+2,heat,R2,2045,6,all-year,all-week,afternoon,heatpump,2040,0.86110000000
+2,heat,R2,2050,3,all-year,all-week,afternoon,heatpump,2040,0.86110000000
+2,heat,R2,2050,4,all-year,all-week,afternoon,heatpump,2045,0.63890000000
+2,heat,R2,2050,6,all-year,all-week,afternoon,heatpump,2040,0.86110000000
+2,heat,R2,2050,7,all-year,all-week,afternoon,heatpump,2045,0.63890000000
+2,CO2f,R1,2045,0,all-year,all-week,afternoon,gasboiler,2035,1.63570000000
+2,CO2f,R1,2045,1,all-year,all-week,afternoon,gasboiler,2035,1.63570000000
+2,CO2f,R2,2045,0,all-year,all-week,afternoon,gasboiler,2035,1.63570000000
+2,CO2f,R2,2045,1,all-year,all-week,afternoon,gasboiler,2035,1.63570000000
+3,heat,R1,2045,0,all-year,all-week,early-peak,gasboiler,2035,0.03790000000
+3,heat,R1,2045,1,all-year,all-week,early-peak,gasboiler,2035,0.03790000000
+3,heat,R1,2045,2,all-year,all-week,early-peak,heatpump,2035,0.67040000000
+3,heat,R1,2045,3,all-year,all-week,early-peak,heatpump,2040,1.29170000000
+3,heat,R1,2045,5,all-year,all-week,early-peak,heatpump,2035,0.67040000000
+3,heat,R1,2045,6,all-year,all-week,early-peak,heatpump,2040,1.29170000000
+3,heat,R1,2050,3,all-year,all-week,early-peak,heatpump,2040,1.29170000000
+3,heat,R1,2050,4,all-year,all-week,early-peak,heatpump,2045,0.95830000000
+3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2040,1.29170000000
+3,heat,R1,2050,7,all-year,all-week,early-peak,heatpump,2045,0.95830000000
+3,heat,R2,2045,0,all-year,all-week,early-peak,gasboiler,2035,0.03790000000
+3,heat,R2,2045,1,all-year,all-week,early-peak,gasboiler,2035,0.03790000000
+3,heat,R2,2045,2,all-year,all-week,early-peak,heatpump,2035,0.67040000000
+3,heat,R2,2045,3,all-year,all-week,early-peak,heatpump,2040,1.29170000000
+3,heat,R2,2045,5,all-year,all-week,early-peak,heatpump,2035,0.67040000000
+3,heat,R2,2045,6,all-year,all-week,early-peak,heatpump,2040,1.29170000000
+3,heat,R2,2050,3,all-year,all-week,early-peak,heatpump,2040,1.29170000000
+3,heat,R2,2050,4,all-year,all-week,early-peak,heatpump,2045,0.95830000000
+3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2040,1.29170000000
+3,heat,R2,2050,7,all-year,all-week,early-peak,heatpump,2045,0.95830000000
+3,CO2f,R1,2045,0,all-year,all-week,early-peak,gasboiler,2035,2.45360000000
+3,CO2f,R1,2045,1,all-year,all-week,early-peak,gasboiler,2035,2.45360000000
+3,CO2f,R2,2045,0,all-year,all-week,early-peak,gasboiler,2035,2.45360000000
+3,CO2f,R2,2045,1,all-year,all-week,early-peak,gasboiler,2035,2.45360000000
+4,heat,R1,2045,0,all-year,all-week,late-peak,gasboiler,2035,0.07580000000
+4,heat,R1,2045,1,all-year,all-week,late-peak,gasboiler,2035,0.07580000000
+4,heat,R1,2045,2,all-year,all-week,late-peak,heatpump,2035,1.34080000000
+4,heat,R1,2045,3,all-year,all-week,late-peak,heatpump,2040,2.58330000000
+4,heat,R1,2045,5,all-year,all-week,late-peak,heatpump,2035,1.34080000000
+4,heat,R1,2045,6,all-year,all-week,late-peak,heatpump,2040,2.58330000000
+4,heat,R1,2050,3,all-year,all-week,late-peak,heatpump,2040,2.58330000000
+4,heat,R1,2050,4,all-year,all-week,late-peak,heatpump,2045,1.91670000000
+4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2040,2.58330000000
+4,heat,R1,2050,7,all-year,all-week,late-peak,heatpump,2045,1.91670000000
+4,heat,R2,2045,0,all-year,all-week,late-peak,gasboiler,2035,0.07580000000
+4,heat,R2,2045,1,all-year,all-week,late-peak,gasboiler,2035,0.07580000000
+4,heat,R2,2045,2,all-year,all-week,late-peak,heatpump,2035,1.34080000000
+4,heat,R2,2045,3,all-year,all-week,late-peak,heatpump,2040,2.58330000000
+4,heat,R2,2045,5,all-year,all-week,late-peak,heatpump,2035,1.34080000000
+4,heat,R2,2045,6,all-year,all-week,late-peak,heatpump,2040,2.58330000000
+4,heat,R2,2050,3,all-year,all-week,late-peak,heatpump,2040,2.58330000000
+4,heat,R2,2050,4,all-year,all-week,late-peak,heatpump,2045,1.91670000000
+4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2040,2.58330000000
+4,heat,R2,2050,7,all-year,all-week,late-peak,heatpump,2045,1.91670000000
+4,CO2f,R1,2045,0,all-year,all-week,late-peak,gasboiler,2035,4.90720000000
+4,CO2f,R1,2045,1,all-year,all-week,late-peak,gasboiler,2035,4.90720000000
+4,CO2f,R2,2045,0,all-year,all-week,late-peak,gasboiler,2035,4.90720000000
+4,CO2f,R2,2045,1,all-year,all-week,late-peak,gasboiler,2035,4.90720000000
+5,heat,R1,2045,0,all-year,all-week,evening,gasboiler,2035,0.05060000000
+5,heat,R1,2045,1,all-year,all-week,evening,gasboiler,2035,0.05060000000
+5,heat,R1,2045,2,all-year,all-week,evening,heatpump,2035,0.89390000000
+5,heat,R1,2045,3,all-year,all-week,evening,heatpump,2040,1.72220000000
+5,heat,R1,2045,5,all-year,all-week,evening,heatpump,2035,0.89390000000
+5,heat,R1,2045,6,all-year,all-week,evening,heatpump,2040,1.72220000000
+5,heat,R1,2050,3,all-year,all-week,evening,heatpump,2040,1.72220000000
+5,heat,R1,2050,4,all-year,all-week,evening,heatpump,2045,1.27780000000
+5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2040,1.72220000000
+5,heat,R1,2050,7,all-year,all-week,evening,heatpump,2045,1.27780000000
+5,heat,R2,2045,0,all-year,all-week,evening,gasboiler,2035,0.05060000000
+5,heat,R2,2045,1,all-year,all-week,evening,gasboiler,2035,0.05060000000
+5,heat,R2,2045,2,all-year,all-week,evening,heatpump,2035,0.89390000000
+5,heat,R2,2045,3,all-year,all-week,evening,heatpump,2040,1.72220000000
+5,heat,R2,2045,5,all-year,all-week,evening,heatpump,2035,0.89390000000
+5,heat,R2,2045,6,all-year,all-week,evening,heatpump,2040,1.72220000000
+5,heat,R2,2050,3,all-year,all-week,evening,heatpump,2040,1.72220000000
+5,heat,R2,2050,4,all-year,all-week,evening,heatpump,2045,1.27780000000
+5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2040,1.72220000000
+5,heat,R2,2050,7,all-year,all-week,evening,heatpump,2045,1.27780000000
+5,CO2f,R1,2045,0,all-year,all-week,evening,gasboiler,2035,3.27140000000
+5,CO2f,R1,2045,1,all-year,all-week,evening,gasboiler,2035,3.27140000000
+5,CO2f,R2,2045,0,all-year,all-week,evening,gasboiler,2035,3.27140000000
+5,CO2f,R2,2045,1,all-year,all-week,evening,gasboiler,2035,3.27140000000
diff --git a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2050.csv b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2050.csv
index 26d4aa269..95e99a1ce 100644
--- a/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/3-add-region/1-new-region/Results/Residential/Supply/2050.csv
@@ -1,97 +1,97 @@
-timeslice,commodity,region,year,asset,installed,technology,month,day,hour,supply
-0,heat,R1,2050,2,2040,heatpump,all-year,all-week,night,0.86110000000
-0,heat,R1,2050,3,2045,heatpump,all-year,all-week,night,0.63890000000
-0,heat,R1,2050,7,2040,heatpump,all-year,all-week,night,0.86110000000
-0,heat,R1,2050,8,2045,heatpump,all-year,all-week,night,0.63890000000
-0,heat,R1,2055,3,2045,heatpump,all-year,all-week,night,0.63890000000
-0,heat,R1,2055,4,2050,heatpump,all-year,all-week,night,0.86110000000
-0,heat,R1,2055,8,2045,heatpump,all-year,all-week,night,0.63890000000
-0,heat,R1,2055,9,2050,heatpump,all-year,all-week,night,0.86110000000
-0,heat,R2,2050,2,2040,heatpump,all-year,all-week,night,0.86110000000
-0,heat,R2,2050,3,2045,heatpump,all-year,all-week,night,0.63890000000
-0,heat,R2,2050,7,2040,heatpump,all-year,all-week,night,0.86110000000
-0,heat,R2,2050,8,2045,heatpump,all-year,all-week,night,0.63890000000
-0,heat,R2,2055,3,2045,heatpump,all-year,all-week,night,0.63890000000
-0,heat,R2,2055,4,2050,heatpump,all-year,all-week,night,0.86110000000
-0,heat,R2,2055,8,2045,heatpump,all-year,all-week,night,0.63890000000
-0,heat,R2,2055,9,2050,heatpump,all-year,all-week,night,0.86110000000
-1,heat,R1,2050,2,2040,heatpump,all-year,all-week,morning,1.29170000000
-1,heat,R1,2050,3,2045,heatpump,all-year,all-week,morning,0.95830000000
-1,heat,R1,2050,7,2040,heatpump,all-year,all-week,morning,1.29170000000
-1,heat,R1,2050,8,2045,heatpump,all-year,all-week,morning,0.95830000000
-1,heat,R1,2055,3,2045,heatpump,all-year,all-week,morning,0.95830000000
-1,heat,R1,2055,4,2050,heatpump,all-year,all-week,morning,1.29170000000
-1,heat,R1,2055,8,2045,heatpump,all-year,all-week,morning,0.95830000000
-1,heat,R1,2055,9,2050,heatpump,all-year,all-week,morning,1.29170000000
-1,heat,R2,2050,2,2040,heatpump,all-year,all-week,morning,1.29170000000
-1,heat,R2,2050,3,2045,heatpump,all-year,all-week,morning,0.95830000000
-1,heat,R2,2050,7,2040,heatpump,all-year,all-week,morning,1.29170000000
-1,heat,R2,2050,8,2045,heatpump,all-year,all-week,morning,0.95830000000
-1,heat,R2,2055,3,2045,heatpump,all-year,all-week,morning,0.95830000000
-1,heat,R2,2055,4,2050,heatpump,all-year,all-week,morning,1.29170000000
-1,heat,R2,2055,8,2045,heatpump,all-year,all-week,morning,0.95830000000
-1,heat,R2,2055,9,2050,heatpump,all-year,all-week,morning,1.29170000000
-2,heat,R1,2050,2,2040,heatpump,all-year,all-week,afternoon,0.86110000000
-2,heat,R1,2050,3,2045,heatpump,all-year,all-week,afternoon,0.63890000000
-2,heat,R1,2050,7,2040,heatpump,all-year,all-week,afternoon,0.86110000000
-2,heat,R1,2050,8,2045,heatpump,all-year,all-week,afternoon,0.63890000000
-2,heat,R1,2055,3,2045,heatpump,all-year,all-week,afternoon,0.63890000000
-2,heat,R1,2055,4,2050,heatpump,all-year,all-week,afternoon,0.86110000000
-2,heat,R1,2055,8,2045,heatpump,all-year,all-week,afternoon,0.63890000000
-2,heat,R1,2055,9,2050,heatpump,all-year,all-week,afternoon,0.86110000000
-2,heat,R2,2050,2,2040,heatpump,all-year,all-week,afternoon,0.86110000000
-2,heat,R2,2050,3,2045,heatpump,all-year,all-week,afternoon,0.63890000000
-2,heat,R2,2050,7,2040,heatpump,all-year,all-week,afternoon,0.86110000000
-2,heat,R2,2050,8,2045,heatpump,all-year,all-week,afternoon,0.63890000000
-2,heat,R2,2055,3,2045,heatpump,all-year,all-week,afternoon,0.63890000000
-2,heat,R2,2055,4,2050,heatpump,all-year,all-week,afternoon,0.86110000000
-2,heat,R2,2055,8,2045,heatpump,all-year,all-week,afternoon,0.63890000000
-2,heat,R2,2055,9,2050,heatpump,all-year,all-week,afternoon,0.86110000000
-3,heat,R1,2050,2,2040,heatpump,all-year,all-week,early-peak,1.29170000000
-3,heat,R1,2050,3,2045,heatpump,all-year,all-week,early-peak,0.95830000000
-3,heat,R1,2050,7,2040,heatpump,all-year,all-week,early-peak,1.29170000000
-3,heat,R1,2050,8,2045,heatpump,all-year,all-week,early-peak,0.95830000000
-3,heat,R1,2055,3,2045,heatpump,all-year,all-week,early-peak,0.95830000000
-3,heat,R1,2055,4,2050,heatpump,all-year,all-week,early-peak,1.29170000000
-3,heat,R1,2055,8,2045,heatpump,all-year,all-week,early-peak,0.95830000000
-3,heat,R1,2055,9,2050,heatpump,all-year,all-week,early-peak,1.29170000000
-3,heat,R2,2050,2,2040,heatpump,all-year,all-week,early-peak,1.29170000000
-3,heat,R2,2050,3,2045,heatpump,all-year,all-week,early-peak,0.95830000000
-3,heat,R2,2050,7,2040,heatpump,all-year,all-week,early-peak,1.29170000000
-3,heat,R2,2050,8,2045,heatpump,all-year,all-week,early-peak,0.95830000000
-3,heat,R2,2055,3,2045,heatpump,all-year,all-week,early-peak,0.95830000000
-3,heat,R2,2055,4,2050,heatpump,all-year,all-week,early-peak,1.29170000000
-3,heat,R2,2055,8,2045,heatpump,all-year,all-week,early-peak,0.95830000000
-3,heat,R2,2055,9,2050,heatpump,all-year,all-week,early-peak,1.29170000000
-4,heat,R1,2050,2,2040,heatpump,all-year,all-week,late-peak,2.58330000000
-4,heat,R1,2050,3,2045,heatpump,all-year,all-week,late-peak,1.91670000000
-4,heat,R1,2050,7,2040,heatpump,all-year,all-week,late-peak,2.58330000000
-4,heat,R1,2050,8,2045,heatpump,all-year,all-week,late-peak,1.91670000000
-4,heat,R1,2055,3,2045,heatpump,all-year,all-week,late-peak,1.91670000000
-4,heat,R1,2055,4,2050,heatpump,all-year,all-week,late-peak,2.58330000000
-4,heat,R1,2055,8,2045,heatpump,all-year,all-week,late-peak,1.91670000000
-4,heat,R1,2055,9,2050,heatpump,all-year,all-week,late-peak,2.58330000000
-4,heat,R2,2050,2,2040,heatpump,all-year,all-week,late-peak,2.58330000000
-4,heat,R2,2050,3,2045,heatpump,all-year,all-week,late-peak,1.91670000000
-4,heat,R2,2050,7,2040,heatpump,all-year,all-week,late-peak,2.58330000000
-4,heat,R2,2050,8,2045,heatpump,all-year,all-week,late-peak,1.91670000000
-4,heat,R2,2055,3,2045,heatpump,all-year,all-week,late-peak,1.91670000000
-4,heat,R2,2055,4,2050,heatpump,all-year,all-week,late-peak,2.58330000000
-4,heat,R2,2055,8,2045,heatpump,all-year,all-week,late-peak,1.91670000000
-4,heat,R2,2055,9,2050,heatpump,all-year,all-week,late-peak,2.58330000000
-5,heat,R1,2050,2,2040,heatpump,all-year,all-week,evening,1.72220000000
-5,heat,R1,2050,3,2045,heatpump,all-year,all-week,evening,1.27780000000
-5,heat,R1,2050,7,2040,heatpump,all-year,all-week,evening,1.72220000000
-5,heat,R1,2050,8,2045,heatpump,all-year,all-week,evening,1.27780000000
-5,heat,R1,2055,3,2045,heatpump,all-year,all-week,evening,1.27780000000
-5,heat,R1,2055,4,2050,heatpump,all-year,all-week,evening,1.72220000000
-5,heat,R1,2055,8,2045,heatpump,all-year,all-week,evening,1.27780000000
-5,heat,R1,2055,9,2050,heatpump,all-year,all-week,evening,1.72220000000
-5,heat,R2,2050,2,2040,heatpump,all-year,all-week,evening,1.72220000000
-5,heat,R2,2050,3,2045,heatpump,all-year,all-week,evening,1.27780000000
-5,heat,R2,2050,7,2040,heatpump,all-year,all-week,evening,1.72220000000
-5,heat,R2,2050,8,2045,heatpump,all-year,all-week,evening,1.27780000000
-5,heat,R2,2055,3,2045,heatpump,all-year,all-week,evening,1.27780000000
-5,heat,R2,2055,4,2050,heatpump,all-year,all-week,evening,1.72220000000
-5,heat,R2,2055,8,2045,heatpump,all-year,all-week,evening,1.27780000000
-5,heat,R2,2055,9,2050,heatpump,all-year,all-week,evening,1.72220000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2050,2,all-year,all-week,night,heatpump,2040,0.86110000000
+0,heat,R1,2050,3,all-year,all-week,night,heatpump,2045,0.63890000000
+0,heat,R1,2050,7,all-year,all-week,night,heatpump,2040,0.86110000000
+0,heat,R1,2050,8,all-year,all-week,night,heatpump,2045,0.63890000000
+0,heat,R1,2055,3,all-year,all-week,night,heatpump,2045,0.63890000000
+0,heat,R1,2055,4,all-year,all-week,night,heatpump,2050,0.86110000000
+0,heat,R1,2055,8,all-year,all-week,night,heatpump,2045,0.63890000000
+0,heat,R1,2055,9,all-year,all-week,night,heatpump,2050,0.86110000000
+0,heat,R2,2050,2,all-year,all-week,night,heatpump,2040,0.86110000000
+0,heat,R2,2050,3,all-year,all-week,night,heatpump,2045,0.63890000000
+0,heat,R2,2050,7,all-year,all-week,night,heatpump,2040,0.86110000000
+0,heat,R2,2050,8,all-year,all-week,night,heatpump,2045,0.63890000000
+0,heat,R2,2055,3,all-year,all-week,night,heatpump,2045,0.63890000000
+0,heat,R2,2055,4,all-year,all-week,night,heatpump,2050,0.86110000000
+0,heat,R2,2055,8,all-year,all-week,night,heatpump,2045,0.63890000000
+0,heat,R2,2055,9,all-year,all-week,night,heatpump,2050,0.86110000000
+1,heat,R1,2050,2,all-year,all-week,morning,heatpump,2040,1.29170000000
+1,heat,R1,2050,3,all-year,all-week,morning,heatpump,2045,0.95830000000
+1,heat,R1,2050,7,all-year,all-week,morning,heatpump,2040,1.29170000000
+1,heat,R1,2050,8,all-year,all-week,morning,heatpump,2045,0.95830000000
+1,heat,R1,2055,3,all-year,all-week,morning,heatpump,2045,0.95830000000
+1,heat,R1,2055,4,all-year,all-week,morning,heatpump,2050,1.29170000000
+1,heat,R1,2055,8,all-year,all-week,morning,heatpump,2045,0.95830000000
+1,heat,R1,2055,9,all-year,all-week,morning,heatpump,2050,1.29170000000
+1,heat,R2,2050,2,all-year,all-week,morning,heatpump,2040,1.29170000000
+1,heat,R2,2050,3,all-year,all-week,morning,heatpump,2045,0.95830000000
+1,heat,R2,2050,7,all-year,all-week,morning,heatpump,2040,1.29170000000
+1,heat,R2,2050,8,all-year,all-week,morning,heatpump,2045,0.95830000000
+1,heat,R2,2055,3,all-year,all-week,morning,heatpump,2045,0.95830000000
+1,heat,R2,2055,4,all-year,all-week,morning,heatpump,2050,1.29170000000
+1,heat,R2,2055,8,all-year,all-week,morning,heatpump,2045,0.95830000000
+1,heat,R2,2055,9,all-year,all-week,morning,heatpump,2050,1.29170000000
+2,heat,R1,2050,2,all-year,all-week,afternoon,heatpump,2040,0.86110000000
+2,heat,R1,2050,3,all-year,all-week,afternoon,heatpump,2045,0.63890000000
+2,heat,R1,2050,7,all-year,all-week,afternoon,heatpump,2040,0.86110000000
+2,heat,R1,2050,8,all-year,all-week,afternoon,heatpump,2045,0.63890000000
+2,heat,R1,2055,3,all-year,all-week,afternoon,heatpump,2045,0.63890000000
+2,heat,R1,2055,4,all-year,all-week,afternoon,heatpump,2050,0.86110000000
+2,heat,R1,2055,8,all-year,all-week,afternoon,heatpump,2045,0.63890000000
+2,heat,R1,2055,9,all-year,all-week,afternoon,heatpump,2050,0.86110000000
+2,heat,R2,2050,2,all-year,all-week,afternoon,heatpump,2040,0.86110000000
+2,heat,R2,2050,3,all-year,all-week,afternoon,heatpump,2045,0.63890000000
+2,heat,R2,2050,7,all-year,all-week,afternoon,heatpump,2040,0.86110000000
+2,heat,R2,2050,8,all-year,all-week,afternoon,heatpump,2045,0.63890000000
+2,heat,R2,2055,3,all-year,all-week,afternoon,heatpump,2045,0.63890000000
+2,heat,R2,2055,4,all-year,all-week,afternoon,heatpump,2050,0.86110000000
+2,heat,R2,2055,8,all-year,all-week,afternoon,heatpump,2045,0.63890000000
+2,heat,R2,2055,9,all-year,all-week,afternoon,heatpump,2050,0.86110000000
+3,heat,R1,2050,2,all-year,all-week,early-peak,heatpump,2040,1.29170000000
+3,heat,R1,2050,3,all-year,all-week,early-peak,heatpump,2045,0.95830000000
+3,heat,R1,2050,7,all-year,all-week,early-peak,heatpump,2040,1.29170000000
+3,heat,R1,2050,8,all-year,all-week,early-peak,heatpump,2045,0.95830000000
+3,heat,R1,2055,3,all-year,all-week,early-peak,heatpump,2045,0.95830000000
+3,heat,R1,2055,4,all-year,all-week,early-peak,heatpump,2050,1.29170000000
+3,heat,R1,2055,8,all-year,all-week,early-peak,heatpump,2045,0.95830000000
+3,heat,R1,2055,9,all-year,all-week,early-peak,heatpump,2050,1.29170000000
+3,heat,R2,2050,2,all-year,all-week,early-peak,heatpump,2040,1.29170000000
+3,heat,R2,2050,3,all-year,all-week,early-peak,heatpump,2045,0.95830000000
+3,heat,R2,2050,7,all-year,all-week,early-peak,heatpump,2040,1.29170000000
+3,heat,R2,2050,8,all-year,all-week,early-peak,heatpump,2045,0.95830000000
+3,heat,R2,2055,3,all-year,all-week,early-peak,heatpump,2045,0.95830000000
+3,heat,R2,2055,4,all-year,all-week,early-peak,heatpump,2050,1.29170000000
+3,heat,R2,2055,8,all-year,all-week,early-peak,heatpump,2045,0.95830000000
+3,heat,R2,2055,9,all-year,all-week,early-peak,heatpump,2050,1.29170000000
+4,heat,R1,2050,2,all-year,all-week,late-peak,heatpump,2040,2.58330000000
+4,heat,R1,2050,3,all-year,all-week,late-peak,heatpump,2045,1.91670000000
+4,heat,R1,2050,7,all-year,all-week,late-peak,heatpump,2040,2.58330000000
+4,heat,R1,2050,8,all-year,all-week,late-peak,heatpump,2045,1.91670000000
+4,heat,R1,2055,3,all-year,all-week,late-peak,heatpump,2045,1.91670000000
+4,heat,R1,2055,4,all-year,all-week,late-peak,heatpump,2050,2.58330000000
+4,heat,R1,2055,8,all-year,all-week,late-peak,heatpump,2045,1.91670000000
+4,heat,R1,2055,9,all-year,all-week,late-peak,heatpump,2050,2.58330000000
+4,heat,R2,2050,2,all-year,all-week,late-peak,heatpump,2040,2.58330000000
+4,heat,R2,2050,3,all-year,all-week,late-peak,heatpump,2045,1.91670000000
+4,heat,R2,2050,7,all-year,all-week,late-peak,heatpump,2040,2.58330000000
+4,heat,R2,2050,8,all-year,all-week,late-peak,heatpump,2045,1.91670000000
+4,heat,R2,2055,3,all-year,all-week,late-peak,heatpump,2045,1.91670000000
+4,heat,R2,2055,4,all-year,all-week,late-peak,heatpump,2050,2.58330000000
+4,heat,R2,2055,8,all-year,all-week,late-peak,heatpump,2045,1.91670000000
+4,heat,R2,2055,9,all-year,all-week,late-peak,heatpump,2050,2.58330000000
+5,heat,R1,2050,2,all-year,all-week,evening,heatpump,2040,1.72220000000
+5,heat,R1,2050,3,all-year,all-week,evening,heatpump,2045,1.27780000000
+5,heat,R1,2050,7,all-year,all-week,evening,heatpump,2040,1.72220000000
+5,heat,R1,2050,8,all-year,all-week,evening,heatpump,2045,1.27780000000
+5,heat,R1,2055,3,all-year,all-week,evening,heatpump,2045,1.27780000000
+5,heat,R1,2055,4,all-year,all-week,evening,heatpump,2050,1.72220000000
+5,heat,R1,2055,8,all-year,all-week,evening,heatpump,2045,1.27780000000
+5,heat,R1,2055,9,all-year,all-week,evening,heatpump,2050,1.72220000000
+5,heat,R2,2050,2,all-year,all-week,evening,heatpump,2040,1.72220000000
+5,heat,R2,2050,3,all-year,all-week,evening,heatpump,2045,1.27780000000
+5,heat,R2,2050,7,all-year,all-week,evening,heatpump,2040,1.72220000000
+5,heat,R2,2050,8,all-year,all-week,evening,heatpump,2045,1.27780000000
+5,heat,R2,2055,3,all-year,all-week,evening,heatpump,2045,1.27780000000
+5,heat,R2,2055,4,all-year,all-week,evening,heatpump,2050,1.72220000000
+5,heat,R2,2055,8,all-year,all-week,evening,heatpump,2045,1.27780000000
+5,heat,R2,2055,9,all-year,all-week,evening,heatpump,2050,1.72220000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2020.csv
index 192f9bf99..1d028468e 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2020.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2020.csv
@@ -1,7 +1,7 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gassupply1,15.00000000000
-0,2025,R1,2020,gassupply1,15.00000000000
-0,2030,R1,2020,gassupply1,7.50000000000
-1,2020,R2,2020,gassupply1,15.00000000000
-1,2025,R2,2020,gassupply1,15.00000000000
-1,2030,R2,2020,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2020,R2,gassupply1,2020,15.00000000000
+1,2025,R2,gassupply1,2020,15.00000000000
+1,2030,R2,gassupply1,2020,7.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2025.csv
index 3c032c34b..8fb7bfc19 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2025.csv
@@ -1,17 +1,17 @@
-asset,year,region,installed,technology,capacity
-0,2025,R1,2020,gassupply1,15.00000000000
-0,2030,R1,2020,gassupply1,7.50000000000
-1,2030,R1,2025,gassupply1,0.27200000000
-1,2035,R1,2025,gassupply1,0.27200000000
-1,2040,R1,2025,gassupply1,0.27200000000
-1,2045,R1,2025,gassupply1,0.27200000000
-1,2050,R1,2025,gassupply1,0.27200000000
-1,2064,R1,2025,gassupply1,0.27200000000
-2,2025,R2,2020,gassupply1,15.00000000000
-2,2030,R2,2020,gassupply1,7.50000000000
-3,2030,R2,2025,gassupply1,0.27200000000
-3,2035,R2,2025,gassupply1,0.27200000000
-3,2040,R2,2025,gassupply1,0.27200000000
-3,2045,R2,2025,gassupply1,0.27200000000
-3,2050,R2,2025,gassupply1,0.27200000000
-3,2064,R2,2025,gassupply1,0.27200000000
+asset,year,region,technology,installed,capacity
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2030,R1,gassupply1,2025,0.27200000000
+1,2035,R1,gassupply1,2025,0.27200000000
+1,2040,R1,gassupply1,2025,0.27200000000
+1,2045,R1,gassupply1,2025,0.27200000000
+1,2050,R1,gassupply1,2025,0.27200000000
+1,2064,R1,gassupply1,2025,0.27200000000
+2,2025,R2,gassupply1,2020,15.00000000000
+2,2030,R2,gassupply1,2020,7.50000000000
+3,2030,R2,gassupply1,2025,0.27200000000
+3,2035,R2,gassupply1,2025,0.27200000000
+3,2040,R2,gassupply1,2025,0.27200000000
+3,2045,R2,gassupply1,2025,0.27200000000
+3,2050,R2,gassupply1,2025,0.27200000000
+3,2064,R2,gassupply1,2025,0.27200000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2030.csv
index 8951d4a97..17bb49b74 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2030.csv
@@ -1,29 +1,29 @@
-asset,year,region,installed,technology,capacity
-0,2030,R1,2020,gassupply1,7.50000000000
-1,2030,R1,2025,gassupply1,0.27200000000
-1,2035,R1,2025,gassupply1,0.27200000000
-1,2040,R1,2025,gassupply1,0.27200000000
-1,2045,R1,2025,gassupply1,0.27200000000
-1,2050,R1,2025,gassupply1,0.27200000000
-1,2064,R1,2025,gassupply1,0.27200000000
-2,2035,R1,2030,gassupply1,7.50000000000
-2,2040,R1,2030,gassupply1,7.50000000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
-3,2030,R2,2020,gassupply1,7.50000000000
-4,2030,R2,2025,gassupply1,0.27200000000
-4,2035,R2,2025,gassupply1,0.27200000000
-4,2040,R2,2025,gassupply1,0.27200000000
-4,2045,R2,2025,gassupply1,0.27200000000
-4,2050,R2,2025,gassupply1,0.27200000000
-4,2064,R2,2025,gassupply1,0.27200000000
-5,2035,R2,2030,gassupply1,7.50000000000
-5,2040,R2,2030,gassupply1,7.50000000000
-5,2045,R2,2030,gassupply1,7.50000000000
-5,2050,R2,2030,gassupply1,7.50000000000
-5,2064,R2,2030,gassupply1,7.50000000000
-5,2065,R2,2030,gassupply1,7.50000000000
-5,2069,R2,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2030,R1,gassupply1,2025,0.27200000000
+1,2035,R1,gassupply1,2025,0.27200000000
+1,2040,R1,gassupply1,2025,0.27200000000
+1,2045,R1,gassupply1,2025,0.27200000000
+1,2050,R1,gassupply1,2025,0.27200000000
+1,2064,R1,gassupply1,2025,0.27200000000
+2,2035,R1,gassupply1,2030,7.50000000000
+2,2040,R1,gassupply1,2030,7.50000000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
+3,2030,R2,gassupply1,2020,7.50000000000
+4,2030,R2,gassupply1,2025,0.27200000000
+4,2035,R2,gassupply1,2025,0.27200000000
+4,2040,R2,gassupply1,2025,0.27200000000
+4,2045,R2,gassupply1,2025,0.27200000000
+4,2050,R2,gassupply1,2025,0.27200000000
+4,2064,R2,gassupply1,2025,0.27200000000
+5,2035,R2,gassupply1,2030,7.50000000000
+5,2040,R2,gassupply1,2030,7.50000000000
+5,2045,R2,gassupply1,2030,7.50000000000
+5,2050,R2,gassupply1,2030,7.50000000000
+5,2064,R2,gassupply1,2030,7.50000000000
+5,2065,R2,gassupply1,2030,7.50000000000
+5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2035.csv
index a056e2617..0fa955e87 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2035.csv
@@ -1,25 +1,25 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2025,gassupply1,0.27200000000
-1,2040,R1,2025,gassupply1,0.27200000000
-1,2045,R1,2025,gassupply1,0.27200000000
-1,2050,R1,2025,gassupply1,0.27200000000
-1,2064,R1,2025,gassupply1,0.27200000000
-2,2035,R1,2030,gassupply1,7.50000000000
-2,2040,R1,2030,gassupply1,7.50000000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
-4,2035,R2,2025,gassupply1,0.27200000000
-4,2040,R2,2025,gassupply1,0.27200000000
-4,2045,R2,2025,gassupply1,0.27200000000
-4,2050,R2,2025,gassupply1,0.27200000000
-4,2064,R2,2025,gassupply1,0.27200000000
-5,2035,R2,2030,gassupply1,7.50000000000
-5,2040,R2,2030,gassupply1,7.50000000000
-5,2045,R2,2030,gassupply1,7.50000000000
-5,2050,R2,2030,gassupply1,7.50000000000
-5,2064,R2,2030,gassupply1,7.50000000000
-5,2065,R2,2030,gassupply1,7.50000000000
-5,2069,R2,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2035,R1,gassupply1,2025,0.27200000000
+1,2040,R1,gassupply1,2025,0.27200000000
+1,2045,R1,gassupply1,2025,0.27200000000
+1,2050,R1,gassupply1,2025,0.27200000000
+1,2064,R1,gassupply1,2025,0.27200000000
+2,2035,R1,gassupply1,2030,7.50000000000
+2,2040,R1,gassupply1,2030,7.50000000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
+4,2035,R2,gassupply1,2025,0.27200000000
+4,2040,R2,gassupply1,2025,0.27200000000
+4,2045,R2,gassupply1,2025,0.27200000000
+4,2050,R2,gassupply1,2025,0.27200000000
+4,2064,R2,gassupply1,2025,0.27200000000
+5,2035,R2,gassupply1,2030,7.50000000000
+5,2040,R2,gassupply1,2030,7.50000000000
+5,2045,R2,gassupply1,2030,7.50000000000
+5,2050,R2,gassupply1,2030,7.50000000000
+5,2064,R2,gassupply1,2030,7.50000000000
+5,2065,R2,gassupply1,2030,7.50000000000
+5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2040.csv
index 0c2112af4..73e0fda62 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2040.csv
@@ -1,21 +1,21 @@
-asset,year,region,installed,technology,capacity
-1,2040,R1,2025,gassupply1,0.27200000000
-1,2045,R1,2025,gassupply1,0.27200000000
-1,2050,R1,2025,gassupply1,0.27200000000
-1,2064,R1,2025,gassupply1,0.27200000000
-2,2040,R1,2030,gassupply1,7.50000000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
-4,2040,R2,2025,gassupply1,0.27200000000
-4,2045,R2,2025,gassupply1,0.27200000000
-4,2050,R2,2025,gassupply1,0.27200000000
-4,2064,R2,2025,gassupply1,0.27200000000
-5,2040,R2,2030,gassupply1,7.50000000000
-5,2045,R2,2030,gassupply1,7.50000000000
-5,2050,R2,2030,gassupply1,7.50000000000
-5,2064,R2,2030,gassupply1,7.50000000000
-5,2065,R2,2030,gassupply1,7.50000000000
-5,2069,R2,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2040,R1,gassupply1,2025,0.27200000000
+1,2045,R1,gassupply1,2025,0.27200000000
+1,2050,R1,gassupply1,2025,0.27200000000
+1,2064,R1,gassupply1,2025,0.27200000000
+2,2040,R1,gassupply1,2030,7.50000000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
+4,2040,R2,gassupply1,2025,0.27200000000
+4,2045,R2,gassupply1,2025,0.27200000000
+4,2050,R2,gassupply1,2025,0.27200000000
+4,2064,R2,gassupply1,2025,0.27200000000
+5,2040,R2,gassupply1,2030,7.50000000000
+5,2045,R2,gassupply1,2030,7.50000000000
+5,2050,R2,gassupply1,2030,7.50000000000
+5,2064,R2,gassupply1,2030,7.50000000000
+5,2065,R2,gassupply1,2030,7.50000000000
+5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2045.csv
index 20d6c8b3d..615e96d1c 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2045.csv
@@ -1,17 +1,17 @@
-asset,year,region,installed,technology,capacity
-1,2045,R1,2025,gassupply1,0.27200000000
-1,2050,R1,2025,gassupply1,0.27200000000
-1,2064,R1,2025,gassupply1,0.27200000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
-4,2045,R2,2025,gassupply1,0.27200000000
-4,2050,R2,2025,gassupply1,0.27200000000
-4,2064,R2,2025,gassupply1,0.27200000000
-5,2045,R2,2030,gassupply1,7.50000000000
-5,2050,R2,2030,gassupply1,7.50000000000
-5,2064,R2,2030,gassupply1,7.50000000000
-5,2065,R2,2030,gassupply1,7.50000000000
-5,2069,R2,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2045,R1,gassupply1,2025,0.27200000000
+1,2050,R1,gassupply1,2025,0.27200000000
+1,2064,R1,gassupply1,2025,0.27200000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
+4,2045,R2,gassupply1,2025,0.27200000000
+4,2050,R2,gassupply1,2025,0.27200000000
+4,2064,R2,gassupply1,2025,0.27200000000
+5,2045,R2,gassupply1,2030,7.50000000000
+5,2050,R2,gassupply1,2030,7.50000000000
+5,2064,R2,gassupply1,2030,7.50000000000
+5,2065,R2,gassupply1,2030,7.50000000000
+5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2050.csv
index 857dfbd46..6cf92b7f5 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Gas/Capacity/2050.csv
@@ -1,17 +1,17 @@
-asset,year,region,installed,technology,capacity
-1,2050,R1,2025,gassupply1,0.27200000000
-1,2055,R1,2025,gassupply1,0.27200000000
-1,2064,R1,2025,gassupply1,0.27200000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2055,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
-4,2050,R2,2025,gassupply1,0.27200000000
-4,2055,R2,2025,gassupply1,0.27200000000
-4,2064,R2,2025,gassupply1,0.27200000000
-5,2050,R2,2030,gassupply1,7.50000000000
-5,2055,R2,2030,gassupply1,7.50000000000
-5,2064,R2,2030,gassupply1,7.50000000000
-5,2065,R2,2030,gassupply1,7.50000000000
-5,2069,R2,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2050,R1,gassupply1,2025,0.27200000000
+1,2055,R1,gassupply1,2025,0.27200000000
+1,2064,R1,gassupply1,2025,0.27200000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2055,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
+4,2050,R2,gassupply1,2025,0.27200000000
+4,2055,R2,gassupply1,2025,0.27200000000
+4,2064,R2,gassupply1,2025,0.27200000000
+5,2050,R2,gassupply1,2030,7.50000000000
+5,2055,R2,gassupply1,2030,7.50000000000
+5,2064,R2,gassupply1,2030,7.50000000000
+5,2065,R2,gassupply1,2030,7.50000000000
+5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2020.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2020.csv
index fa3748811..3cc9d052e 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2020.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2020.csv
@@ -1,23 +1,23 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gasCCGT,1.00000000000
-0,2025,R1,2020,gasCCGT,1.00000000000
-1,2025,R1,2020,solarPV,5.60870000000
-1,2030,R1,2020,solarPV,5.60870000000
-1,2035,R1,2020,solarPV,5.60870000000
-1,2040,R1,2020,solarPV,5.60870000000
-1,2045,R1,2020,solarPV,5.60870000000
-1,2049,R1,2020,solarPV,5.60870000000
-2,2025,R1,2020,windturbine,10.00000000000
-2,2030,R1,2020,windturbine,10.00000000000
-2,2035,R1,2020,windturbine,10.00000000000
-2,2040,R1,2020,windturbine,10.00000000000
-2,2045,R1,2020,windturbine,10.00000000000
-2,2049,R1,2020,windturbine,10.00000000000
-3,2020,R2,2020,gasCCGT,1.00000000000
-3,2025,R2,2020,gasCCGT,1.00000000000
-4,2025,R2,2020,windturbine,15.60870000000
-4,2030,R2,2020,windturbine,15.60870000000
-4,2035,R2,2020,windturbine,15.60870000000
-4,2040,R2,2020,windturbine,15.60870000000
-4,2045,R2,2020,windturbine,15.60870000000
-4,2049,R2,2020,windturbine,15.60870000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2025,R1,solarPV,2020,5.60870000000
+1,2030,R1,solarPV,2020,5.60870000000
+1,2035,R1,solarPV,2020,5.60870000000
+1,2040,R1,solarPV,2020,5.60870000000
+1,2045,R1,solarPV,2020,5.60870000000
+1,2049,R1,solarPV,2020,5.60870000000
+2,2025,R1,windturbine,2020,10.00000000000
+2,2030,R1,windturbine,2020,10.00000000000
+2,2035,R1,windturbine,2020,10.00000000000
+2,2040,R1,windturbine,2020,10.00000000000
+2,2045,R1,windturbine,2020,10.00000000000
+2,2049,R1,windturbine,2020,10.00000000000
+3,2020,R2,gasCCGT,2020,1.00000000000
+3,2025,R2,gasCCGT,2020,1.00000000000
+4,2025,R2,windturbine,2020,15.60870000000
+4,2030,R2,windturbine,2020,15.60870000000
+4,2035,R2,windturbine,2020,15.60870000000
+4,2040,R2,windturbine,2020,15.60870000000
+4,2045,R2,windturbine,2020,15.60870000000
+4,2049,R2,windturbine,2020,15.60870000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2030.csv
index 912682464..973bfbcb7 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2030.csv
@@ -1,76 +1,76 @@
-asset,year,region,installed,technology,capacity
-1,2030,R1,2020,solarPV,5.60870000000
-1,2035,R1,2020,solarPV,5.60870000000
-1,2040,R1,2020,solarPV,5.60870000000
-1,2045,R1,2020,solarPV,5.60870000000
-1,2049,R1,2020,solarPV,5.60870000000
-2,2030,R1,2020,windturbine,10.00000000000
-2,2035,R1,2020,windturbine,10.00000000000
-2,2040,R1,2020,windturbine,10.00000000000
-2,2045,R1,2020,windturbine,10.00000000000
-2,2049,R1,2020,windturbine,10.00000000000
-3,2030,R1,2025,gasCCGT,3.00000000000
-3,2035,R1,2025,gasCCGT,3.00000000000
-3,2040,R1,2025,gasCCGT,3.00000000000
-3,2045,R1,2025,gasCCGT,3.00000000000
-3,2049,R1,2025,gasCCGT,3.00000000000
-3,2050,R1,2025,gasCCGT,3.00000000000
-3,2054,R1,2025,gasCCGT,3.00000000000
-3,2055,R1,2025,gasCCGT,3.00000000000
-3,2059,R1,2025,gasCCGT,3.00000000000
-3,2060,R1,2025,gasCCGT,3.00000000000
-3,2064,R1,2025,gasCCGT,3.00000000000
-4,2030,R1,2025,solarPV,4.07170000000
-4,2035,R1,2025,solarPV,4.07170000000
-4,2040,R1,2025,solarPV,4.07170000000
-4,2045,R1,2025,solarPV,4.07170000000
-4,2049,R1,2025,solarPV,4.07170000000
-4,2050,R1,2025,solarPV,4.07170000000
-4,2054,R1,2025,solarPV,4.07170000000
-5,2035,R1,2030,solarPV,5.71470000000
-5,2040,R1,2030,solarPV,5.71470000000
-5,2045,R1,2030,solarPV,5.71470000000
-5,2049,R1,2030,solarPV,5.71470000000
-5,2050,R1,2030,solarPV,5.71470000000
-5,2054,R1,2030,solarPV,5.71470000000
-5,2055,R1,2030,solarPV,5.71470000000
-5,2059,R1,2030,solarPV,5.71470000000
-7,2030,R2,2020,windturbine,15.60870000000
-7,2035,R2,2020,windturbine,15.60870000000
-7,2040,R2,2020,windturbine,15.60870000000
-7,2045,R2,2020,windturbine,15.60870000000
-7,2049,R2,2020,windturbine,15.60870000000
-8,2030,R2,2025,gasCCGT,3.00000000000
-8,2035,R2,2025,gasCCGT,3.00000000000
-8,2040,R2,2025,gasCCGT,3.00000000000
-8,2045,R2,2025,gasCCGT,3.00000000000
-8,2049,R2,2025,gasCCGT,3.00000000000
-8,2050,R2,2025,gasCCGT,3.00000000000
-8,2054,R2,2025,gasCCGT,3.00000000000
-8,2055,R2,2025,gasCCGT,3.00000000000
-8,2059,R2,2025,gasCCGT,3.00000000000
-8,2060,R2,2025,gasCCGT,3.00000000000
-8,2064,R2,2025,gasCCGT,3.00000000000
-9,2030,R2,2025,solarPV,4.07170000000
-9,2035,R2,2025,solarPV,4.07170000000
-9,2040,R2,2025,solarPV,4.07170000000
-9,2045,R2,2025,solarPV,4.07170000000
-9,2049,R2,2025,solarPV,4.07170000000
-9,2050,R2,2025,solarPV,4.07170000000
-9,2054,R2,2025,solarPV,4.07170000000
-10,2035,R2,2030,solarPV,4.07170000000
-10,2040,R2,2030,solarPV,4.07170000000
-10,2045,R2,2030,solarPV,4.07170000000
-10,2049,R2,2030,solarPV,4.07170000000
-10,2050,R2,2030,solarPV,4.07170000000
-10,2054,R2,2030,solarPV,4.07170000000
-10,2055,R2,2030,solarPV,4.07170000000
-10,2059,R2,2030,solarPV,4.07170000000
-11,2035,R2,2030,windturbine,1.64290000000
-11,2040,R2,2030,windturbine,1.64290000000
-11,2045,R2,2030,windturbine,1.64290000000
-11,2049,R2,2030,windturbine,1.64290000000
-11,2050,R2,2030,windturbine,1.64290000000
-11,2054,R2,2030,windturbine,1.64290000000
-11,2055,R2,2030,windturbine,1.64290000000
-11,2059,R2,2030,windturbine,1.64290000000
+asset,year,region,technology,installed,capacity
+1,2030,R1,gasCCGT,2025,3.00000000000
+1,2035,R1,gasCCGT,2025,3.00000000000
+1,2040,R1,gasCCGT,2025,3.00000000000
+1,2045,R1,gasCCGT,2025,3.00000000000
+1,2049,R1,gasCCGT,2025,3.00000000000
+1,2050,R1,gasCCGT,2025,3.00000000000
+1,2054,R1,gasCCGT,2025,3.00000000000
+1,2055,R1,gasCCGT,2025,3.00000000000
+1,2059,R1,gasCCGT,2025,3.00000000000
+1,2060,R1,gasCCGT,2025,3.00000000000
+1,2064,R1,gasCCGT,2025,3.00000000000
+2,2030,R1,solarPV,2020,5.60870000000
+2,2035,R1,solarPV,2020,5.60870000000
+2,2040,R1,solarPV,2020,5.60870000000
+2,2045,R1,solarPV,2020,5.60870000000
+2,2049,R1,solarPV,2020,5.60870000000
+3,2030,R1,solarPV,2025,4.07170000000
+3,2035,R1,solarPV,2025,4.07170000000
+3,2040,R1,solarPV,2025,4.07170000000
+3,2045,R1,solarPV,2025,4.07170000000
+3,2049,R1,solarPV,2025,4.07170000000
+3,2050,R1,solarPV,2025,4.07170000000
+3,2054,R1,solarPV,2025,4.07170000000
+4,2035,R1,solarPV,2030,5.71470000000
+4,2040,R1,solarPV,2030,5.71470000000
+4,2045,R1,solarPV,2030,5.71470000000
+4,2049,R1,solarPV,2030,5.71470000000
+4,2050,R1,solarPV,2030,5.71470000000
+4,2054,R1,solarPV,2030,5.71470000000
+4,2055,R1,solarPV,2030,5.71470000000
+4,2059,R1,solarPV,2030,5.71470000000
+5,2030,R1,windturbine,2020,10.00000000000
+5,2035,R1,windturbine,2020,10.00000000000
+5,2040,R1,windturbine,2020,10.00000000000
+5,2045,R1,windturbine,2020,10.00000000000
+5,2049,R1,windturbine,2020,10.00000000000
+7,2030,R2,gasCCGT,2025,3.00000000000
+7,2035,R2,gasCCGT,2025,3.00000000000
+7,2040,R2,gasCCGT,2025,3.00000000000
+7,2045,R2,gasCCGT,2025,3.00000000000
+7,2049,R2,gasCCGT,2025,3.00000000000
+7,2050,R2,gasCCGT,2025,3.00000000000
+7,2054,R2,gasCCGT,2025,3.00000000000
+7,2055,R2,gasCCGT,2025,3.00000000000
+7,2059,R2,gasCCGT,2025,3.00000000000
+7,2060,R2,gasCCGT,2025,3.00000000000
+7,2064,R2,gasCCGT,2025,3.00000000000
+8,2030,R2,solarPV,2025,4.07170000000
+8,2035,R2,solarPV,2025,4.07170000000
+8,2040,R2,solarPV,2025,4.07170000000
+8,2045,R2,solarPV,2025,4.07170000000
+8,2049,R2,solarPV,2025,4.07170000000
+8,2050,R2,solarPV,2025,4.07170000000
+8,2054,R2,solarPV,2025,4.07170000000
+9,2035,R2,solarPV,2030,4.07170000000
+9,2040,R2,solarPV,2030,4.07170000000
+9,2045,R2,solarPV,2030,4.07170000000
+9,2049,R2,solarPV,2030,4.07170000000
+9,2050,R2,solarPV,2030,4.07170000000
+9,2054,R2,solarPV,2030,4.07170000000
+9,2055,R2,solarPV,2030,4.07170000000
+9,2059,R2,solarPV,2030,4.07170000000
+10,2030,R2,windturbine,2020,15.60870000000
+10,2035,R2,windturbine,2020,15.60870000000
+10,2040,R2,windturbine,2020,15.60870000000
+10,2045,R2,windturbine,2020,15.60870000000
+10,2049,R2,windturbine,2020,15.60870000000
+11,2035,R2,windturbine,2030,1.64290000000
+11,2040,R2,windturbine,2030,1.64290000000
+11,2045,R2,windturbine,2030,1.64290000000
+11,2049,R2,windturbine,2030,1.64290000000
+11,2050,R2,windturbine,2030,1.64290000000
+11,2054,R2,windturbine,2030,1.64290000000
+11,2055,R2,windturbine,2030,1.64290000000
+11,2059,R2,windturbine,2030,1.64290000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2035.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2035.csv
index 9eb834572..ad730ffc6 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2035.csv
@@ -1,87 +1,87 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2020,solarPV,5.60870000000
-1,2040,R1,2020,solarPV,5.60870000000
-1,2045,R1,2020,solarPV,5.60870000000
-1,2049,R1,2020,solarPV,5.60870000000
-2,2035,R1,2020,windturbine,10.00000000000
-2,2040,R1,2020,windturbine,10.00000000000
-2,2045,R1,2020,windturbine,10.00000000000
-2,2049,R1,2020,windturbine,10.00000000000
-3,2035,R1,2025,gasCCGT,3.00000000000
-3,2040,R1,2025,gasCCGT,3.00000000000
-3,2045,R1,2025,gasCCGT,3.00000000000
-3,2049,R1,2025,gasCCGT,3.00000000000
-3,2050,R1,2025,gasCCGT,3.00000000000
-3,2054,R1,2025,gasCCGT,3.00000000000
-3,2055,R1,2025,gasCCGT,3.00000000000
-3,2059,R1,2025,gasCCGT,3.00000000000
-3,2060,R1,2025,gasCCGT,3.00000000000
-3,2064,R1,2025,gasCCGT,3.00000000000
-4,2035,R1,2025,solarPV,4.07170000000
-4,2040,R1,2025,solarPV,4.07170000000
-4,2045,R1,2025,solarPV,4.07170000000
-4,2049,R1,2025,solarPV,4.07170000000
-4,2050,R1,2025,solarPV,4.07170000000
-4,2054,R1,2025,solarPV,4.07170000000
-5,2035,R1,2030,solarPV,5.71470000000
-5,2040,R1,2030,solarPV,5.71470000000
-5,2045,R1,2030,solarPV,5.71470000000
-5,2049,R1,2030,solarPV,5.71470000000
-5,2050,R1,2030,solarPV,5.71470000000
-5,2054,R1,2030,solarPV,5.71470000000
-5,2055,R1,2030,solarPV,5.71470000000
-5,2059,R1,2030,solarPV,5.71470000000
-6,2040,R1,2035,solarPV,7.85760000000
-6,2045,R1,2035,solarPV,7.85760000000
-6,2049,R1,2035,solarPV,7.85760000000
-6,2050,R1,2035,solarPV,7.85760000000
-6,2054,R1,2035,solarPV,7.85760000000
-6,2055,R1,2035,solarPV,7.85760000000
-6,2059,R1,2035,solarPV,7.85760000000
-6,2060,R1,2035,solarPV,7.85760000000
-6,2064,R1,2035,solarPV,7.85760000000
-8,2035,R2,2020,windturbine,15.60870000000
-8,2040,R2,2020,windturbine,15.60870000000
-8,2045,R2,2020,windturbine,15.60870000000
-8,2049,R2,2020,windturbine,15.60870000000
-9,2035,R2,2025,gasCCGT,3.00000000000
-9,2040,R2,2025,gasCCGT,3.00000000000
-9,2045,R2,2025,gasCCGT,3.00000000000
-9,2049,R2,2025,gasCCGT,3.00000000000
-9,2050,R2,2025,gasCCGT,3.00000000000
-9,2054,R2,2025,gasCCGT,3.00000000000
-9,2055,R2,2025,gasCCGT,3.00000000000
-9,2059,R2,2025,gasCCGT,3.00000000000
-9,2060,R2,2025,gasCCGT,3.00000000000
-9,2064,R2,2025,gasCCGT,3.00000000000
-10,2035,R2,2025,solarPV,4.07170000000
-10,2040,R2,2025,solarPV,4.07170000000
-10,2045,R2,2025,solarPV,4.07170000000
-10,2049,R2,2025,solarPV,4.07170000000
-10,2050,R2,2025,solarPV,4.07170000000
-10,2054,R2,2025,solarPV,4.07170000000
-11,2035,R2,2030,solarPV,4.07170000000
-11,2040,R2,2030,solarPV,4.07170000000
-11,2045,R2,2030,solarPV,4.07170000000
-11,2049,R2,2030,solarPV,4.07170000000
-11,2050,R2,2030,solarPV,4.07170000000
-11,2054,R2,2030,solarPV,4.07170000000
-11,2055,R2,2030,solarPV,4.07170000000
-11,2059,R2,2030,solarPV,4.07170000000
-12,2035,R2,2030,windturbine,1.64290000000
-12,2040,R2,2030,windturbine,1.64290000000
-12,2045,R2,2030,windturbine,1.64290000000
-12,2049,R2,2030,windturbine,1.64290000000
-12,2050,R2,2030,windturbine,1.64290000000
-12,2054,R2,2030,windturbine,1.64290000000
-12,2055,R2,2030,windturbine,1.64290000000
-12,2059,R2,2030,windturbine,1.64290000000
-13,2040,R2,2035,solarPV,7.85760000000
-13,2045,R2,2035,solarPV,7.85760000000
-13,2049,R2,2035,solarPV,7.85760000000
-13,2050,R2,2035,solarPV,7.85760000000
-13,2054,R2,2035,solarPV,7.85760000000
-13,2055,R2,2035,solarPV,7.85760000000
-13,2059,R2,2035,solarPV,7.85760000000
-13,2060,R2,2035,solarPV,7.85760000000
-13,2064,R2,2035,solarPV,7.85760000000
+asset,year,region,technology,installed,capacity
+1,2035,R1,gasCCGT,2025,3.00000000000
+1,2040,R1,gasCCGT,2025,3.00000000000
+1,2045,R1,gasCCGT,2025,3.00000000000
+1,2049,R1,gasCCGT,2025,3.00000000000
+1,2050,R1,gasCCGT,2025,3.00000000000
+1,2054,R1,gasCCGT,2025,3.00000000000
+1,2055,R1,gasCCGT,2025,3.00000000000
+1,2059,R1,gasCCGT,2025,3.00000000000
+1,2060,R1,gasCCGT,2025,3.00000000000
+1,2064,R1,gasCCGT,2025,3.00000000000
+2,2035,R1,solarPV,2020,5.60870000000
+2,2040,R1,solarPV,2020,5.60870000000
+2,2045,R1,solarPV,2020,5.60870000000
+2,2049,R1,solarPV,2020,5.60870000000
+3,2035,R1,solarPV,2025,4.07170000000
+3,2040,R1,solarPV,2025,4.07170000000
+3,2045,R1,solarPV,2025,4.07170000000
+3,2049,R1,solarPV,2025,4.07170000000
+3,2050,R1,solarPV,2025,4.07170000000
+3,2054,R1,solarPV,2025,4.07170000000
+4,2035,R1,solarPV,2030,5.71470000000
+4,2040,R1,solarPV,2030,5.71470000000
+4,2045,R1,solarPV,2030,5.71470000000
+4,2049,R1,solarPV,2030,5.71470000000
+4,2050,R1,solarPV,2030,5.71470000000
+4,2054,R1,solarPV,2030,5.71470000000
+4,2055,R1,solarPV,2030,5.71470000000
+4,2059,R1,solarPV,2030,5.71470000000
+5,2040,R1,solarPV,2035,7.85760000000
+5,2045,R1,solarPV,2035,7.85760000000
+5,2049,R1,solarPV,2035,7.85760000000
+5,2050,R1,solarPV,2035,7.85760000000
+5,2054,R1,solarPV,2035,7.85760000000
+5,2055,R1,solarPV,2035,7.85760000000
+5,2059,R1,solarPV,2035,7.85760000000
+5,2060,R1,solarPV,2035,7.85760000000
+5,2064,R1,solarPV,2035,7.85760000000
+6,2035,R1,windturbine,2020,10.00000000000
+6,2040,R1,windturbine,2020,10.00000000000
+6,2045,R1,windturbine,2020,10.00000000000
+6,2049,R1,windturbine,2020,10.00000000000
+8,2035,R2,gasCCGT,2025,3.00000000000
+8,2040,R2,gasCCGT,2025,3.00000000000
+8,2045,R2,gasCCGT,2025,3.00000000000
+8,2049,R2,gasCCGT,2025,3.00000000000
+8,2050,R2,gasCCGT,2025,3.00000000000
+8,2054,R2,gasCCGT,2025,3.00000000000
+8,2055,R2,gasCCGT,2025,3.00000000000
+8,2059,R2,gasCCGT,2025,3.00000000000
+8,2060,R2,gasCCGT,2025,3.00000000000
+8,2064,R2,gasCCGT,2025,3.00000000000
+9,2035,R2,solarPV,2025,4.07170000000
+9,2040,R2,solarPV,2025,4.07170000000
+9,2045,R2,solarPV,2025,4.07170000000
+9,2049,R2,solarPV,2025,4.07170000000
+9,2050,R2,solarPV,2025,4.07170000000
+9,2054,R2,solarPV,2025,4.07170000000
+10,2035,R2,solarPV,2030,4.07170000000
+10,2040,R2,solarPV,2030,4.07170000000
+10,2045,R2,solarPV,2030,4.07170000000
+10,2049,R2,solarPV,2030,4.07170000000
+10,2050,R2,solarPV,2030,4.07170000000
+10,2054,R2,solarPV,2030,4.07170000000
+10,2055,R2,solarPV,2030,4.07170000000
+10,2059,R2,solarPV,2030,4.07170000000
+11,2040,R2,solarPV,2035,7.85760000000
+11,2045,R2,solarPV,2035,7.85760000000
+11,2049,R2,solarPV,2035,7.85760000000
+11,2050,R2,solarPV,2035,7.85760000000
+11,2054,R2,solarPV,2035,7.85760000000
+11,2055,R2,solarPV,2035,7.85760000000
+11,2059,R2,solarPV,2035,7.85760000000
+11,2060,R2,solarPV,2035,7.85760000000
+11,2064,R2,solarPV,2035,7.85760000000
+12,2035,R2,windturbine,2020,15.60870000000
+12,2040,R2,windturbine,2020,15.60870000000
+12,2045,R2,windturbine,2020,15.60870000000
+12,2049,R2,windturbine,2020,15.60870000000
+13,2035,R2,windturbine,2030,1.64290000000
+13,2040,R2,windturbine,2030,1.64290000000
+13,2045,R2,windturbine,2030,1.64290000000
+13,2049,R2,windturbine,2030,1.64290000000
+13,2050,R2,windturbine,2030,1.64290000000
+13,2054,R2,windturbine,2030,1.64290000000
+13,2055,R2,windturbine,2030,1.64290000000
+13,2059,R2,windturbine,2030,1.64290000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2040.csv
index f78b605a1..c16657882 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2040.csv
@@ -1,97 +1,97 @@
-asset,year,region,installed,technology,capacity
-1,2040,R1,2020,solarPV,5.60870000000
-1,2045,R1,2020,solarPV,5.60870000000
-1,2049,R1,2020,solarPV,5.60870000000
-2,2040,R1,2020,windturbine,10.00000000000
-2,2045,R1,2020,windturbine,10.00000000000
-2,2049,R1,2020,windturbine,10.00000000000
-3,2040,R1,2025,gasCCGT,3.00000000000
-3,2045,R1,2025,gasCCGT,3.00000000000
-3,2049,R1,2025,gasCCGT,3.00000000000
-3,2050,R1,2025,gasCCGT,3.00000000000
-3,2054,R1,2025,gasCCGT,3.00000000000
-3,2055,R1,2025,gasCCGT,3.00000000000
-3,2059,R1,2025,gasCCGT,3.00000000000
-3,2060,R1,2025,gasCCGT,3.00000000000
-3,2064,R1,2025,gasCCGT,3.00000000000
-4,2040,R1,2025,solarPV,4.07170000000
-4,2045,R1,2025,solarPV,4.07170000000
-4,2049,R1,2025,solarPV,4.07170000000
-4,2050,R1,2025,solarPV,4.07170000000
-4,2054,R1,2025,solarPV,4.07170000000
-5,2040,R1,2030,solarPV,5.71470000000
-5,2045,R1,2030,solarPV,5.71470000000
-5,2049,R1,2030,solarPV,5.71470000000
-5,2050,R1,2030,solarPV,5.71470000000
-5,2054,R1,2030,solarPV,5.71470000000
-5,2055,R1,2030,solarPV,5.71470000000
-5,2059,R1,2030,solarPV,5.71470000000
-6,2040,R1,2035,solarPV,7.85760000000
-6,2045,R1,2035,solarPV,7.85760000000
-6,2049,R1,2035,solarPV,7.85760000000
-6,2050,R1,2035,solarPV,7.85760000000
-6,2054,R1,2035,solarPV,7.85760000000
-6,2055,R1,2035,solarPV,7.85760000000
-6,2059,R1,2035,solarPV,7.85760000000
-6,2060,R1,2035,solarPV,7.85760000000
-6,2064,R1,2035,solarPV,7.85760000000
-7,2045,R1,2040,solarPV,5.71470000000
-7,2049,R1,2040,solarPV,5.71470000000
-7,2050,R1,2040,solarPV,5.71470000000
-7,2054,R1,2040,solarPV,5.71470000000
-7,2055,R1,2040,solarPV,5.71470000000
-7,2059,R1,2040,solarPV,5.71470000000
-7,2060,R1,2040,solarPV,5.71470000000
-7,2064,R1,2040,solarPV,5.71470000000
-7,2065,R1,2040,solarPV,5.71470000000
-7,2069,R1,2040,solarPV,5.71470000000
-9,2040,R2,2020,windturbine,15.60870000000
-9,2045,R2,2020,windturbine,15.60870000000
-9,2049,R2,2020,windturbine,15.60870000000
-10,2040,R2,2025,gasCCGT,3.00000000000
-10,2045,R2,2025,gasCCGT,3.00000000000
-10,2049,R2,2025,gasCCGT,3.00000000000
-10,2050,R2,2025,gasCCGT,3.00000000000
-10,2054,R2,2025,gasCCGT,3.00000000000
-10,2055,R2,2025,gasCCGT,3.00000000000
-10,2059,R2,2025,gasCCGT,3.00000000000
-10,2060,R2,2025,gasCCGT,3.00000000000
-10,2064,R2,2025,gasCCGT,3.00000000000
-11,2040,R2,2025,solarPV,4.07170000000
-11,2045,R2,2025,solarPV,4.07170000000
-11,2049,R2,2025,solarPV,4.07170000000
-11,2050,R2,2025,solarPV,4.07170000000
-11,2054,R2,2025,solarPV,4.07170000000
-12,2040,R2,2030,solarPV,4.07170000000
-12,2045,R2,2030,solarPV,4.07170000000
-12,2049,R2,2030,solarPV,4.07170000000
-12,2050,R2,2030,solarPV,4.07170000000
-12,2054,R2,2030,solarPV,4.07170000000
-12,2055,R2,2030,solarPV,4.07170000000
-12,2059,R2,2030,solarPV,4.07170000000
-13,2040,R2,2030,windturbine,1.64290000000
-13,2045,R2,2030,windturbine,1.64290000000
-13,2049,R2,2030,windturbine,1.64290000000
-13,2050,R2,2030,windturbine,1.64290000000
-13,2054,R2,2030,windturbine,1.64290000000
-13,2055,R2,2030,windturbine,1.64290000000
-13,2059,R2,2030,windturbine,1.64290000000
-14,2040,R2,2035,solarPV,7.85760000000
-14,2045,R2,2035,solarPV,7.85760000000
-14,2049,R2,2035,solarPV,7.85760000000
-14,2050,R2,2035,solarPV,7.85760000000
-14,2054,R2,2035,solarPV,7.85760000000
-14,2055,R2,2035,solarPV,7.85760000000
-14,2059,R2,2035,solarPV,7.85760000000
-14,2060,R2,2035,solarPV,7.85760000000
-14,2064,R2,2035,solarPV,7.85760000000
-15,2045,R2,2040,solarPV,5.71470000000
-15,2049,R2,2040,solarPV,5.71470000000
-15,2050,R2,2040,solarPV,5.71470000000
-15,2054,R2,2040,solarPV,5.71470000000
-15,2055,R2,2040,solarPV,5.71470000000
-15,2059,R2,2040,solarPV,5.71470000000
-15,2060,R2,2040,solarPV,5.71470000000
-15,2064,R2,2040,solarPV,5.71470000000
-15,2065,R2,2040,solarPV,5.71470000000
-15,2069,R2,2040,solarPV,5.71470000000
+asset,year,region,technology,installed,capacity
+1,2040,R1,gasCCGT,2025,3.00000000000
+1,2045,R1,gasCCGT,2025,3.00000000000
+1,2049,R1,gasCCGT,2025,3.00000000000
+1,2050,R1,gasCCGT,2025,3.00000000000
+1,2054,R1,gasCCGT,2025,3.00000000000
+1,2055,R1,gasCCGT,2025,3.00000000000
+1,2059,R1,gasCCGT,2025,3.00000000000
+1,2060,R1,gasCCGT,2025,3.00000000000
+1,2064,R1,gasCCGT,2025,3.00000000000
+2,2040,R1,solarPV,2020,5.60870000000
+2,2045,R1,solarPV,2020,5.60870000000
+2,2049,R1,solarPV,2020,5.60870000000
+3,2040,R1,solarPV,2025,4.07170000000
+3,2045,R1,solarPV,2025,4.07170000000
+3,2049,R1,solarPV,2025,4.07170000000
+3,2050,R1,solarPV,2025,4.07170000000
+3,2054,R1,solarPV,2025,4.07170000000
+4,2040,R1,solarPV,2030,5.71470000000
+4,2045,R1,solarPV,2030,5.71470000000
+4,2049,R1,solarPV,2030,5.71470000000
+4,2050,R1,solarPV,2030,5.71470000000
+4,2054,R1,solarPV,2030,5.71470000000
+4,2055,R1,solarPV,2030,5.71470000000
+4,2059,R1,solarPV,2030,5.71470000000
+5,2040,R1,solarPV,2035,7.85760000000
+5,2045,R1,solarPV,2035,7.85760000000
+5,2049,R1,solarPV,2035,7.85760000000
+5,2050,R1,solarPV,2035,7.85760000000
+5,2054,R1,solarPV,2035,7.85760000000
+5,2055,R1,solarPV,2035,7.85760000000
+5,2059,R1,solarPV,2035,7.85760000000
+5,2060,R1,solarPV,2035,7.85760000000
+5,2064,R1,solarPV,2035,7.85760000000
+6,2045,R1,solarPV,2040,5.71470000000
+6,2049,R1,solarPV,2040,5.71470000000
+6,2050,R1,solarPV,2040,5.71470000000
+6,2054,R1,solarPV,2040,5.71470000000
+6,2055,R1,solarPV,2040,5.71470000000
+6,2059,R1,solarPV,2040,5.71470000000
+6,2060,R1,solarPV,2040,5.71470000000
+6,2064,R1,solarPV,2040,5.71470000000
+6,2065,R1,solarPV,2040,5.71470000000
+6,2069,R1,solarPV,2040,5.71470000000
+7,2040,R1,windturbine,2020,10.00000000000
+7,2045,R1,windturbine,2020,10.00000000000
+7,2049,R1,windturbine,2020,10.00000000000
+9,2040,R2,gasCCGT,2025,3.00000000000
+9,2045,R2,gasCCGT,2025,3.00000000000
+9,2049,R2,gasCCGT,2025,3.00000000000
+9,2050,R2,gasCCGT,2025,3.00000000000
+9,2054,R2,gasCCGT,2025,3.00000000000
+9,2055,R2,gasCCGT,2025,3.00000000000
+9,2059,R2,gasCCGT,2025,3.00000000000
+9,2060,R2,gasCCGT,2025,3.00000000000
+9,2064,R2,gasCCGT,2025,3.00000000000
+10,2040,R2,solarPV,2025,4.07170000000
+10,2045,R2,solarPV,2025,4.07170000000
+10,2049,R2,solarPV,2025,4.07170000000
+10,2050,R2,solarPV,2025,4.07170000000
+10,2054,R2,solarPV,2025,4.07170000000
+11,2040,R2,solarPV,2030,4.07170000000
+11,2045,R2,solarPV,2030,4.07170000000
+11,2049,R2,solarPV,2030,4.07170000000
+11,2050,R2,solarPV,2030,4.07170000000
+11,2054,R2,solarPV,2030,4.07170000000
+11,2055,R2,solarPV,2030,4.07170000000
+11,2059,R2,solarPV,2030,4.07170000000
+12,2040,R2,solarPV,2035,7.85760000000
+12,2045,R2,solarPV,2035,7.85760000000
+12,2049,R2,solarPV,2035,7.85760000000
+12,2050,R2,solarPV,2035,7.85760000000
+12,2054,R2,solarPV,2035,7.85760000000
+12,2055,R2,solarPV,2035,7.85760000000
+12,2059,R2,solarPV,2035,7.85760000000
+12,2060,R2,solarPV,2035,7.85760000000
+12,2064,R2,solarPV,2035,7.85760000000
+13,2045,R2,solarPV,2040,5.71470000000
+13,2049,R2,solarPV,2040,5.71470000000
+13,2050,R2,solarPV,2040,5.71470000000
+13,2054,R2,solarPV,2040,5.71470000000
+13,2055,R2,solarPV,2040,5.71470000000
+13,2059,R2,solarPV,2040,5.71470000000
+13,2060,R2,solarPV,2040,5.71470000000
+13,2064,R2,solarPV,2040,5.71470000000
+13,2065,R2,solarPV,2040,5.71470000000
+13,2069,R2,solarPV,2040,5.71470000000
+14,2040,R2,windturbine,2020,15.60870000000
+14,2045,R2,windturbine,2020,15.60870000000
+14,2049,R2,windturbine,2020,15.60870000000
+15,2040,R2,windturbine,2030,1.64290000000
+15,2045,R2,windturbine,2030,1.64290000000
+15,2049,R2,windturbine,2030,1.64290000000
+15,2050,R2,windturbine,2030,1.64290000000
+15,2054,R2,windturbine,2030,1.64290000000
+15,2055,R2,windturbine,2030,1.64290000000
+15,2059,R2,windturbine,2030,1.64290000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2050.csv
index db2da871c..a9657cc45 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Power/Capacity/2050.csv
@@ -1,117 +1,117 @@
-asset,year,region,installed,technology,capacity
-2,2050,R1,2025,gasCCGT,3.00000000000
-2,2054,R1,2025,gasCCGT,3.00000000000
-2,2055,R1,2025,gasCCGT,3.00000000000
-2,2059,R1,2025,gasCCGT,3.00000000000
-2,2060,R1,2025,gasCCGT,3.00000000000
-2,2064,R1,2025,gasCCGT,3.00000000000
-3,2050,R1,2025,solarPV,4.07170000000
-3,2054,R1,2025,solarPV,4.07170000000
-4,2050,R1,2030,solarPV,5.71470000000
-4,2054,R1,2030,solarPV,5.71470000000
-4,2055,R1,2030,solarPV,5.71470000000
-4,2059,R1,2030,solarPV,5.71470000000
-5,2050,R1,2035,solarPV,7.85760000000
-5,2054,R1,2035,solarPV,7.85760000000
-5,2055,R1,2035,solarPV,7.85760000000
-5,2059,R1,2035,solarPV,7.85760000000
-5,2060,R1,2035,solarPV,7.85760000000
-5,2064,R1,2035,solarPV,7.85760000000
-6,2050,R1,2040,solarPV,5.71470000000
-6,2054,R1,2040,solarPV,5.71470000000
-6,2055,R1,2040,solarPV,5.71470000000
-6,2059,R1,2040,solarPV,5.71470000000
-6,2060,R1,2040,solarPV,5.71470000000
-6,2064,R1,2040,solarPV,5.71470000000
-6,2065,R1,2040,solarPV,5.71470000000
-6,2069,R1,2040,solarPV,5.71470000000
-7,2050,R1,2045,solarPV,15.71470000000
-7,2054,R1,2045,solarPV,15.71470000000
-7,2055,R1,2045,solarPV,15.71470000000
-7,2059,R1,2045,solarPV,15.71470000000
-7,2060,R1,2045,solarPV,15.71470000000
-7,2064,R1,2045,solarPV,15.71470000000
-7,2065,R1,2045,solarPV,15.71470000000
-7,2069,R1,2045,solarPV,15.71470000000
-7,2070,R1,2045,solarPV,15.71470000000
-7,2074,R1,2045,solarPV,15.71470000000
-8,2050,R1,2045,windturbine,5.60870000000
-8,2054,R1,2045,windturbine,5.60870000000
-8,2055,R1,2045,windturbine,5.60870000000
-8,2059,R1,2045,windturbine,5.60870000000
-8,2060,R1,2045,windturbine,5.60870000000
-8,2064,R1,2045,windturbine,5.60870000000
-8,2065,R1,2045,windturbine,5.60870000000
-8,2069,R1,2045,windturbine,5.60870000000
-8,2070,R1,2045,windturbine,5.60870000000
-8,2074,R1,2045,windturbine,5.60870000000
-9,2055,R1,2050,solarPV,4.07170000000
-9,2059,R1,2050,solarPV,4.07170000000
-9,2060,R1,2050,solarPV,4.07170000000
-9,2064,R1,2050,solarPV,4.07170000000
-9,2065,R1,2050,solarPV,4.07170000000
-9,2069,R1,2050,solarPV,4.07170000000
-9,2070,R1,2050,solarPV,4.07170000000
-9,2074,R1,2050,solarPV,4.07170000000
-9,2075,R1,2050,solarPV,4.07170000000
-9,2079,R1,2050,solarPV,4.07170000000
-11,2050,R2,2025,gasCCGT,3.00000000000
-11,2054,R2,2025,gasCCGT,3.00000000000
-11,2055,R2,2025,gasCCGT,3.00000000000
-11,2059,R2,2025,gasCCGT,3.00000000000
-11,2060,R2,2025,gasCCGT,3.00000000000
-11,2064,R2,2025,gasCCGT,3.00000000000
-12,2050,R2,2025,solarPV,4.07170000000
-12,2054,R2,2025,solarPV,4.07170000000
-13,2050,R2,2030,solarPV,4.07170000000
-13,2054,R2,2030,solarPV,4.07170000000
-13,2055,R2,2030,solarPV,4.07170000000
-13,2059,R2,2030,solarPV,4.07170000000
-14,2050,R2,2030,windturbine,1.64290000000
-14,2054,R2,2030,windturbine,1.64290000000
-14,2055,R2,2030,windturbine,1.64290000000
-14,2059,R2,2030,windturbine,1.64290000000
-15,2050,R2,2035,solarPV,7.85760000000
-15,2054,R2,2035,solarPV,7.85760000000
-15,2055,R2,2035,solarPV,7.85760000000
-15,2059,R2,2035,solarPV,7.85760000000
-15,2060,R2,2035,solarPV,7.85760000000
-15,2064,R2,2035,solarPV,7.85760000000
-16,2050,R2,2040,solarPV,5.71470000000
-16,2054,R2,2040,solarPV,5.71470000000
-16,2055,R2,2040,solarPV,5.71470000000
-16,2059,R2,2040,solarPV,5.71470000000
-16,2060,R2,2040,solarPV,5.71470000000
-16,2064,R2,2040,solarPV,5.71470000000
-16,2065,R2,2040,solarPV,5.71470000000
-16,2069,R2,2040,solarPV,5.71470000000
-17,2050,R2,2045,solarPV,15.71470000000
-17,2054,R2,2045,solarPV,15.71470000000
-17,2055,R2,2045,solarPV,15.71470000000
-17,2059,R2,2045,solarPV,15.71470000000
-17,2060,R2,2045,solarPV,15.71470000000
-17,2064,R2,2045,solarPV,15.71470000000
-17,2065,R2,2045,solarPV,15.71470000000
-17,2069,R2,2045,solarPV,15.71470000000
-17,2070,R2,2045,solarPV,15.71470000000
-17,2074,R2,2045,solarPV,15.71470000000
-18,2050,R2,2045,windturbine,5.60870000000
-18,2054,R2,2045,windturbine,5.60870000000
-18,2055,R2,2045,windturbine,5.60870000000
-18,2059,R2,2045,windturbine,5.60870000000
-18,2060,R2,2045,windturbine,5.60870000000
-18,2064,R2,2045,windturbine,5.60870000000
-18,2065,R2,2045,windturbine,5.60870000000
-18,2069,R2,2045,windturbine,5.60870000000
-18,2070,R2,2045,windturbine,5.60870000000
-18,2074,R2,2045,windturbine,5.60870000000
-19,2055,R2,2050,solarPV,4.07170000000
-19,2059,R2,2050,solarPV,4.07170000000
-19,2060,R2,2050,solarPV,4.07170000000
-19,2064,R2,2050,solarPV,4.07170000000
-19,2065,R2,2050,solarPV,4.07170000000
-19,2069,R2,2050,solarPV,4.07170000000
-19,2070,R2,2050,solarPV,4.07170000000
-19,2074,R2,2050,solarPV,4.07170000000
-19,2075,R2,2050,solarPV,4.07170000000
-19,2079,R2,2050,solarPV,4.07170000000
+asset,year,region,technology,installed,capacity
+0,2050,R1,gasCCGT,2025,3.00000000000
+0,2054,R1,gasCCGT,2025,3.00000000000
+0,2055,R1,gasCCGT,2025,3.00000000000
+0,2059,R1,gasCCGT,2025,3.00000000000
+0,2060,R1,gasCCGT,2025,3.00000000000
+0,2064,R1,gasCCGT,2025,3.00000000000
+2,2050,R1,solarPV,2025,4.07170000000
+2,2054,R1,solarPV,2025,4.07170000000
+3,2050,R1,solarPV,2030,5.71470000000
+3,2054,R1,solarPV,2030,5.71470000000
+3,2055,R1,solarPV,2030,5.71470000000
+3,2059,R1,solarPV,2030,5.71470000000
+4,2050,R1,solarPV,2035,7.85760000000
+4,2054,R1,solarPV,2035,7.85760000000
+4,2055,R1,solarPV,2035,7.85760000000
+4,2059,R1,solarPV,2035,7.85760000000
+4,2060,R1,solarPV,2035,7.85760000000
+4,2064,R1,solarPV,2035,7.85760000000
+5,2050,R1,solarPV,2040,5.71470000000
+5,2054,R1,solarPV,2040,5.71470000000
+5,2055,R1,solarPV,2040,5.71470000000
+5,2059,R1,solarPV,2040,5.71470000000
+5,2060,R1,solarPV,2040,5.71470000000
+5,2064,R1,solarPV,2040,5.71470000000
+5,2065,R1,solarPV,2040,5.71470000000
+5,2069,R1,solarPV,2040,5.71470000000
+6,2050,R1,solarPV,2045,15.71470000000
+6,2054,R1,solarPV,2045,15.71470000000
+6,2055,R1,solarPV,2045,15.71470000000
+6,2059,R1,solarPV,2045,15.71470000000
+6,2060,R1,solarPV,2045,15.71470000000
+6,2064,R1,solarPV,2045,15.71470000000
+6,2065,R1,solarPV,2045,15.71470000000
+6,2069,R1,solarPV,2045,15.71470000000
+6,2070,R1,solarPV,2045,15.71470000000
+6,2074,R1,solarPV,2045,15.71470000000
+7,2055,R1,solarPV,2050,4.07170000000
+7,2059,R1,solarPV,2050,4.07170000000
+7,2060,R1,solarPV,2050,4.07170000000
+7,2064,R1,solarPV,2050,4.07170000000
+7,2065,R1,solarPV,2050,4.07170000000
+7,2069,R1,solarPV,2050,4.07170000000
+7,2070,R1,solarPV,2050,4.07170000000
+7,2074,R1,solarPV,2050,4.07170000000
+7,2075,R1,solarPV,2050,4.07170000000
+7,2079,R1,solarPV,2050,4.07170000000
+9,2050,R1,windturbine,2045,5.60870000000
+9,2054,R1,windturbine,2045,5.60870000000
+9,2055,R1,windturbine,2045,5.60870000000
+9,2059,R1,windturbine,2045,5.60870000000
+9,2060,R1,windturbine,2045,5.60870000000
+9,2064,R1,windturbine,2045,5.60870000000
+9,2065,R1,windturbine,2045,5.60870000000
+9,2069,R1,windturbine,2045,5.60870000000
+9,2070,R1,windturbine,2045,5.60870000000
+9,2074,R1,windturbine,2045,5.60870000000
+10,2050,R2,gasCCGT,2025,3.00000000000
+10,2054,R2,gasCCGT,2025,3.00000000000
+10,2055,R2,gasCCGT,2025,3.00000000000
+10,2059,R2,gasCCGT,2025,3.00000000000
+10,2060,R2,gasCCGT,2025,3.00000000000
+10,2064,R2,gasCCGT,2025,3.00000000000
+11,2050,R2,solarPV,2025,4.07170000000
+11,2054,R2,solarPV,2025,4.07170000000
+12,2050,R2,solarPV,2030,4.07170000000
+12,2054,R2,solarPV,2030,4.07170000000
+12,2055,R2,solarPV,2030,4.07170000000
+12,2059,R2,solarPV,2030,4.07170000000
+13,2050,R2,solarPV,2035,7.85760000000
+13,2054,R2,solarPV,2035,7.85760000000
+13,2055,R2,solarPV,2035,7.85760000000
+13,2059,R2,solarPV,2035,7.85760000000
+13,2060,R2,solarPV,2035,7.85760000000
+13,2064,R2,solarPV,2035,7.85760000000
+14,2050,R2,solarPV,2040,5.71470000000
+14,2054,R2,solarPV,2040,5.71470000000
+14,2055,R2,solarPV,2040,5.71470000000
+14,2059,R2,solarPV,2040,5.71470000000
+14,2060,R2,solarPV,2040,5.71470000000
+14,2064,R2,solarPV,2040,5.71470000000
+14,2065,R2,solarPV,2040,5.71470000000
+14,2069,R2,solarPV,2040,5.71470000000
+15,2050,R2,solarPV,2045,15.71470000000
+15,2054,R2,solarPV,2045,15.71470000000
+15,2055,R2,solarPV,2045,15.71470000000
+15,2059,R2,solarPV,2045,15.71470000000
+15,2060,R2,solarPV,2045,15.71470000000
+15,2064,R2,solarPV,2045,15.71470000000
+15,2065,R2,solarPV,2045,15.71470000000
+15,2069,R2,solarPV,2045,15.71470000000
+15,2070,R2,solarPV,2045,15.71470000000
+15,2074,R2,solarPV,2045,15.71470000000
+16,2055,R2,solarPV,2050,4.07170000000
+16,2059,R2,solarPV,2050,4.07170000000
+16,2060,R2,solarPV,2050,4.07170000000
+16,2064,R2,solarPV,2050,4.07170000000
+16,2065,R2,solarPV,2050,4.07170000000
+16,2069,R2,solarPV,2050,4.07170000000
+16,2070,R2,solarPV,2050,4.07170000000
+16,2074,R2,solarPV,2050,4.07170000000
+16,2075,R2,solarPV,2050,4.07170000000
+16,2079,R2,solarPV,2050,4.07170000000
+18,2050,R2,windturbine,2030,1.64290000000
+18,2054,R2,windturbine,2030,1.64290000000
+18,2055,R2,windturbine,2030,1.64290000000
+18,2059,R2,windturbine,2030,1.64290000000
+19,2050,R2,windturbine,2045,5.60870000000
+19,2054,R2,windturbine,2045,5.60870000000
+19,2055,R2,windturbine,2045,5.60870000000
+19,2059,R2,windturbine,2045,5.60870000000
+19,2060,R2,windturbine,2045,5.60870000000
+19,2064,R2,windturbine,2045,5.60870000000
+19,2065,R2,windturbine,2045,5.60870000000
+19,2069,R2,windturbine,2045,5.60870000000
+19,2070,R2,windturbine,2045,5.60870000000
+19,2074,R2,windturbine,2045,5.60870000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2050.csv
index 02533b47f..cac57b156 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2050.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Capacity/2050.csv
@@ -1,21 +1,21 @@
-asset,year,region,installed,technology,capacity
-1,2050,R1,2040,heatpump,29.28800000000
-1,2054,R1,2040,heatpump,29.28800000000
-2,2050,R1,2045,heatpump,22.14400000000
-2,2054,R1,2045,heatpump,22.14400000000
-2,2055,R1,2045,heatpump,22.14400000000
-2,2059,R1,2045,heatpump,22.14400000000
-3,2055,R1,2050,heatpump,29.28800000000
-3,2059,R1,2050,heatpump,29.28800000000
-3,2060,R1,2050,heatpump,29.28800000000
-3,2064,R1,2050,heatpump,29.28800000000
-5,2050,R2,2040,heatpump,29.28800000000
-5,2054,R2,2040,heatpump,29.28800000000
-6,2050,R2,2045,heatpump,22.14400000000
-6,2054,R2,2045,heatpump,22.14400000000
-6,2055,R2,2045,heatpump,22.14400000000
-6,2059,R2,2045,heatpump,22.14400000000
-7,2055,R2,2050,heatpump,29.28800000000
-7,2059,R2,2050,heatpump,29.28800000000
-7,2060,R2,2050,heatpump,29.28800000000
-7,2064,R2,2050,heatpump,29.28800000000
+asset,year,region,technology,installed,capacity
+1,2050,R1,heatpump,2040,29.28800000000
+1,2054,R1,heatpump,2040,29.28800000000
+2,2050,R1,heatpump,2045,22.14400000000
+2,2054,R1,heatpump,2045,22.14400000000
+2,2055,R1,heatpump,2045,22.14400000000
+2,2059,R1,heatpump,2045,22.14400000000
+3,2055,R1,heatpump,2050,29.28800000000
+3,2059,R1,heatpump,2050,29.28800000000
+3,2060,R1,heatpump,2050,29.28800000000
+3,2064,R1,heatpump,2050,29.28800000000
+5,2050,R2,heatpump,2040,29.28800000000
+5,2054,R2,heatpump,2040,29.28800000000
+6,2050,R2,heatpump,2045,22.14400000000
+6,2054,R2,heatpump,2045,22.14400000000
+6,2055,R2,heatpump,2045,22.14400000000
+6,2059,R2,heatpump,2045,22.14400000000
+7,2055,R2,heatpump,2050,29.28800000000
+7,2059,R2,heatpump,2050,29.28800000000
+7,2060,R2,heatpump,2050,29.28800000000
+7,2064,R2,heatpump,2050,29.28800000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2020.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2020.csv
index 2cf8d713f..bcb016d95 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2020.csv
@@ -1,161 +1,161 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2020,0,gasboiler,2020,all-year,all-week,night,0.35700000000
-0,heat,R1,2020,1,gasboiler,2020,all-year,all-week,night,0.35700000000
-0,heat,R1,2025,0,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R1,2025,1,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R1,2025,2,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R1,2025,3,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R2,2020,0,gasboiler,2020,all-year,all-week,night,0.35700000000
-0,heat,R2,2020,1,gasboiler,2020,all-year,all-week,night,0.35700000000
-0,heat,R2,2025,0,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R2,2025,1,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R2,2025,2,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R2,2025,3,heatpump,2020,all-year,all-week,night,0.37190000000
-0,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,night,23.10150000000
-0,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,night,23.10150000000
-0,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,night,6.73750000000
-0,CO2f,R1,2025,1,gasboiler,2020,all-year,all-week,night,6.73750000000
-0,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,night,23.10150000000
-0,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,night,23.10150000000
-0,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,night,6.73750000000
-0,CO2f,R2,2025,1,gasboiler,2020,all-year,all-week,night,6.73750000000
-1,heat,R1,2020,0,gasboiler,2020,all-year,all-week,morning,0.53550000000
-1,heat,R1,2020,1,gasboiler,2020,all-year,all-week,morning,0.53550000000
-1,heat,R1,2025,0,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R1,2025,1,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R1,2025,2,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R1,2025,3,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R2,2020,0,gasboiler,2020,all-year,all-week,morning,0.53550000000
-1,heat,R2,2020,1,gasboiler,2020,all-year,all-week,morning,0.53550000000
-1,heat,R2,2025,0,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R2,2025,1,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R2,2025,2,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R2,2025,3,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,morning,34.65220000000
-1,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,morning,34.65220000000
-1,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,morning,10.10620000000
-1,CO2f,R1,2025,1,gasboiler,2020,all-year,all-week,morning,10.10620000000
-1,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,morning,34.65220000000
-1,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,morning,34.65220000000
-1,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,morning,10.10620000000
-1,CO2f,R2,2025,1,gasboiler,2020,all-year,all-week,morning,10.10620000000
-2,heat,R1,2020,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.35700000000
-2,heat,R1,2020,1,gasboiler,2020,all-year,all-week,mid-afternoon,0.35700000000
-2,heat,R1,2025,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R1,2025,1,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R1,2025,2,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R1,2025,3,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R2,2020,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.35700000000
-2,heat,R2,2020,1,gasboiler,2020,all-year,all-week,mid-afternoon,0.35700000000
-2,heat,R2,2025,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R2,2025,1,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R2,2025,2,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R2,2025,3,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,mid-afternoon,23.10150000000
-2,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,mid-afternoon,23.10150000000
-2,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R1,2025,1,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,mid-afternoon,23.10150000000
-2,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,mid-afternoon,23.10150000000
-2,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R2,2025,1,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-3,heat,R1,2020,0,gasboiler,2020,all-year,all-week,early-peak,0.53550000000
-3,heat,R1,2020,1,gasboiler,2020,all-year,all-week,early-peak,0.53550000000
-3,heat,R1,2025,0,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R1,2025,1,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R1,2025,2,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R1,2025,3,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R2,2020,0,gasboiler,2020,all-year,all-week,early-peak,0.53550000000
-3,heat,R2,2020,1,gasboiler,2020,all-year,all-week,early-peak,0.53550000000
-3,heat,R2,2025,0,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R2,2025,1,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R2,2025,2,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R2,2025,3,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,early-peak,34.65220000000
-3,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,early-peak,34.65220000000
-3,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R1,2025,1,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,early-peak,34.65220000000
-3,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,early-peak,34.65220000000
-3,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R2,2025,1,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-4,heat,R1,2020,0,gasboiler,2020,all-year,all-week,late-peak,1.07150000000
-4,heat,R1,2020,1,gasboiler,2020,all-year,all-week,late-peak,1.07150000000
-4,heat,R1,2025,0,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R1,2025,1,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R1,2025,2,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R1,2025,3,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R2,2020,0,gasboiler,2020,all-year,all-week,late-peak,1.07150000000
-4,heat,R2,2020,1,gasboiler,2020,all-year,all-week,late-peak,1.07150000000
-4,heat,R2,2025,0,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R2,2025,1,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R2,2025,2,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R2,2025,3,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,late-peak,69.33680000000
-4,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,late-peak,69.33680000000
-4,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R1,2025,1,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,late-peak,69.33680000000
-4,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,late-peak,69.33680000000
-4,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R2,2025,1,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-5,heat,R1,2020,0,gasboiler,2020,all-year,all-week,evening,0.71450000000
-5,heat,R1,2020,1,gasboiler,2020,all-year,all-week,evening,0.71450000000
-5,heat,R1,2025,0,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R1,2025,1,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R1,2025,2,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R1,2025,3,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R2,2020,0,gasboiler,2020,all-year,all-week,evening,0.71450000000
-5,heat,R2,2020,1,gasboiler,2020,all-year,all-week,evening,0.71450000000
-5,heat,R2,2025,0,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R2,2025,1,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R2,2025,2,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R2,2025,3,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,evening,46.23530000000
-5,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,evening,46.23530000000
-5,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,evening,13.48440000000
-5,CO2f,R1,2025,1,gasboiler,2020,all-year,all-week,evening,13.48440000000
-5,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,evening,46.23530000000
-5,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,evening,46.23530000000
-5,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,evening,13.48440000000
-5,CO2f,R2,2025,1,gasboiler,2020,all-year,all-week,evening,13.48440000000
-6,heat,R1,2020,0,gasboiler,2020,all-year,all-week,early-morning,0.71450000000
-6,heat,R1,2020,1,gasboiler,2020,all-year,all-week,early-morning,0.71450000000
-6,heat,R1,2025,0,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R1,2025,1,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R1,2025,2,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R1,2025,3,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R2,2020,0,gasboiler,2020,all-year,all-week,early-morning,0.71450000000
-6,heat,R2,2020,1,gasboiler,2020,all-year,all-week,early-morning,0.71450000000
-6,heat,R2,2025,0,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R2,2025,1,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R2,2025,2,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R2,2025,3,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,early-morning,46.23530000000
-6,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,early-morning,46.23530000000
-6,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R1,2025,1,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,early-morning,46.23530000000
-6,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,early-morning,46.23530000000
-6,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R2,2025,1,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-7,heat,R1,2020,0,gasboiler,2020,all-year,all-week,late-afternoon,0.71450000000
-7,heat,R1,2020,1,gasboiler,2020,all-year,all-week,late-afternoon,0.71450000000
-7,heat,R1,2025,0,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R1,2025,1,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R1,2025,2,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R1,2025,3,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R2,2020,0,gasboiler,2020,all-year,all-week,late-afternoon,0.71450000000
-7,heat,R2,2020,1,gasboiler,2020,all-year,all-week,late-afternoon,0.71450000000
-7,heat,R2,2025,0,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R2,2025,1,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R2,2025,2,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R2,2025,3,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,late-afternoon,46.23530000000
-7,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,late-afternoon,46.23530000000
-7,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R1,2025,1,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,late-afternoon,46.23530000000
-7,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,late-afternoon,46.23530000000
-7,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R2,2025,1,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2020,0,all-year,all-week,night,gasboiler,2020,0.35700000000
+0,heat,R1,2020,1,all-year,all-week,night,gasboiler,2020,0.35700000000
+0,heat,R1,2025,0,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R1,2025,1,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R1,2025,2,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R1,2025,3,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R2,2020,0,all-year,all-week,night,gasboiler,2020,0.35700000000
+0,heat,R2,2020,1,all-year,all-week,night,gasboiler,2020,0.35700000000
+0,heat,R2,2025,0,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R2,2025,1,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R2,2025,2,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R2,2025,3,all-year,all-week,night,heatpump,2020,0.37190000000
+0,CO2f,R1,2020,0,all-year,all-week,night,gasboiler,2020,23.10150000000
+0,CO2f,R1,2020,1,all-year,all-week,night,gasboiler,2020,23.10150000000
+0,CO2f,R1,2025,0,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R1,2025,1,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R2,2020,0,all-year,all-week,night,gasboiler,2020,23.10150000000
+0,CO2f,R2,2020,1,all-year,all-week,night,gasboiler,2020,23.10150000000
+0,CO2f,R2,2025,0,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R2,2025,1,all-year,all-week,night,gasboiler,2020,6.73750000000
+1,heat,R1,2020,0,all-year,all-week,morning,gasboiler,2020,0.53550000000
+1,heat,R1,2020,1,all-year,all-week,morning,gasboiler,2020,0.53550000000
+1,heat,R1,2025,0,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R1,2025,1,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R1,2025,2,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R1,2025,3,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R2,2020,0,all-year,all-week,morning,gasboiler,2020,0.53550000000
+1,heat,R2,2020,1,all-year,all-week,morning,gasboiler,2020,0.53550000000
+1,heat,R2,2025,0,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R2,2025,1,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R2,2025,2,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R2,2025,3,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,CO2f,R1,2020,0,all-year,all-week,morning,gasboiler,2020,34.65220000000
+1,CO2f,R1,2020,1,all-year,all-week,morning,gasboiler,2020,34.65220000000
+1,CO2f,R1,2025,0,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R1,2025,1,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R2,2020,0,all-year,all-week,morning,gasboiler,2020,34.65220000000
+1,CO2f,R2,2020,1,all-year,all-week,morning,gasboiler,2020,34.65220000000
+1,CO2f,R2,2025,0,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R2,2025,1,all-year,all-week,morning,gasboiler,2020,10.10620000000
+2,heat,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35700000000
+2,heat,R1,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.35700000000
+2,heat,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R1,2025,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R1,2025,2,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R1,2025,3,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35700000000
+2,heat,R2,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.35700000000
+2,heat,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R2,2025,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R2,2025,2,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R2,2025,3,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,CO2f,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,23.10150000000
+2,CO2f,R1,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,23.10150000000
+2,CO2f,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R1,2025,1,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,23.10150000000
+2,CO2f,R2,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,23.10150000000
+2,CO2f,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R2,2025,1,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+3,heat,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.53550000000
+3,heat,R1,2020,1,all-year,all-week,early-peak,gasboiler,2020,0.53550000000
+3,heat,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R1,2025,1,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R1,2025,2,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R1,2025,3,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.53550000000
+3,heat,R2,2020,1,all-year,all-week,early-peak,gasboiler,2020,0.53550000000
+3,heat,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R2,2025,1,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R2,2025,2,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R2,2025,3,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,CO2f,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,34.65220000000
+3,CO2f,R1,2020,1,all-year,all-week,early-peak,gasboiler,2020,34.65220000000
+3,CO2f,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R1,2025,1,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,34.65220000000
+3,CO2f,R2,2020,1,all-year,all-week,early-peak,gasboiler,2020,34.65220000000
+3,CO2f,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R2,2025,1,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+4,heat,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.07150000000
+4,heat,R1,2020,1,all-year,all-week,late-peak,gasboiler,2020,1.07150000000
+4,heat,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R1,2025,1,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R1,2025,2,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R1,2025,3,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.07150000000
+4,heat,R2,2020,1,all-year,all-week,late-peak,gasboiler,2020,1.07150000000
+4,heat,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R2,2025,1,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R2,2025,2,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R2,2025,3,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,CO2f,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,69.33680000000
+4,CO2f,R1,2020,1,all-year,all-week,late-peak,gasboiler,2020,69.33680000000
+4,CO2f,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R1,2025,1,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,69.33680000000
+4,CO2f,R2,2020,1,all-year,all-week,late-peak,gasboiler,2020,69.33680000000
+4,CO2f,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R2,2025,1,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+5,heat,R1,2020,0,all-year,all-week,evening,gasboiler,2020,0.71450000000
+5,heat,R1,2020,1,all-year,all-week,evening,gasboiler,2020,0.71450000000
+5,heat,R1,2025,0,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R1,2025,1,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R1,2025,2,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R1,2025,3,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R2,2020,0,all-year,all-week,evening,gasboiler,2020,0.71450000000
+5,heat,R2,2020,1,all-year,all-week,evening,gasboiler,2020,0.71450000000
+5,heat,R2,2025,0,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R2,2025,1,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R2,2025,2,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R2,2025,3,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,CO2f,R1,2020,0,all-year,all-week,evening,gasboiler,2020,46.23530000000
+5,CO2f,R1,2020,1,all-year,all-week,evening,gasboiler,2020,46.23530000000
+5,CO2f,R1,2025,0,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R1,2025,1,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R2,2020,0,all-year,all-week,evening,gasboiler,2020,46.23530000000
+5,CO2f,R2,2020,1,all-year,all-week,evening,gasboiler,2020,46.23530000000
+5,CO2f,R2,2025,0,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R2,2025,1,all-year,all-week,evening,gasboiler,2020,13.48440000000
+6,heat,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.71450000000
+6,heat,R1,2020,1,all-year,all-week,early-morning,gasboiler,2020,0.71450000000
+6,heat,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R1,2025,1,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R1,2025,2,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R1,2025,3,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.71450000000
+6,heat,R2,2020,1,all-year,all-week,early-morning,gasboiler,2020,0.71450000000
+6,heat,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R2,2025,1,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R2,2025,2,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R2,2025,3,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,CO2f,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,46.23530000000
+6,CO2f,R1,2020,1,all-year,all-week,early-morning,gasboiler,2020,46.23530000000
+6,CO2f,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R1,2025,1,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,46.23530000000
+6,CO2f,R2,2020,1,all-year,all-week,early-morning,gasboiler,2020,46.23530000000
+6,CO2f,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R2,2025,1,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+7,heat,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.71450000000
+7,heat,R1,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,0.71450000000
+7,heat,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R1,2025,1,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R1,2025,2,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R1,2025,3,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.71450000000
+7,heat,R2,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,0.71450000000
+7,heat,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R2,2025,1,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R2,2025,2,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R2,2025,3,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,CO2f,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,46.23530000000
+7,CO2f,R1,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,46.23530000000
+7,CO2f,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R1,2025,1,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,46.23530000000
+7,CO2f,R2,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,46.23530000000
+7,CO2f,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R2,2025,1,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2025.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2025.csv
index e03b6acf1..47d99e926 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2025.csv
@@ -1,225 +1,225 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2025,0,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R1,2025,2,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R1,2025,4,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R1,2025,6,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R1,2030,1,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R1,2030,3,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R1,2030,4,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R1,2030,5,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R1,2030,6,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R1,2030,7,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R2,2025,0,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R2,2025,2,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R2,2025,4,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R2,2025,6,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R2,2030,1,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R2,2030,3,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R2,2030,4,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R2,2030,5,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R2,2030,6,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R2,2030,7,heatpump,2025,all-year,all-week,night,0.17850000000
-0,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,night,6.73750000000
-0,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,night,6.73750000000
-0,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,night,6.73750000000
-0,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,night,6.73750000000
-0,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,night,2.88760000000
-1,heat,R1,2025,0,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R1,2025,2,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R1,2025,4,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R1,2025,6,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R1,2030,1,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R1,2030,3,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R1,2030,4,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R1,2030,5,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R1,2030,6,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R1,2030,7,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R2,2025,0,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R2,2025,2,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R2,2025,4,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R2,2025,6,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R2,2030,1,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R2,2030,3,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R2,2030,4,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R2,2030,5,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R2,2030,6,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R2,2030,7,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,morning,10.10620000000
-1,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,morning,10.10620000000
-1,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,morning,10.10620000000
-1,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,morning,10.10620000000
-1,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,morning,4.33140000000
-2,heat,R1,2025,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R1,2025,2,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R1,2025,4,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R1,2025,6,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R1,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R1,2030,3,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R1,2030,4,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R1,2030,5,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R1,2030,6,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R1,2030,7,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R2,2025,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R2,2025,2,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R2,2025,4,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R2,2025,6,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R2,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R2,2030,3,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R2,2030,4,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R2,2030,5,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R2,2030,6,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R2,2030,7,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-3,heat,R1,2025,0,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R1,2025,2,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R1,2025,4,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R1,2025,6,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R1,2030,1,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R1,2030,3,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R1,2030,4,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R1,2030,5,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R1,2030,6,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R1,2030,7,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R2,2025,0,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R2,2025,2,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R2,2025,4,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R2,2025,6,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R2,2030,1,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R2,2030,3,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R2,2030,4,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R2,2030,5,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R2,2030,6,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R2,2030,7,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-4,heat,R1,2025,0,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R1,2025,2,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R1,2025,4,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R1,2025,6,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R1,2030,1,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R1,2030,3,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R1,2030,4,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R1,2030,5,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R1,2030,6,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R1,2030,7,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R2,2025,0,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R2,2025,2,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R2,2025,4,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R2,2025,6,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R2,2030,1,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R2,2030,3,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R2,2030,4,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R2,2030,5,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R2,2030,6,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R2,2030,7,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-5,heat,R1,2025,0,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R1,2025,2,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R1,2025,4,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R1,2025,6,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R1,2030,1,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R1,2030,3,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R1,2030,4,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R1,2030,5,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R1,2030,6,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R1,2030,7,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R2,2025,0,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R2,2025,2,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R2,2025,4,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R2,2025,6,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R2,2030,1,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R2,2030,3,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R2,2030,4,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R2,2030,5,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R2,2030,6,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R2,2030,7,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,evening,13.48440000000
-5,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,evening,13.48440000000
-5,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,evening,13.48440000000
-5,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,evening,13.48440000000
-5,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,evening,5.77920000000
-6,heat,R1,2025,0,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R1,2025,2,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R1,2025,4,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R1,2025,6,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R1,2030,1,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R1,2030,3,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R1,2030,4,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R1,2030,5,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R1,2030,6,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R1,2030,7,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R2,2025,0,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R2,2025,2,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R2,2025,4,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R2,2025,6,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R2,2030,1,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R2,2030,3,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R2,2030,4,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R2,2030,5,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R2,2030,6,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R2,2030,7,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-7,heat,R1,2025,0,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R1,2025,2,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R1,2025,4,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R1,2025,6,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R1,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R1,2030,3,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R1,2030,4,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R1,2030,5,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R1,2030,6,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R1,2030,7,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R2,2025,0,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R2,2025,2,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R2,2025,4,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R2,2025,6,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R2,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R2,2030,3,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R2,2030,4,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R2,2030,5,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R2,2030,6,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R2,2030,7,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,CO2f,R1,2025,0,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R1,2025,2,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R1,2030,3,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R2,2025,0,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R2,2025,2,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R2,2030,3,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2025,0,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R1,2025,2,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R1,2025,4,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R1,2025,6,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R1,2030,1,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R1,2030,3,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R1,2030,4,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R1,2030,6,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R1,2030,7,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R2,2025,0,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R2,2025,2,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R2,2025,4,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R2,2025,6,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R2,2030,1,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R2,2030,3,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R2,2030,4,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R2,2030,6,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R2,2030,7,all-year,all-week,night,heatpump,2025,0.17850000000
+0,CO2f,R1,2025,0,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R1,2025,2,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R1,2030,1,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R1,2030,3,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R2,2025,0,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R2,2025,2,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R2,2030,1,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R2,2030,3,all-year,all-week,night,gasboiler,2025,2.88760000000
+1,heat,R1,2025,0,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R1,2025,2,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R1,2025,4,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R1,2025,6,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R1,2030,1,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R1,2030,3,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R1,2030,7,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R2,2025,0,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R2,2025,2,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R2,2025,4,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R2,2025,6,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R2,2030,1,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R2,2030,3,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R2,2030,7,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,CO2f,R1,2025,0,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R1,2025,2,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R1,2030,1,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R1,2030,3,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R2,2025,0,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R2,2025,2,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R2,2030,1,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R2,2030,3,all-year,all-week,morning,gasboiler,2025,4.33140000000
+2,heat,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R1,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R1,2025,4,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R1,2025,6,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R1,2030,3,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R1,2030,6,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R1,2030,7,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R2,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R2,2025,4,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R2,2025,6,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R2,2030,3,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R2,2030,6,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R2,2030,7,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,CO2f,R1,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R1,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R1,2030,3,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R2,2025,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R2,2025,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R2,2030,3,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+3,heat,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R1,2025,4,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R1,2025,6,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R1,2030,1,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R1,2030,3,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R1,2030,7,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R2,2025,4,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R2,2025,6,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R2,2030,1,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R2,2030,3,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R2,2030,7,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,CO2f,R1,2025,0,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R1,2025,2,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R1,2030,1,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R1,2030,3,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R2,2025,0,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R2,2025,2,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R2,2030,1,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R2,2030,3,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+4,heat,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R1,2025,4,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R1,2025,6,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R1,2030,1,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R1,2030,3,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R1,2030,7,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R2,2025,4,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R2,2025,6,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R2,2030,1,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R2,2030,3,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R2,2030,7,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,CO2f,R1,2025,0,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R1,2025,2,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R1,2030,1,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R1,2030,3,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R2,2025,0,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R2,2025,2,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R2,2030,1,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R2,2030,3,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+5,heat,R1,2025,0,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R1,2025,2,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R1,2025,4,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R1,2025,6,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R1,2030,1,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R1,2030,3,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R1,2030,7,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R2,2025,0,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R2,2025,2,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R2,2025,4,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R2,2025,6,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R2,2030,1,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R2,2030,3,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R2,2030,7,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,CO2f,R1,2025,0,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R1,2025,2,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R1,2030,1,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R1,2030,3,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R2,2025,0,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R2,2025,2,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R2,2030,1,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R2,2030,3,all-year,all-week,evening,gasboiler,2025,5.77920000000
+6,heat,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R1,2025,2,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R1,2025,4,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R1,2025,6,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R1,2030,1,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R1,2030,3,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R1,2030,6,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R1,2030,7,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R2,2025,2,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R2,2025,4,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R2,2025,6,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R2,2030,1,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R2,2030,3,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R2,2030,6,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R2,2030,7,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,CO2f,R1,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R1,2025,2,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R1,2030,1,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R1,2030,3,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R2,2025,0,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R2,2025,2,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R2,2030,1,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R2,2030,3,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+7,heat,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R1,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R1,2025,4,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R1,2025,6,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R1,2030,3,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R1,2030,6,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R1,2030,7,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R2,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R2,2025,4,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R2,2025,6,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R2,2030,3,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R2,2030,6,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R2,2030,7,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,CO2f,R1,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R1,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R1,2030,3,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R2,2025,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R2,2025,2,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R2,2030,3,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2030.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2030.csv
index ed5f57f1b..6882e943a 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2030.csv
@@ -1,257 +1,257 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2030,0,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R1,2030,1,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R1,2030,2,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R1,2030,3,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R1,2030,5,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R1,2030,6,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R1,2035,0,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R1,2035,1,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R1,2035,3,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R1,2035,4,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R1,2035,6,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R1,2035,7,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R2,2030,0,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R2,2030,1,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R2,2030,2,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R2,2030,3,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R2,2030,5,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R2,2030,6,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R2,2035,0,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R2,2035,1,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R2,2035,3,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R2,2035,4,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R2,2035,6,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R2,2035,7,heatpump,2030,all-year,all-week,night,0.49090000000
-0,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,night,2.88760000000
-1,heat,R1,2030,0,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R1,2030,1,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R1,2030,2,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R1,2030,3,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R1,2030,5,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R1,2030,6,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R1,2035,0,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R1,2035,1,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R1,2035,3,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R1,2035,4,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R1,2035,6,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R1,2035,7,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R2,2030,0,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R2,2030,1,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R2,2030,2,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R2,2030,3,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R2,2030,5,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R2,2030,6,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R2,2035,0,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R2,2035,1,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R2,2035,3,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R2,2035,4,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R2,2035,6,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R2,2035,7,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,morning,4.33140000000
-2,heat,R1,2030,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R1,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R1,2030,2,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R1,2030,3,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R1,2030,5,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R1,2030,6,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R1,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R1,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R1,2035,3,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R1,2035,4,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R1,2035,6,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R1,2035,7,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R2,2030,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R2,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R2,2030,2,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R2,2030,3,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R2,2030,5,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R2,2030,6,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R2,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R2,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R2,2035,3,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R2,2035,4,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R2,2035,6,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R2,2035,7,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-3,heat,R1,2030,0,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R1,2030,1,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R1,2030,2,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R1,2030,3,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R1,2030,5,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R1,2030,6,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R1,2035,0,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R1,2035,1,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R1,2035,3,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R1,2035,4,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R1,2035,6,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R1,2035,7,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R2,2030,0,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R2,2030,1,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R2,2030,2,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R2,2030,3,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R2,2030,5,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R2,2030,6,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R2,2035,0,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R2,2035,1,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R2,2035,3,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R2,2035,4,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R2,2035,6,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R2,2035,7,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-4,heat,R1,2030,0,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R1,2030,1,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R1,2030,2,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R1,2030,3,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R1,2030,5,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R1,2030,6,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R1,2035,0,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R1,2035,1,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R1,2035,3,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R1,2035,4,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R1,2035,6,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R1,2035,7,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R2,2030,0,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R2,2030,1,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R2,2030,2,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R2,2030,3,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R2,2030,5,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R2,2030,6,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R2,2035,0,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R2,2035,1,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R2,2035,3,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R2,2035,4,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R2,2035,6,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R2,2035,7,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-5,heat,R1,2030,0,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R1,2030,1,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R1,2030,2,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R1,2030,3,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R1,2030,5,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R1,2030,6,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R1,2035,0,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R1,2035,1,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R1,2035,3,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R1,2035,4,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R1,2035,6,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R1,2035,7,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R2,2030,0,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R2,2030,1,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R2,2030,2,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R2,2030,3,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R2,2030,5,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R2,2030,6,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R2,2035,0,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R2,2035,1,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R2,2035,3,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R2,2035,4,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R2,2035,6,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R2,2035,7,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,evening,5.77920000000
-6,heat,R1,2030,0,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R1,2030,1,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R1,2030,2,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R1,2030,3,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R1,2030,5,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R1,2030,6,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R1,2035,0,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R1,2035,1,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R1,2035,3,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R1,2035,4,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R1,2035,6,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R1,2035,7,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R2,2030,0,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R2,2030,1,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R2,2030,2,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R2,2030,3,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R2,2030,5,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R2,2030,6,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R2,2035,0,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R2,2035,1,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R2,2035,3,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R2,2035,4,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R2,2035,6,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R2,2035,7,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-7,heat,R1,2030,0,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R1,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R1,2030,2,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R1,2030,3,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R1,2030,5,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R1,2030,6,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R1,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R1,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R1,2035,3,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R1,2035,4,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R1,2035,6,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R1,2035,7,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R2,2030,0,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R2,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R2,2030,2,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R2,2030,3,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R2,2030,5,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R2,2030,6,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R2,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R2,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R2,2035,3,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R2,2035,4,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R2,2035,6,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R2,2035,7,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,CO2f,R1,2030,0,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R1,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R2,2030,0,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R2,2030,1,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2030,0,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R1,2030,1,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R1,2030,2,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R1,2030,3,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R1,2030,6,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R1,2035,0,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R1,2035,1,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R1,2035,3,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R1,2035,4,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R1,2035,6,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R1,2035,7,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R2,2030,0,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R2,2030,1,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R2,2030,2,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R2,2030,3,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R2,2030,6,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R2,2035,0,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R2,2035,1,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R2,2035,3,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R2,2035,4,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R2,2035,6,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R2,2035,7,all-year,all-week,night,heatpump,2030,0.49090000000
+0,CO2f,R1,2030,0,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R1,2030,1,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R1,2035,0,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R1,2035,1,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R2,2030,0,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R2,2030,1,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R2,2035,0,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R2,2035,1,all-year,all-week,night,gasboiler,2025,2.88760000000
+1,heat,R1,2030,0,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R1,2030,1,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R1,2030,3,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R1,2035,0,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R1,2035,1,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R1,2035,4,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R1,2035,6,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R1,2035,7,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R2,2030,0,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R2,2030,1,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R2,2030,3,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R2,2035,0,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R2,2035,1,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R2,2035,4,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R2,2035,6,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R2,2035,7,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,CO2f,R1,2030,0,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R1,2030,1,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R1,2035,0,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R1,2035,1,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R2,2030,0,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R2,2030,1,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R2,2035,0,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R2,2035,1,all-year,all-week,morning,gasboiler,2025,4.33140000000
+2,heat,R1,2030,0,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R1,2030,2,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R1,2030,3,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R1,2030,6,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R1,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R1,2035,1,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R1,2035,3,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R1,2035,4,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R1,2035,6,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R1,2035,7,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R2,2030,0,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R2,2030,2,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R2,2030,3,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R2,2030,6,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R2,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R2,2035,1,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R2,2035,3,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R2,2035,4,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R2,2035,6,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R2,2035,7,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,CO2f,R1,2030,0,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R1,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R1,2035,1,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R2,2030,0,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R2,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R2,2035,1,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+3,heat,R1,2030,0,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R1,2030,1,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R1,2030,3,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R1,2035,0,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R1,2035,1,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R1,2035,4,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R1,2035,6,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R1,2035,7,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R2,2030,0,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R2,2030,1,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R2,2030,3,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R2,2035,0,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R2,2035,1,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R2,2035,4,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R2,2035,6,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R2,2035,7,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,CO2f,R1,2030,0,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R1,2030,1,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R1,2035,0,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R1,2035,1,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R2,2030,0,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R2,2030,1,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R2,2035,0,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R2,2035,1,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+4,heat,R1,2030,0,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R1,2030,1,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R1,2030,3,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R1,2035,0,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R1,2035,1,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R1,2035,4,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R1,2035,6,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R1,2035,7,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R2,2030,0,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R2,2030,1,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R2,2030,3,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R2,2035,0,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R2,2035,1,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R2,2035,4,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R2,2035,6,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R2,2035,7,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,CO2f,R1,2030,0,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R1,2030,1,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R1,2035,0,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R1,2035,1,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R2,2030,0,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R2,2030,1,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R2,2035,0,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R2,2035,1,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+5,heat,R1,2030,0,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R1,2030,1,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R1,2030,3,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R1,2035,0,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R1,2035,1,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R1,2035,4,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R1,2035,6,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R1,2035,7,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R2,2030,0,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R2,2030,1,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R2,2030,3,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R2,2035,0,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R2,2035,1,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R2,2035,4,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R2,2035,6,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R2,2035,7,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,CO2f,R1,2030,0,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R1,2030,1,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R1,2035,0,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R1,2035,1,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R2,2030,0,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R2,2030,1,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R2,2035,0,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R2,2035,1,all-year,all-week,evening,gasboiler,2025,5.77920000000
+6,heat,R1,2030,0,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R1,2030,1,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R1,2030,2,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R1,2030,3,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R1,2030,6,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R1,2035,0,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R1,2035,1,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R1,2035,3,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R1,2035,4,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R1,2035,6,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R1,2035,7,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R2,2030,0,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R2,2030,1,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R2,2030,2,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R2,2030,3,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R2,2030,6,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R2,2035,0,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R2,2035,1,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R2,2035,3,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R2,2035,4,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R2,2035,6,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R2,2035,7,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,CO2f,R1,2030,0,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R1,2030,1,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R1,2035,0,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R1,2035,1,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R2,2030,0,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R2,2030,1,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R2,2035,0,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R2,2035,1,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+7,heat,R1,2030,0,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R1,2030,2,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R1,2030,3,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R1,2030,6,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R1,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R1,2035,1,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R1,2035,3,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R1,2035,4,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R1,2035,6,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R1,2035,7,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R2,2030,0,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R2,2030,2,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R2,2030,3,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R2,2030,6,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R2,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R2,2035,1,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R2,2035,3,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R2,2035,4,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R2,2035,6,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R2,2035,7,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,CO2f,R1,2030,0,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R1,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R1,2035,1,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R2,2030,0,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R2,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R2,2035,1,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2035.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2035.csv
index f705f5abd..961a0e30c 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2035.csv
@@ -1,193 +1,193 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2035,0,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R1,2035,1,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R1,2035,2,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R1,2035,3,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R1,2035,5,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R1,2035,6,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R1,2040,3,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R1,2040,4,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R1,2040,6,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R1,2040,7,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R2,2035,0,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R2,2035,1,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R2,2035,2,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R2,2035,3,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R2,2035,5,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R2,2035,6,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R2,2040,3,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R2,2040,4,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R2,2040,6,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R2,2040,7,heatpump,2035,all-year,all-week,night,0.34210000000
-0,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,night,2.88760000000
-1,heat,R1,2035,0,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R1,2035,1,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R1,2035,2,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R1,2035,3,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R1,2035,5,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R1,2035,6,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R1,2040,3,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R1,2040,4,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R1,2040,6,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R1,2040,7,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R2,2035,0,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R2,2035,1,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R2,2035,2,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R2,2035,3,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R2,2035,5,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R2,2035,6,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R2,2040,3,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R2,2040,4,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R2,2040,6,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R2,2040,7,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,morning,4.33140000000
-2,heat,R1,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R1,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R1,2035,2,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R1,2035,3,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R1,2035,5,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R1,2035,6,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R1,2040,3,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R1,2040,4,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R1,2040,6,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R1,2040,7,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R2,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R2,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R2,2035,2,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R2,2035,3,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R2,2035,5,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R2,2035,6,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R2,2040,3,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R2,2040,4,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R2,2040,6,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R2,2040,7,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-3,heat,R1,2035,0,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R1,2035,1,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R1,2035,2,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R1,2035,3,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R1,2035,5,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R1,2035,6,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R1,2040,3,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R1,2040,4,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R1,2040,6,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R1,2040,7,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R2,2035,0,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R2,2035,1,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R2,2035,2,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R2,2035,3,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R2,2035,5,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R2,2035,6,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R2,2040,3,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R2,2040,4,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R2,2040,6,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R2,2040,7,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-4,heat,R1,2035,0,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R1,2035,1,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R1,2035,2,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R1,2035,3,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R1,2035,5,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R1,2035,6,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R1,2040,3,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R1,2040,4,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R1,2040,6,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R1,2040,7,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R2,2035,0,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R2,2035,1,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R2,2035,2,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R2,2035,3,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R2,2035,5,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R2,2035,6,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R2,2040,3,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R2,2040,4,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R2,2040,6,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R2,2040,7,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-5,heat,R1,2035,0,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R1,2035,1,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R1,2035,2,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R1,2035,3,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R1,2035,5,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R1,2035,6,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R1,2040,3,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R1,2040,4,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R1,2040,6,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R1,2040,7,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R2,2035,0,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R2,2035,1,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R2,2035,2,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R2,2035,3,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R2,2035,5,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R2,2035,6,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R2,2040,3,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R2,2040,4,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R2,2040,6,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R2,2040,7,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,evening,5.77920000000
-6,heat,R1,2035,0,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R1,2035,1,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R1,2035,2,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R1,2035,3,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R1,2035,5,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R1,2035,6,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R1,2040,3,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R1,2040,4,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R1,2040,6,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R1,2040,7,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R2,2035,0,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R2,2035,1,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R2,2035,2,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R2,2035,3,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R2,2035,5,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R2,2035,6,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R2,2040,3,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R2,2040,4,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R2,2040,6,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R2,2040,7,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-7,heat,R1,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R1,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R1,2035,2,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R1,2035,3,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R1,2035,5,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R1,2035,6,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R1,2040,3,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R1,2040,4,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R1,2040,6,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R1,2040,7,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R2,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R2,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R2,2035,2,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R2,2035,3,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R2,2035,5,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R2,2035,6,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R2,2040,3,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R2,2040,4,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R2,2040,6,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R2,2040,7,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,CO2f,R1,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R1,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R2,2035,0,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R2,2035,1,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2035,0,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R1,2035,1,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R1,2035,2,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R1,2035,3,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R1,2035,5,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R1,2035,6,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R1,2040,3,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R1,2040,4,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R1,2040,6,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R1,2040,7,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R2,2035,0,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R2,2035,1,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R2,2035,2,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R2,2035,3,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R2,2035,5,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R2,2035,6,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R2,2040,3,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R2,2040,4,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R2,2040,6,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R2,2040,7,all-year,all-week,night,heatpump,2035,0.34210000000
+0,CO2f,R1,2035,0,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R1,2035,1,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R2,2035,0,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R2,2035,1,all-year,all-week,night,gasboiler,2025,2.88760000000
+1,heat,R1,2035,0,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R1,2035,1,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R1,2035,2,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R1,2035,3,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R1,2035,5,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R1,2035,6,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R1,2040,6,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R1,2040,7,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R2,2035,0,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R2,2035,1,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R2,2035,2,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R2,2035,3,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R2,2035,5,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R2,2035,6,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R2,2040,6,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R2,2040,7,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,CO2f,R1,2035,0,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R1,2035,1,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R2,2035,0,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R2,2035,1,all-year,all-week,morning,gasboiler,2025,4.33140000000
+2,heat,R1,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R1,2035,1,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R1,2035,2,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R1,2035,3,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R1,2035,5,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R1,2035,6,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R1,2040,3,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R1,2040,4,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R1,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R1,2040,7,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R2,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R2,2035,1,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R2,2035,2,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R2,2035,3,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R2,2035,5,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R2,2035,6,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R2,2040,3,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R2,2040,4,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R2,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R2,2040,7,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,CO2f,R1,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R1,2035,1,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R2,2035,0,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R2,2035,1,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+3,heat,R1,2035,0,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R1,2035,1,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R1,2035,2,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R1,2035,3,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R1,2035,5,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R1,2035,6,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R1,2040,6,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R1,2040,7,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R2,2035,0,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R2,2035,1,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R2,2035,2,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R2,2035,3,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R2,2035,5,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R2,2035,6,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R2,2040,6,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R2,2040,7,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,CO2f,R1,2035,0,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R1,2035,1,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R2,2035,0,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R2,2035,1,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+4,heat,R1,2035,0,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R1,2035,1,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R1,2035,2,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R1,2035,3,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R1,2035,5,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R1,2035,6,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R1,2040,6,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R1,2040,7,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R2,2035,0,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R2,2035,1,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R2,2035,2,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R2,2035,3,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R2,2035,5,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R2,2035,6,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R2,2040,6,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R2,2040,7,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,CO2f,R1,2035,0,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R1,2035,1,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R2,2035,0,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R2,2035,1,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+5,heat,R1,2035,0,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R1,2035,1,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R1,2035,2,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R1,2035,3,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R1,2035,5,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R1,2035,6,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R1,2040,6,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R1,2040,7,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R2,2035,0,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R2,2035,1,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R2,2035,2,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R2,2035,3,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R2,2035,5,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R2,2035,6,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R2,2040,6,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R2,2040,7,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,CO2f,R1,2035,0,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R1,2035,1,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R2,2035,0,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R2,2035,1,all-year,all-week,evening,gasboiler,2025,5.77920000000
+6,heat,R1,2035,0,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R1,2035,1,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R1,2035,2,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R1,2035,3,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R1,2035,5,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R1,2035,6,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R1,2040,3,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R1,2040,4,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R1,2040,6,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R1,2040,7,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R2,2035,0,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R2,2035,1,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R2,2035,2,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R2,2035,3,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R2,2035,5,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R2,2035,6,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R2,2040,3,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R2,2040,4,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R2,2040,6,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R2,2040,7,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,CO2f,R1,2035,0,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R1,2035,1,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R2,2035,0,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R2,2035,1,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+7,heat,R1,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R1,2035,1,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R1,2035,2,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R1,2035,3,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R1,2035,5,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R1,2035,6,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R1,2040,3,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R1,2040,4,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R1,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R1,2040,7,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R2,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R2,2035,1,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R2,2035,2,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R2,2035,3,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R2,2035,5,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R2,2035,6,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R2,2040,3,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R2,2040,4,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R2,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R2,2040,7,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,CO2f,R1,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R1,2035,1,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R2,2035,0,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R2,2035,1,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2040.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2040.csv
index e83a6d962..7d51bac98 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2040.csv
@@ -1,129 +1,129 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2040,0,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R1,2040,1,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R1,2040,3,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R1,2040,4,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R1,2045,1,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R1,2045,2,heatpump,2040,all-year,all-week,night,0.60990000000
-0,heat,R1,2045,4,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R1,2045,5,heatpump,2040,all-year,all-week,night,0.60990000000
-0,heat,R2,2040,0,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R2,2040,1,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R2,2040,3,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R2,2040,4,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R2,2045,1,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R2,2045,2,heatpump,2040,all-year,all-week,night,0.60990000000
-0,heat,R2,2045,4,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R2,2045,5,heatpump,2040,all-year,all-week,night,0.60990000000
-1,heat,R1,2040,0,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R1,2040,1,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R1,2040,3,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R1,2040,4,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R1,2045,1,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R1,2045,2,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,heat,R1,2045,4,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R1,2045,5,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,heat,R2,2040,0,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R2,2040,1,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R2,2040,3,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R2,2040,4,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R2,2045,1,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R2,2045,2,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,heat,R2,2045,4,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R2,2045,5,heatpump,2040,all-year,all-week,morning,0.91480000000
-2,heat,R1,2040,0,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R1,2040,1,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R1,2040,3,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R1,2040,4,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R1,2045,1,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R1,2045,2,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R1,2045,4,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R1,2045,5,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R2,2040,0,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R2,2040,1,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R2,2040,3,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R2,2040,4,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R2,2045,1,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R2,2045,2,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R2,2045,4,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R2,2045,5,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-3,heat,R1,2040,0,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R1,2040,1,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R1,2040,3,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R1,2040,4,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R1,2045,1,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R1,2045,2,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,heat,R1,2045,4,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R1,2045,5,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,heat,R2,2040,0,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R2,2040,1,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R2,2040,3,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R2,2040,4,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R2,2045,1,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R2,2045,2,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,heat,R2,2045,4,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R2,2045,5,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-4,heat,R1,2040,0,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R1,2040,1,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R1,2040,3,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R1,2040,4,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R1,2045,1,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R1,2045,2,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,heat,R1,2045,4,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R1,2045,5,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,heat,R2,2040,0,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R2,2040,1,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R2,2040,3,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R2,2040,4,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R2,2045,1,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R2,2045,2,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,heat,R2,2045,4,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R2,2045,5,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-5,heat,R1,2040,0,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R1,2040,1,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R1,2040,3,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R1,2040,4,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R1,2045,1,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R1,2045,2,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,heat,R1,2045,4,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R1,2045,5,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,heat,R2,2040,0,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R2,2040,1,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R2,2040,3,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R2,2040,4,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R2,2045,1,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R2,2045,2,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,heat,R2,2045,4,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R2,2045,5,heatpump,2040,all-year,all-week,evening,1.22060000000
-6,heat,R1,2040,0,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R1,2040,1,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R1,2040,3,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R1,2040,4,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R1,2045,1,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R1,2045,2,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,heat,R1,2045,4,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R1,2045,5,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,heat,R2,2040,0,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R2,2040,1,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R2,2040,3,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R2,2040,4,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R2,2045,1,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R2,2045,2,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,heat,R2,2045,4,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R2,2045,5,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-7,heat,R1,2040,0,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R1,2040,1,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R1,2040,3,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R1,2040,4,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R1,2045,1,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R1,2045,2,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R1,2045,4,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R1,2045,5,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R2,2040,0,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R2,2040,1,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R2,2040,3,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R2,2040,4,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R2,2045,1,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R2,2045,2,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R2,2045,4,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R2,2045,5,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2040,0,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R1,2040,1,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R1,2040,3,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R1,2040,4,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R1,2045,1,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R1,2045,2,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R1,2045,4,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R1,2045,5,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R2,2040,0,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R2,2040,1,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R2,2040,3,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R2,2040,4,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R2,2045,1,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R2,2045,2,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R2,2045,4,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R2,2045,5,all-year,all-week,night,heatpump,2040,0.60990000000
+1,heat,R1,2040,0,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R1,2040,1,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R1,2045,1,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R1,2045,2,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R1,2045,5,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R2,2040,0,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R2,2040,1,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R2,2045,1,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R2,2045,2,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R2,2045,5,all-year,all-week,morning,heatpump,2040,0.91480000000
+2,heat,R1,2040,0,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R1,2040,1,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R1,2040,3,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R1,2040,4,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R1,2045,1,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R1,2045,2,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R1,2045,4,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R1,2045,5,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R2,2040,0,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R2,2040,1,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R2,2040,3,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R2,2040,4,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R2,2045,1,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R2,2045,2,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R2,2045,4,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R2,2045,5,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+3,heat,R1,2040,0,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R1,2040,1,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R1,2045,1,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R1,2045,2,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R1,2045,5,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R2,2040,0,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R2,2040,1,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R2,2045,1,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R2,2045,2,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R2,2045,5,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+4,heat,R1,2040,0,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R1,2040,1,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R1,2045,1,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R1,2045,2,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R1,2045,5,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R2,2040,0,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R2,2040,1,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R2,2045,1,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R2,2045,2,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R2,2045,5,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+5,heat,R1,2040,0,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R1,2040,1,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R1,2045,1,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R1,2045,2,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R1,2045,5,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R2,2040,0,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R2,2040,1,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R2,2045,1,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R2,2045,2,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R2,2045,5,all-year,all-week,evening,heatpump,2040,1.22060000000
+6,heat,R1,2040,0,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R1,2040,1,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R1,2040,3,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R1,2040,4,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R1,2045,1,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R1,2045,2,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R1,2045,4,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R1,2045,5,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R2,2040,0,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R2,2040,1,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R2,2040,3,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R2,2040,4,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R2,2045,1,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R2,2045,2,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R2,2045,4,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R2,2045,5,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+7,heat,R1,2040,0,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R1,2040,1,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R1,2040,3,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R1,2040,4,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R1,2045,1,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R1,2045,2,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R1,2045,4,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R1,2045,5,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R2,2040,0,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R2,2040,1,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R2,2040,3,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R2,2040,4,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R2,2045,1,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R2,2045,2,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R2,2045,4,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R2,2045,5,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2045.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2045.csv
index 79c2096be..9d640006f 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2045.csv
@@ -1,129 +1,129 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2045,0,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R1,2045,1,heatpump,2040,all-year,all-week,night,0.60990000000
-0,heat,R1,2045,3,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R1,2045,4,heatpump,2040,all-year,all-week,night,0.60990000000
-0,heat,R1,2050,1,heatpump,2040,all-year,all-week,night,0.60990000000
-0,heat,R1,2050,2,heatpump,2045,all-year,all-week,night,0.46110000000
-0,heat,R1,2050,4,heatpump,2040,all-year,all-week,night,0.60990000000
-0,heat,R1,2050,5,heatpump,2045,all-year,all-week,night,0.46110000000
-0,heat,R2,2045,0,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R2,2045,1,heatpump,2040,all-year,all-week,night,0.60990000000
-0,heat,R2,2045,3,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R2,2045,4,heatpump,2040,all-year,all-week,night,0.60990000000
-0,heat,R2,2050,1,heatpump,2040,all-year,all-week,night,0.60990000000
-0,heat,R2,2050,2,heatpump,2045,all-year,all-week,night,0.46110000000
-0,heat,R2,2050,4,heatpump,2040,all-year,all-week,night,0.60990000000
-0,heat,R2,2050,5,heatpump,2045,all-year,all-week,night,0.46110000000
-1,heat,R1,2045,0,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R1,2045,1,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,heat,R1,2045,3,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R1,2045,4,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,heat,R1,2050,1,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,heat,R1,2050,2,heatpump,2045,all-year,all-week,morning,0.69170000000
-1,heat,R1,2050,4,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,heat,R1,2050,5,heatpump,2045,all-year,all-week,morning,0.69170000000
-1,heat,R2,2045,0,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R2,2045,1,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,heat,R2,2045,3,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R2,2045,4,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,heat,R2,2050,1,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,heat,R2,2050,2,heatpump,2045,all-year,all-week,morning,0.69170000000
-1,heat,R2,2050,4,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,heat,R2,2050,5,heatpump,2045,all-year,all-week,morning,0.69170000000
-2,heat,R1,2045,0,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R1,2045,1,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R1,2045,3,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R1,2045,4,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R1,2050,1,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R1,2050,2,heatpump,2045,all-year,all-week,mid-afternoon,0.46110000000
-2,heat,R1,2050,4,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R1,2050,5,heatpump,2045,all-year,all-week,mid-afternoon,0.46110000000
-2,heat,R2,2045,0,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R2,2045,1,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R2,2045,3,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R2,2045,4,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R2,2050,1,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R2,2050,2,heatpump,2045,all-year,all-week,mid-afternoon,0.46110000000
-2,heat,R2,2050,4,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R2,2050,5,heatpump,2045,all-year,all-week,mid-afternoon,0.46110000000
-3,heat,R1,2045,0,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R1,2045,1,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,heat,R1,2045,3,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R1,2045,4,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,heat,R1,2050,1,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,heat,R1,2050,2,heatpump,2045,all-year,all-week,early-peak,0.69170000000
-3,heat,R1,2050,4,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,heat,R1,2050,5,heatpump,2045,all-year,all-week,early-peak,0.69170000000
-3,heat,R2,2045,0,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R2,2045,1,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,heat,R2,2045,3,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R2,2045,4,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,heat,R2,2050,1,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,heat,R2,2050,2,heatpump,2045,all-year,all-week,early-peak,0.69170000000
-3,heat,R2,2050,4,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,heat,R2,2050,5,heatpump,2045,all-year,all-week,early-peak,0.69170000000
-4,heat,R1,2045,0,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R1,2045,1,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,heat,R1,2045,3,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R1,2045,4,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,heat,R1,2050,1,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,heat,R1,2050,2,heatpump,2045,all-year,all-week,late-peak,1.38400000000
-4,heat,R1,2050,4,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,heat,R1,2050,5,heatpump,2045,all-year,all-week,late-peak,1.38400000000
-4,heat,R2,2045,0,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R2,2045,1,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,heat,R2,2045,3,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R2,2045,4,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,heat,R2,2050,1,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,heat,R2,2050,2,heatpump,2045,all-year,all-week,late-peak,1.38400000000
-4,heat,R2,2050,4,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,heat,R2,2050,5,heatpump,2045,all-year,all-week,late-peak,1.38400000000
-5,heat,R1,2045,0,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R1,2045,1,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,heat,R1,2045,3,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R1,2045,4,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,heat,R1,2050,1,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,heat,R1,2050,2,heatpump,2045,all-year,all-week,evening,0.92290000000
-5,heat,R1,2050,4,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,heat,R1,2050,5,heatpump,2045,all-year,all-week,evening,0.92290000000
-5,heat,R2,2045,0,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R2,2045,1,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,heat,R2,2045,3,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R2,2045,4,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,heat,R2,2050,1,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,heat,R2,2050,2,heatpump,2045,all-year,all-week,evening,0.92290000000
-5,heat,R2,2050,4,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,heat,R2,2050,5,heatpump,2045,all-year,all-week,evening,0.92290000000
-6,heat,R1,2045,0,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R1,2045,1,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,heat,R1,2045,3,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R1,2045,4,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,heat,R1,2050,1,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,heat,R1,2050,2,heatpump,2045,all-year,all-week,early-morning,0.92290000000
-6,heat,R1,2050,4,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,heat,R1,2050,5,heatpump,2045,all-year,all-week,early-morning,0.92290000000
-6,heat,R2,2045,0,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R2,2045,1,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,heat,R2,2045,3,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R2,2045,4,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,heat,R2,2050,1,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,heat,R2,2050,2,heatpump,2045,all-year,all-week,early-morning,0.92290000000
-6,heat,R2,2050,4,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,heat,R2,2050,5,heatpump,2045,all-year,all-week,early-morning,0.92290000000
-7,heat,R1,2045,0,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R1,2045,1,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R1,2045,3,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R1,2045,4,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R1,2050,1,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R1,2050,2,heatpump,2045,all-year,all-week,late-afternoon,0.92290000000
-7,heat,R1,2050,4,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R1,2050,5,heatpump,2045,all-year,all-week,late-afternoon,0.92290000000
-7,heat,R2,2045,0,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R2,2045,1,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R2,2045,3,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R2,2045,4,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R2,2050,1,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R2,2050,2,heatpump,2045,all-year,all-week,late-afternoon,0.92290000000
-7,heat,R2,2050,4,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R2,2050,5,heatpump,2045,all-year,all-week,late-afternoon,0.92290000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2045,0,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R1,2045,1,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R1,2045,3,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R1,2045,4,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R1,2050,1,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R1,2050,2,all-year,all-week,night,heatpump,2045,0.46110000000
+0,heat,R1,2050,4,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R1,2050,5,all-year,all-week,night,heatpump,2045,0.46110000000
+0,heat,R2,2045,0,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R2,2045,1,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R2,2045,3,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R2,2045,4,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R2,2050,1,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R2,2050,2,all-year,all-week,night,heatpump,2045,0.46110000000
+0,heat,R2,2050,4,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R2,2050,5,all-year,all-week,night,heatpump,2045,0.46110000000
+1,heat,R1,2045,0,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R1,2045,1,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R1,2045,3,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R1,2045,4,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R1,2050,1,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R1,2050,2,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,heat,R1,2050,4,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,heat,R2,2045,0,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R2,2045,1,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R2,2045,3,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R2,2045,4,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R2,2050,1,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R2,2050,2,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,heat,R2,2050,4,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2045,0.69170000000
+2,heat,R1,2045,0,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R1,2045,1,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R1,2045,3,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R1,2045,4,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R1,2050,1,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R1,2050,2,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,heat,R1,2050,4,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R1,2050,5,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,heat,R2,2045,0,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R2,2045,1,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R2,2045,3,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R2,2045,4,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R2,2050,1,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R2,2050,2,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,heat,R2,2050,4,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R2,2050,5,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+3,heat,R1,2045,0,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R1,2045,1,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R1,2045,3,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R1,2045,4,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R1,2050,1,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R1,2050,2,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,heat,R1,2050,4,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,heat,R2,2045,0,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R2,2045,1,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R2,2045,3,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R2,2045,4,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R2,2050,1,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R2,2050,2,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,heat,R2,2050,4,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+4,heat,R1,2045,0,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R1,2045,1,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R1,2045,3,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R1,2045,4,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R1,2050,1,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R1,2050,2,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,heat,R1,2050,4,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,heat,R2,2045,0,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R2,2045,1,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R2,2045,3,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R2,2045,4,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R2,2050,1,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R2,2050,2,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,heat,R2,2050,4,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+5,heat,R1,2045,0,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R1,2045,1,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R1,2045,3,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R1,2045,4,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R1,2050,1,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R1,2050,2,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,heat,R1,2050,4,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,heat,R2,2045,0,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R2,2045,1,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R2,2045,3,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R2,2045,4,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R2,2050,1,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R2,2050,2,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,heat,R2,2050,4,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2045,0.92290000000
+6,heat,R1,2045,0,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R1,2045,1,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R1,2045,3,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R1,2045,4,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R1,2050,1,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R1,2050,2,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,heat,R1,2050,4,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R1,2050,5,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,heat,R2,2045,0,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R2,2045,1,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R2,2045,3,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R2,2045,4,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R2,2050,1,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R2,2050,2,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,heat,R2,2050,4,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R2,2050,5,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+7,heat,R1,2045,0,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R1,2045,1,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R1,2045,3,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R1,2045,4,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R1,2050,1,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R1,2050,2,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,heat,R1,2050,4,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R1,2050,5,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,heat,R2,2045,0,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R2,2045,1,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R2,2045,3,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R2,2045,4,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R2,2050,1,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R2,2050,2,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,heat,R2,2050,4,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R2,2050,5,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
diff --git a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2050.csv b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2050.csv
index bff478f67..3a03b1e33 100644
--- a/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/4-modify-timing-data/1-modify-timeslices/Results/Residential/Supply/2050.csv
@@ -1,129 +1,129 @@
-timeslice,commodity,region,year,asset,installed,technology,month,day,hour,supply
-0,heat,R1,2050,1,2040,heatpump,all-year,all-week,night,0.60990000000
-0,heat,R1,2050,2,2045,heatpump,all-year,all-week,night,0.46110000000
-0,heat,R1,2050,5,2040,heatpump,all-year,all-week,night,0.60990000000
-0,heat,R1,2050,6,2045,heatpump,all-year,all-week,night,0.46110000000
-0,heat,R1,2055,2,2045,heatpump,all-year,all-week,night,0.46110000000
-0,heat,R1,2055,3,2050,heatpump,all-year,all-week,night,0.60990000000
-0,heat,R1,2055,6,2045,heatpump,all-year,all-week,night,0.46110000000
-0,heat,R1,2055,7,2050,heatpump,all-year,all-week,night,0.60990000000
-0,heat,R2,2050,1,2040,heatpump,all-year,all-week,night,0.60990000000
-0,heat,R2,2050,2,2045,heatpump,all-year,all-week,night,0.46110000000
-0,heat,R2,2050,5,2040,heatpump,all-year,all-week,night,0.60990000000
-0,heat,R2,2050,6,2045,heatpump,all-year,all-week,night,0.46110000000
-0,heat,R2,2055,2,2045,heatpump,all-year,all-week,night,0.46110000000
-0,heat,R2,2055,3,2050,heatpump,all-year,all-week,night,0.60990000000
-0,heat,R2,2055,6,2045,heatpump,all-year,all-week,night,0.46110000000
-0,heat,R2,2055,7,2050,heatpump,all-year,all-week,night,0.60990000000
-1,heat,R1,2050,1,2040,heatpump,all-year,all-week,morning,0.91480000000
-1,heat,R1,2050,2,2045,heatpump,all-year,all-week,morning,0.69170000000
-1,heat,R1,2050,5,2040,heatpump,all-year,all-week,morning,0.91480000000
-1,heat,R1,2050,6,2045,heatpump,all-year,all-week,morning,0.69170000000
-1,heat,R1,2055,2,2045,heatpump,all-year,all-week,morning,0.69170000000
-1,heat,R1,2055,3,2050,heatpump,all-year,all-week,morning,0.91480000000
-1,heat,R1,2055,6,2045,heatpump,all-year,all-week,morning,0.69170000000
-1,heat,R1,2055,7,2050,heatpump,all-year,all-week,morning,0.91480000000
-1,heat,R2,2050,1,2040,heatpump,all-year,all-week,morning,0.91480000000
-1,heat,R2,2050,2,2045,heatpump,all-year,all-week,morning,0.69170000000
-1,heat,R2,2050,5,2040,heatpump,all-year,all-week,morning,0.91480000000
-1,heat,R2,2050,6,2045,heatpump,all-year,all-week,morning,0.69170000000
-1,heat,R2,2055,2,2045,heatpump,all-year,all-week,morning,0.69170000000
-1,heat,R2,2055,3,2050,heatpump,all-year,all-week,morning,0.91480000000
-1,heat,R2,2055,6,2045,heatpump,all-year,all-week,morning,0.69170000000
-1,heat,R2,2055,7,2050,heatpump,all-year,all-week,morning,0.91480000000
-2,heat,R1,2050,1,2040,heatpump,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R1,2050,2,2045,heatpump,all-year,all-week,mid-afternoon,0.46110000000
-2,heat,R1,2050,5,2040,heatpump,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R1,2050,6,2045,heatpump,all-year,all-week,mid-afternoon,0.46110000000
-2,heat,R1,2055,2,2045,heatpump,all-year,all-week,mid-afternoon,0.46110000000
-2,heat,R1,2055,3,2050,heatpump,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R1,2055,6,2045,heatpump,all-year,all-week,mid-afternoon,0.46110000000
-2,heat,R1,2055,7,2050,heatpump,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R2,2050,1,2040,heatpump,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R2,2050,2,2045,heatpump,all-year,all-week,mid-afternoon,0.46110000000
-2,heat,R2,2050,5,2040,heatpump,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R2,2050,6,2045,heatpump,all-year,all-week,mid-afternoon,0.46110000000
-2,heat,R2,2055,2,2045,heatpump,all-year,all-week,mid-afternoon,0.46110000000
-2,heat,R2,2055,3,2050,heatpump,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R2,2055,6,2045,heatpump,all-year,all-week,mid-afternoon,0.46110000000
-2,heat,R2,2055,7,2050,heatpump,all-year,all-week,mid-afternoon,0.60990000000
-3,heat,R1,2050,1,2040,heatpump,all-year,all-week,early-peak,0.91480000000
-3,heat,R1,2050,2,2045,heatpump,all-year,all-week,early-peak,0.69170000000
-3,heat,R1,2050,5,2040,heatpump,all-year,all-week,early-peak,0.91480000000
-3,heat,R1,2050,6,2045,heatpump,all-year,all-week,early-peak,0.69170000000
-3,heat,R1,2055,2,2045,heatpump,all-year,all-week,early-peak,0.69170000000
-3,heat,R1,2055,3,2050,heatpump,all-year,all-week,early-peak,0.91480000000
-3,heat,R1,2055,6,2045,heatpump,all-year,all-week,early-peak,0.69170000000
-3,heat,R1,2055,7,2050,heatpump,all-year,all-week,early-peak,0.91480000000
-3,heat,R2,2050,1,2040,heatpump,all-year,all-week,early-peak,0.91480000000
-3,heat,R2,2050,2,2045,heatpump,all-year,all-week,early-peak,0.69170000000
-3,heat,R2,2050,5,2040,heatpump,all-year,all-week,early-peak,0.91480000000
-3,heat,R2,2050,6,2045,heatpump,all-year,all-week,early-peak,0.69170000000
-3,heat,R2,2055,2,2045,heatpump,all-year,all-week,early-peak,0.69170000000
-3,heat,R2,2055,3,2050,heatpump,all-year,all-week,early-peak,0.91480000000
-3,heat,R2,2055,6,2045,heatpump,all-year,all-week,early-peak,0.69170000000
-3,heat,R2,2055,7,2050,heatpump,all-year,all-week,early-peak,0.91480000000
-4,heat,R1,2050,1,2040,heatpump,all-year,all-week,late-peak,1.83050000000
-4,heat,R1,2050,2,2045,heatpump,all-year,all-week,late-peak,1.38400000000
-4,heat,R1,2050,5,2040,heatpump,all-year,all-week,late-peak,1.83050000000
-4,heat,R1,2050,6,2045,heatpump,all-year,all-week,late-peak,1.38400000000
-4,heat,R1,2055,2,2045,heatpump,all-year,all-week,late-peak,1.38400000000
-4,heat,R1,2055,3,2050,heatpump,all-year,all-week,late-peak,1.83050000000
-4,heat,R1,2055,6,2045,heatpump,all-year,all-week,late-peak,1.38400000000
-4,heat,R1,2055,7,2050,heatpump,all-year,all-week,late-peak,1.83050000000
-4,heat,R2,2050,1,2040,heatpump,all-year,all-week,late-peak,1.83050000000
-4,heat,R2,2050,2,2045,heatpump,all-year,all-week,late-peak,1.38400000000
-4,heat,R2,2050,5,2040,heatpump,all-year,all-week,late-peak,1.83050000000
-4,heat,R2,2050,6,2045,heatpump,all-year,all-week,late-peak,1.38400000000
-4,heat,R2,2055,2,2045,heatpump,all-year,all-week,late-peak,1.38400000000
-4,heat,R2,2055,3,2050,heatpump,all-year,all-week,late-peak,1.83050000000
-4,heat,R2,2055,6,2045,heatpump,all-year,all-week,late-peak,1.38400000000
-4,heat,R2,2055,7,2050,heatpump,all-year,all-week,late-peak,1.83050000000
-5,heat,R1,2050,1,2040,heatpump,all-year,all-week,evening,1.22060000000
-5,heat,R1,2050,2,2045,heatpump,all-year,all-week,evening,0.92290000000
-5,heat,R1,2050,5,2040,heatpump,all-year,all-week,evening,1.22060000000
-5,heat,R1,2050,6,2045,heatpump,all-year,all-week,evening,0.92290000000
-5,heat,R1,2055,2,2045,heatpump,all-year,all-week,evening,0.92290000000
-5,heat,R1,2055,3,2050,heatpump,all-year,all-week,evening,1.22060000000
-5,heat,R1,2055,6,2045,heatpump,all-year,all-week,evening,0.92290000000
-5,heat,R1,2055,7,2050,heatpump,all-year,all-week,evening,1.22060000000
-5,heat,R2,2050,1,2040,heatpump,all-year,all-week,evening,1.22060000000
-5,heat,R2,2050,2,2045,heatpump,all-year,all-week,evening,0.92290000000
-5,heat,R2,2050,5,2040,heatpump,all-year,all-week,evening,1.22060000000
-5,heat,R2,2050,6,2045,heatpump,all-year,all-week,evening,0.92290000000
-5,heat,R2,2055,2,2045,heatpump,all-year,all-week,evening,0.92290000000
-5,heat,R2,2055,3,2050,heatpump,all-year,all-week,evening,1.22060000000
-5,heat,R2,2055,6,2045,heatpump,all-year,all-week,evening,0.92290000000
-5,heat,R2,2055,7,2050,heatpump,all-year,all-week,evening,1.22060000000
-6,heat,R1,2050,1,2040,heatpump,all-year,all-week,early-morning,1.22060000000
-6,heat,R1,2050,2,2045,heatpump,all-year,all-week,early-morning,0.92290000000
-6,heat,R1,2050,5,2040,heatpump,all-year,all-week,early-morning,1.22060000000
-6,heat,R1,2050,6,2045,heatpump,all-year,all-week,early-morning,0.92290000000
-6,heat,R1,2055,2,2045,heatpump,all-year,all-week,early-morning,0.92290000000
-6,heat,R1,2055,3,2050,heatpump,all-year,all-week,early-morning,1.22060000000
-6,heat,R1,2055,6,2045,heatpump,all-year,all-week,early-morning,0.92290000000
-6,heat,R1,2055,7,2050,heatpump,all-year,all-week,early-morning,1.22060000000
-6,heat,R2,2050,1,2040,heatpump,all-year,all-week,early-morning,1.22060000000
-6,heat,R2,2050,2,2045,heatpump,all-year,all-week,early-morning,0.92290000000
-6,heat,R2,2050,5,2040,heatpump,all-year,all-week,early-morning,1.22060000000
-6,heat,R2,2050,6,2045,heatpump,all-year,all-week,early-morning,0.92290000000
-6,heat,R2,2055,2,2045,heatpump,all-year,all-week,early-morning,0.92290000000
-6,heat,R2,2055,3,2050,heatpump,all-year,all-week,early-morning,1.22060000000
-6,heat,R2,2055,6,2045,heatpump,all-year,all-week,early-morning,0.92290000000
-6,heat,R2,2055,7,2050,heatpump,all-year,all-week,early-morning,1.22060000000
-7,heat,R1,2050,1,2040,heatpump,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R1,2050,2,2045,heatpump,all-year,all-week,late-afternoon,0.92290000000
-7,heat,R1,2050,5,2040,heatpump,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R1,2050,6,2045,heatpump,all-year,all-week,late-afternoon,0.92290000000
-7,heat,R1,2055,2,2045,heatpump,all-year,all-week,late-afternoon,0.92290000000
-7,heat,R1,2055,3,2050,heatpump,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R1,2055,6,2045,heatpump,all-year,all-week,late-afternoon,0.92290000000
-7,heat,R1,2055,7,2050,heatpump,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R2,2050,1,2040,heatpump,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R2,2050,2,2045,heatpump,all-year,all-week,late-afternoon,0.92290000000
-7,heat,R2,2050,5,2040,heatpump,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R2,2050,6,2045,heatpump,all-year,all-week,late-afternoon,0.92290000000
-7,heat,R2,2055,2,2045,heatpump,all-year,all-week,late-afternoon,0.92290000000
-7,heat,R2,2055,3,2050,heatpump,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R2,2055,6,2045,heatpump,all-year,all-week,late-afternoon,0.92290000000
-7,heat,R2,2055,7,2050,heatpump,all-year,all-week,late-afternoon,1.22060000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2050,1,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R1,2050,2,all-year,all-week,night,heatpump,2045,0.46110000000
+0,heat,R1,2050,5,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R1,2050,6,all-year,all-week,night,heatpump,2045,0.46110000000
+0,heat,R1,2055,2,all-year,all-week,night,heatpump,2045,0.46110000000
+0,heat,R1,2055,3,all-year,all-week,night,heatpump,2050,0.60990000000
+0,heat,R1,2055,6,all-year,all-week,night,heatpump,2045,0.46110000000
+0,heat,R1,2055,7,all-year,all-week,night,heatpump,2050,0.60990000000
+0,heat,R2,2050,1,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R2,2050,2,all-year,all-week,night,heatpump,2045,0.46110000000
+0,heat,R2,2050,5,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R2,2050,6,all-year,all-week,night,heatpump,2045,0.46110000000
+0,heat,R2,2055,2,all-year,all-week,night,heatpump,2045,0.46110000000
+0,heat,R2,2055,3,all-year,all-week,night,heatpump,2050,0.60990000000
+0,heat,R2,2055,6,all-year,all-week,night,heatpump,2045,0.46110000000
+0,heat,R2,2055,7,all-year,all-week,night,heatpump,2050,0.60990000000
+1,heat,R1,2050,1,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R1,2050,2,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,heat,R1,2055,2,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,heat,R1,2055,3,all-year,all-week,morning,heatpump,2050,0.91480000000
+1,heat,R1,2055,6,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,heat,R1,2055,7,all-year,all-week,morning,heatpump,2050,0.91480000000
+1,heat,R2,2050,1,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R2,2050,2,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,heat,R2,2055,2,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,heat,R2,2055,3,all-year,all-week,morning,heatpump,2050,0.91480000000
+1,heat,R2,2055,6,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,heat,R2,2055,7,all-year,all-week,morning,heatpump,2050,0.91480000000
+2,heat,R1,2050,1,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R1,2050,2,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,heat,R1,2050,5,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R1,2050,6,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,heat,R1,2055,2,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,heat,R1,2055,3,all-year,all-week,mid-afternoon,heatpump,2050,0.60990000000
+2,heat,R1,2055,6,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,heat,R1,2055,7,all-year,all-week,mid-afternoon,heatpump,2050,0.60990000000
+2,heat,R2,2050,1,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R2,2050,2,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,heat,R2,2050,5,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R2,2050,6,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,heat,R2,2055,2,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,heat,R2,2055,3,all-year,all-week,mid-afternoon,heatpump,2050,0.60990000000
+2,heat,R2,2055,6,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,heat,R2,2055,7,all-year,all-week,mid-afternoon,heatpump,2050,0.60990000000
+3,heat,R1,2050,1,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R1,2050,2,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,heat,R1,2055,2,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,heat,R1,2055,3,all-year,all-week,early-peak,heatpump,2050,0.91480000000
+3,heat,R1,2055,6,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,heat,R1,2055,7,all-year,all-week,early-peak,heatpump,2050,0.91480000000
+3,heat,R2,2050,1,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R2,2050,2,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,heat,R2,2055,2,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,heat,R2,2055,3,all-year,all-week,early-peak,heatpump,2050,0.91480000000
+3,heat,R2,2055,6,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,heat,R2,2055,7,all-year,all-week,early-peak,heatpump,2050,0.91480000000
+4,heat,R1,2050,1,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R1,2050,2,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,heat,R1,2055,2,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,heat,R1,2055,3,all-year,all-week,late-peak,heatpump,2050,1.83050000000
+4,heat,R1,2055,6,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,heat,R1,2055,7,all-year,all-week,late-peak,heatpump,2050,1.83050000000
+4,heat,R2,2050,1,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R2,2050,2,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,heat,R2,2055,2,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,heat,R2,2055,3,all-year,all-week,late-peak,heatpump,2050,1.83050000000
+4,heat,R2,2055,6,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,heat,R2,2055,7,all-year,all-week,late-peak,heatpump,2050,1.83050000000
+5,heat,R1,2050,1,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R1,2050,2,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,heat,R1,2055,2,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,heat,R1,2055,3,all-year,all-week,evening,heatpump,2050,1.22060000000
+5,heat,R1,2055,6,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,heat,R1,2055,7,all-year,all-week,evening,heatpump,2050,1.22060000000
+5,heat,R2,2050,1,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R2,2050,2,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,heat,R2,2055,2,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,heat,R2,2055,3,all-year,all-week,evening,heatpump,2050,1.22060000000
+5,heat,R2,2055,6,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,heat,R2,2055,7,all-year,all-week,evening,heatpump,2050,1.22060000000
+6,heat,R1,2050,1,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R1,2050,2,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,heat,R1,2050,5,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R1,2050,6,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,heat,R1,2055,2,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,heat,R1,2055,3,all-year,all-week,early-morning,heatpump,2050,1.22060000000
+6,heat,R1,2055,6,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,heat,R1,2055,7,all-year,all-week,early-morning,heatpump,2050,1.22060000000
+6,heat,R2,2050,1,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R2,2050,2,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,heat,R2,2050,5,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R2,2050,6,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,heat,R2,2055,2,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,heat,R2,2055,3,all-year,all-week,early-morning,heatpump,2050,1.22060000000
+6,heat,R2,2055,6,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,heat,R2,2055,7,all-year,all-week,early-morning,heatpump,2050,1.22060000000
+7,heat,R1,2050,1,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R1,2050,2,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,heat,R1,2050,5,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R1,2050,6,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,heat,R1,2055,2,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,heat,R1,2055,3,all-year,all-week,late-afternoon,heatpump,2050,1.22060000000
+7,heat,R1,2055,6,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,heat,R1,2055,7,all-year,all-week,late-afternoon,heatpump,2050,1.22060000000
+7,heat,R2,2050,1,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R2,2050,2,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,heat,R2,2050,5,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R2,2050,6,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,heat,R2,2055,2,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,heat,R2,2055,3,all-year,all-week,late-afternoon,heatpump,2050,1.22060000000
+7,heat,R2,2055,6,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,heat,R2,2055,7,all-year,all-week,late-afternoon,heatpump,2050,1.22060000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2020.csv
index 29ae58ec6..e8d6cefe6 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2020.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2020.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gassupply1,15.00000000000
-0,2022,R1,2020,gassupply1,15.00000000000
-0,2025,R1,2020,gassupply1,15.00000000000
-0,2030,R1,2020,gassupply1,7.50000000000
-1,2020,R2,2020,gassupply1,15.00000000000
-1,2022,R2,2020,gassupply1,15.00000000000
-1,2025,R2,2020,gassupply1,15.00000000000
-1,2030,R2,2020,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2022,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2020,R2,gassupply1,2020,15.00000000000
+1,2022,R2,gassupply1,2020,15.00000000000
+1,2025,R2,gassupply1,2020,15.00000000000
+1,2030,R2,gassupply1,2020,7.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2022.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2022.csv
index 0eb22015c..2c4700cb8 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2022.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2022.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-0,2022,R1,2020,gassupply1,15.00000000000
-0,2024,R1,2020,gassupply1,15.00000000000
-0,2025,R1,2020,gassupply1,15.00000000000
-0,2030,R1,2020,gassupply1,7.50000000000
-1,2022,R2,2020,gassupply1,15.00000000000
-1,2024,R2,2020,gassupply1,15.00000000000
-1,2025,R2,2020,gassupply1,15.00000000000
-1,2030,R2,2020,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+0,2022,R1,gassupply1,2020,15.00000000000
+0,2024,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2022,R2,gassupply1,2020,15.00000000000
+1,2024,R2,gassupply1,2020,15.00000000000
+1,2025,R2,gassupply1,2020,15.00000000000
+1,2030,R2,gassupply1,2020,7.50000000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2026.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2026.csv
index 4f1725561..525b44105 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2026.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2026.csv
@@ -1,41 +1,41 @@
-asset,year,region,installed,technology,capacity
-0,2026,R1,2020,gassupply1,7.50000000000
-0,2028,R1,2020,gassupply1,7.50000000000
-0,2030,R1,2020,gassupply1,7.50000000000
-1,2026,R1,2024,gassupply1,2.18500000000
-1,2028,R1,2024,gassupply1,2.18500000000
-1,2030,R1,2024,gassupply1,2.18500000000
-1,2035,R1,2024,gassupply1,2.18500000000
-1,2040,R1,2024,gassupply1,2.18500000000
-1,2045,R1,2024,gassupply1,2.18500000000
-1,2050,R1,2024,gassupply1,2.18500000000
-1,2060,R1,2024,gassupply1,2.18500000000
-2,2028,R1,2026,gassupply1,1.69660000000
-2,2030,R1,2026,gassupply1,1.69660000000
-2,2035,R1,2026,gassupply1,1.69660000000
-2,2040,R1,2026,gassupply1,1.69660000000
-2,2045,R1,2026,gassupply1,1.69660000000
-2,2050,R1,2026,gassupply1,1.69660000000
-2,2060,R1,2026,gassupply1,1.69660000000
-2,2061,R1,2026,gassupply1,1.69660000000
-2,2062,R1,2026,gassupply1,1.69660000000
-3,2026,R2,2020,gassupply1,7.50000000000
-3,2028,R2,2020,gassupply1,7.50000000000
-3,2030,R2,2020,gassupply1,7.50000000000
-4,2026,R2,2024,gassupply1,2.18500000000
-4,2028,R2,2024,gassupply1,2.18500000000
-4,2030,R2,2024,gassupply1,2.18500000000
-4,2035,R2,2024,gassupply1,2.18500000000
-4,2040,R2,2024,gassupply1,2.18500000000
-4,2045,R2,2024,gassupply1,2.18500000000
-4,2050,R2,2024,gassupply1,2.18500000000
-4,2060,R2,2024,gassupply1,2.18500000000
-5,2028,R2,2026,gassupply1,1.69660000000
-5,2030,R2,2026,gassupply1,1.69660000000
-5,2035,R2,2026,gassupply1,1.69660000000
-5,2040,R2,2026,gassupply1,1.69660000000
-5,2045,R2,2026,gassupply1,1.69660000000
-5,2050,R2,2026,gassupply1,1.69660000000
-5,2060,R2,2026,gassupply1,1.69660000000
-5,2061,R2,2026,gassupply1,1.69660000000
-5,2062,R2,2026,gassupply1,1.69660000000
+asset,year,region,technology,installed,capacity
+0,2026,R1,gassupply1,2020,7.50000000000
+0,2028,R1,gassupply1,2020,7.50000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2026,R1,gassupply1,2024,2.18500000000
+1,2028,R1,gassupply1,2024,2.18500000000
+1,2030,R1,gassupply1,2024,2.18500000000
+1,2035,R1,gassupply1,2024,2.18500000000
+1,2040,R1,gassupply1,2024,2.18500000000
+1,2045,R1,gassupply1,2024,2.18500000000
+1,2050,R1,gassupply1,2024,2.18500000000
+1,2060,R1,gassupply1,2024,2.18500000000
+2,2028,R1,gassupply1,2026,1.69660000000
+2,2030,R1,gassupply1,2026,1.69660000000
+2,2035,R1,gassupply1,2026,1.69660000000
+2,2040,R1,gassupply1,2026,1.69660000000
+2,2045,R1,gassupply1,2026,1.69660000000
+2,2050,R1,gassupply1,2026,1.69660000000
+2,2060,R1,gassupply1,2026,1.69660000000
+2,2061,R1,gassupply1,2026,1.69660000000
+2,2062,R1,gassupply1,2026,1.69660000000
+3,2026,R2,gassupply1,2020,7.50000000000
+3,2028,R2,gassupply1,2020,7.50000000000
+3,2030,R2,gassupply1,2020,7.50000000000
+4,2026,R2,gassupply1,2024,2.18500000000
+4,2028,R2,gassupply1,2024,2.18500000000
+4,2030,R2,gassupply1,2024,2.18500000000
+4,2035,R2,gassupply1,2024,2.18500000000
+4,2040,R2,gassupply1,2024,2.18500000000
+4,2045,R2,gassupply1,2024,2.18500000000
+4,2050,R2,gassupply1,2024,2.18500000000
+4,2060,R2,gassupply1,2024,2.18500000000
+5,2028,R2,gassupply1,2026,1.69660000000
+5,2030,R2,gassupply1,2026,1.69660000000
+5,2035,R2,gassupply1,2026,1.69660000000
+5,2040,R2,gassupply1,2026,1.69660000000
+5,2045,R2,gassupply1,2026,1.69660000000
+5,2050,R2,gassupply1,2026,1.69660000000
+5,2060,R2,gassupply1,2026,1.69660000000
+5,2061,R2,gassupply1,2026,1.69660000000
+5,2062,R2,gassupply1,2026,1.69660000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2028.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2028.csv
index 67c69d2cd..06275547f 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2028.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2028.csv
@@ -1,57 +1,57 @@
-asset,year,region,installed,technology,capacity
-0,2028,R1,2020,gassupply1,7.50000000000
-0,2030,R1,2020,gassupply1,7.50000000000
-1,2028,R1,2024,gassupply1,2.18500000000
-1,2030,R1,2024,gassupply1,2.18500000000
-1,2035,R1,2024,gassupply1,2.18500000000
-1,2040,R1,2024,gassupply1,2.18500000000
-1,2045,R1,2024,gassupply1,2.18500000000
-1,2050,R1,2024,gassupply1,2.18500000000
-1,2060,R1,2024,gassupply1,2.18500000000
-2,2028,R1,2026,gassupply1,1.69660000000
-2,2030,R1,2026,gassupply1,1.69660000000
-2,2035,R1,2026,gassupply1,1.69660000000
-2,2040,R1,2026,gassupply1,1.69660000000
-2,2045,R1,2026,gassupply1,1.69660000000
-2,2050,R1,2026,gassupply1,1.69660000000
-2,2060,R1,2026,gassupply1,1.69660000000
-2,2061,R1,2026,gassupply1,1.69660000000
-2,2062,R1,2026,gassupply1,1.69660000000
-3,2030,R1,2028,gassupply1,1.69660000000
-3,2035,R1,2028,gassupply1,1.69660000000
-3,2040,R1,2028,gassupply1,1.69660000000
-3,2045,R1,2028,gassupply1,1.69660000000
-3,2050,R1,2028,gassupply1,1.69660000000
-3,2060,R1,2028,gassupply1,1.69660000000
-3,2061,R1,2028,gassupply1,1.69660000000
-3,2062,R1,2028,gassupply1,1.69660000000
-3,2063,R1,2028,gassupply1,1.69660000000
-3,2064,R1,2028,gassupply1,1.69660000000
-4,2028,R2,2020,gassupply1,7.50000000000
-4,2030,R2,2020,gassupply1,7.50000000000
-5,2028,R2,2024,gassupply1,2.18500000000
-5,2030,R2,2024,gassupply1,2.18500000000
-5,2035,R2,2024,gassupply1,2.18500000000
-5,2040,R2,2024,gassupply1,2.18500000000
-5,2045,R2,2024,gassupply1,2.18500000000
-5,2050,R2,2024,gassupply1,2.18500000000
-5,2060,R2,2024,gassupply1,2.18500000000
-6,2028,R2,2026,gassupply1,1.69660000000
-6,2030,R2,2026,gassupply1,1.69660000000
-6,2035,R2,2026,gassupply1,1.69660000000
-6,2040,R2,2026,gassupply1,1.69660000000
-6,2045,R2,2026,gassupply1,1.69660000000
-6,2050,R2,2026,gassupply1,1.69660000000
-6,2060,R2,2026,gassupply1,1.69660000000
-6,2061,R2,2026,gassupply1,1.69660000000
-6,2062,R2,2026,gassupply1,1.69660000000
-7,2030,R2,2028,gassupply1,1.69660000000
-7,2035,R2,2028,gassupply1,1.69660000000
-7,2040,R2,2028,gassupply1,1.69660000000
-7,2045,R2,2028,gassupply1,1.69660000000
-7,2050,R2,2028,gassupply1,1.69660000000
-7,2060,R2,2028,gassupply1,1.69660000000
-7,2061,R2,2028,gassupply1,1.69660000000
-7,2062,R2,2028,gassupply1,1.69660000000
-7,2063,R2,2028,gassupply1,1.69660000000
-7,2064,R2,2028,gassupply1,1.69660000000
+asset,year,region,technology,installed,capacity
+0,2028,R1,gassupply1,2020,7.50000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2028,R1,gassupply1,2024,2.18500000000
+1,2030,R1,gassupply1,2024,2.18500000000
+1,2035,R1,gassupply1,2024,2.18500000000
+1,2040,R1,gassupply1,2024,2.18500000000
+1,2045,R1,gassupply1,2024,2.18500000000
+1,2050,R1,gassupply1,2024,2.18500000000
+1,2060,R1,gassupply1,2024,2.18500000000
+2,2028,R1,gassupply1,2026,1.69660000000
+2,2030,R1,gassupply1,2026,1.69660000000
+2,2035,R1,gassupply1,2026,1.69660000000
+2,2040,R1,gassupply1,2026,1.69660000000
+2,2045,R1,gassupply1,2026,1.69660000000
+2,2050,R1,gassupply1,2026,1.69660000000
+2,2060,R1,gassupply1,2026,1.69660000000
+2,2061,R1,gassupply1,2026,1.69660000000
+2,2062,R1,gassupply1,2026,1.69660000000
+3,2030,R1,gassupply1,2028,1.69660000000
+3,2035,R1,gassupply1,2028,1.69660000000
+3,2040,R1,gassupply1,2028,1.69660000000
+3,2045,R1,gassupply1,2028,1.69660000000
+3,2050,R1,gassupply1,2028,1.69660000000
+3,2060,R1,gassupply1,2028,1.69660000000
+3,2061,R1,gassupply1,2028,1.69660000000
+3,2062,R1,gassupply1,2028,1.69660000000
+3,2063,R1,gassupply1,2028,1.69660000000
+3,2064,R1,gassupply1,2028,1.69660000000
+4,2028,R2,gassupply1,2020,7.50000000000
+4,2030,R2,gassupply1,2020,7.50000000000
+5,2028,R2,gassupply1,2024,2.18500000000
+5,2030,R2,gassupply1,2024,2.18500000000
+5,2035,R2,gassupply1,2024,2.18500000000
+5,2040,R2,gassupply1,2024,2.18500000000
+5,2045,R2,gassupply1,2024,2.18500000000
+5,2050,R2,gassupply1,2024,2.18500000000
+5,2060,R2,gassupply1,2024,2.18500000000
+6,2028,R2,gassupply1,2026,1.69660000000
+6,2030,R2,gassupply1,2026,1.69660000000
+6,2035,R2,gassupply1,2026,1.69660000000
+6,2040,R2,gassupply1,2026,1.69660000000
+6,2045,R2,gassupply1,2026,1.69660000000
+6,2050,R2,gassupply1,2026,1.69660000000
+6,2060,R2,gassupply1,2026,1.69660000000
+6,2061,R2,gassupply1,2026,1.69660000000
+6,2062,R2,gassupply1,2026,1.69660000000
+7,2030,R2,gassupply1,2028,1.69660000000
+7,2035,R2,gassupply1,2028,1.69660000000
+7,2040,R2,gassupply1,2028,1.69660000000
+7,2045,R2,gassupply1,2028,1.69660000000
+7,2050,R2,gassupply1,2028,1.69660000000
+7,2060,R2,gassupply1,2028,1.69660000000
+7,2061,R2,gassupply1,2028,1.69660000000
+7,2062,R2,gassupply1,2028,1.69660000000
+7,2063,R2,gassupply1,2028,1.69660000000
+7,2064,R2,gassupply1,2028,1.69660000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2032.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2032.csv
index b40fbda2c..c3985ac44 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2032.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2032.csv
@@ -1,81 +1,81 @@
-asset,year,region,installed,technology,capacity
-1,2032,R1,2024,gassupply1,2.18500000000
-1,2034,R1,2024,gassupply1,2.18500000000
-1,2035,R1,2024,gassupply1,2.18500000000
-1,2040,R1,2024,gassupply1,2.18500000000
-1,2045,R1,2024,gassupply1,2.18500000000
-1,2050,R1,2024,gassupply1,2.18500000000
-1,2060,R1,2024,gassupply1,2.18500000000
-2,2032,R1,2026,gassupply1,1.69660000000
-2,2034,R1,2026,gassupply1,1.69660000000
-2,2035,R1,2026,gassupply1,1.69660000000
-2,2040,R1,2026,gassupply1,1.69660000000
-2,2045,R1,2026,gassupply1,1.69660000000
-2,2050,R1,2026,gassupply1,1.69660000000
-2,2060,R1,2026,gassupply1,1.69660000000
-2,2061,R1,2026,gassupply1,1.69660000000
-2,2062,R1,2026,gassupply1,1.69660000000
-3,2032,R1,2028,gassupply1,1.69660000000
-3,2034,R1,2028,gassupply1,1.69660000000
-3,2035,R1,2028,gassupply1,1.69660000000
-3,2040,R1,2028,gassupply1,1.69660000000
-3,2045,R1,2028,gassupply1,1.69660000000
-3,2050,R1,2028,gassupply1,1.69660000000
-3,2060,R1,2028,gassupply1,1.69660000000
-3,2061,R1,2028,gassupply1,1.69660000000
-3,2062,R1,2028,gassupply1,1.69660000000
-3,2063,R1,2028,gassupply1,1.69660000000
-3,2064,R1,2028,gassupply1,1.69660000000
-4,2032,R1,2030,gassupply1,9.19660000000
-4,2034,R1,2030,gassupply1,9.19660000000
-4,2035,R1,2030,gassupply1,9.19660000000
-4,2040,R1,2030,gassupply1,9.19660000000
-4,2045,R1,2030,gassupply1,9.19660000000
-4,2050,R1,2030,gassupply1,9.19660000000
-4,2060,R1,2030,gassupply1,9.19660000000
-4,2061,R1,2030,gassupply1,9.19660000000
-4,2062,R1,2030,gassupply1,9.19660000000
-4,2063,R1,2030,gassupply1,9.19660000000
-4,2064,R1,2030,gassupply1,9.19660000000
-4,2065,R1,2030,gassupply1,9.19660000000
-4,2066,R1,2030,gassupply1,9.19660000000
-6,2032,R2,2024,gassupply1,2.18500000000
-6,2034,R2,2024,gassupply1,2.18500000000
-6,2035,R2,2024,gassupply1,2.18500000000
-6,2040,R2,2024,gassupply1,2.18500000000
-6,2045,R2,2024,gassupply1,2.18500000000
-6,2050,R2,2024,gassupply1,2.18500000000
-6,2060,R2,2024,gassupply1,2.18500000000
-7,2032,R2,2026,gassupply1,1.69660000000
-7,2034,R2,2026,gassupply1,1.69660000000
-7,2035,R2,2026,gassupply1,1.69660000000
-7,2040,R2,2026,gassupply1,1.69660000000
-7,2045,R2,2026,gassupply1,1.69660000000
-7,2050,R2,2026,gassupply1,1.69660000000
-7,2060,R2,2026,gassupply1,1.69660000000
-7,2061,R2,2026,gassupply1,1.69660000000
-7,2062,R2,2026,gassupply1,1.69660000000
-8,2032,R2,2028,gassupply1,1.69660000000
-8,2034,R2,2028,gassupply1,1.69660000000
-8,2035,R2,2028,gassupply1,1.69660000000
-8,2040,R2,2028,gassupply1,1.69660000000
-8,2045,R2,2028,gassupply1,1.69660000000
-8,2050,R2,2028,gassupply1,1.69660000000
-8,2060,R2,2028,gassupply1,1.69660000000
-8,2061,R2,2028,gassupply1,1.69660000000
-8,2062,R2,2028,gassupply1,1.69660000000
-8,2063,R2,2028,gassupply1,1.69660000000
-8,2064,R2,2028,gassupply1,1.69660000000
-9,2032,R2,2030,gassupply1,9.19660000000
-9,2034,R2,2030,gassupply1,9.19660000000
-9,2035,R2,2030,gassupply1,9.19660000000
-9,2040,R2,2030,gassupply1,9.19660000000
-9,2045,R2,2030,gassupply1,9.19660000000
-9,2050,R2,2030,gassupply1,9.19660000000
-9,2060,R2,2030,gassupply1,9.19660000000
-9,2061,R2,2030,gassupply1,9.19660000000
-9,2062,R2,2030,gassupply1,9.19660000000
-9,2063,R2,2030,gassupply1,9.19660000000
-9,2064,R2,2030,gassupply1,9.19660000000
-9,2065,R2,2030,gassupply1,9.19660000000
-9,2066,R2,2030,gassupply1,9.19660000000
+asset,year,region,technology,installed,capacity
+1,2032,R1,gassupply1,2024,2.18500000000
+1,2034,R1,gassupply1,2024,2.18500000000
+1,2035,R1,gassupply1,2024,2.18500000000
+1,2040,R1,gassupply1,2024,2.18500000000
+1,2045,R1,gassupply1,2024,2.18500000000
+1,2050,R1,gassupply1,2024,2.18500000000
+1,2060,R1,gassupply1,2024,2.18500000000
+2,2032,R1,gassupply1,2026,1.69660000000
+2,2034,R1,gassupply1,2026,1.69660000000
+2,2035,R1,gassupply1,2026,1.69660000000
+2,2040,R1,gassupply1,2026,1.69660000000
+2,2045,R1,gassupply1,2026,1.69660000000
+2,2050,R1,gassupply1,2026,1.69660000000
+2,2060,R1,gassupply1,2026,1.69660000000
+2,2061,R1,gassupply1,2026,1.69660000000
+2,2062,R1,gassupply1,2026,1.69660000000
+3,2032,R1,gassupply1,2028,1.69660000000
+3,2034,R1,gassupply1,2028,1.69660000000
+3,2035,R1,gassupply1,2028,1.69660000000
+3,2040,R1,gassupply1,2028,1.69660000000
+3,2045,R1,gassupply1,2028,1.69660000000
+3,2050,R1,gassupply1,2028,1.69660000000
+3,2060,R1,gassupply1,2028,1.69660000000
+3,2061,R1,gassupply1,2028,1.69660000000
+3,2062,R1,gassupply1,2028,1.69660000000
+3,2063,R1,gassupply1,2028,1.69660000000
+3,2064,R1,gassupply1,2028,1.69660000000
+4,2032,R1,gassupply1,2030,9.19660000000
+4,2034,R1,gassupply1,2030,9.19660000000
+4,2035,R1,gassupply1,2030,9.19660000000
+4,2040,R1,gassupply1,2030,9.19660000000
+4,2045,R1,gassupply1,2030,9.19660000000
+4,2050,R1,gassupply1,2030,9.19660000000
+4,2060,R1,gassupply1,2030,9.19660000000
+4,2061,R1,gassupply1,2030,9.19660000000
+4,2062,R1,gassupply1,2030,9.19660000000
+4,2063,R1,gassupply1,2030,9.19660000000
+4,2064,R1,gassupply1,2030,9.19660000000
+4,2065,R1,gassupply1,2030,9.19660000000
+4,2066,R1,gassupply1,2030,9.19660000000
+6,2032,R2,gassupply1,2024,2.18500000000
+6,2034,R2,gassupply1,2024,2.18500000000
+6,2035,R2,gassupply1,2024,2.18500000000
+6,2040,R2,gassupply1,2024,2.18500000000
+6,2045,R2,gassupply1,2024,2.18500000000
+6,2050,R2,gassupply1,2024,2.18500000000
+6,2060,R2,gassupply1,2024,2.18500000000
+7,2032,R2,gassupply1,2026,1.69660000000
+7,2034,R2,gassupply1,2026,1.69660000000
+7,2035,R2,gassupply1,2026,1.69660000000
+7,2040,R2,gassupply1,2026,1.69660000000
+7,2045,R2,gassupply1,2026,1.69660000000
+7,2050,R2,gassupply1,2026,1.69660000000
+7,2060,R2,gassupply1,2026,1.69660000000
+7,2061,R2,gassupply1,2026,1.69660000000
+7,2062,R2,gassupply1,2026,1.69660000000
+8,2032,R2,gassupply1,2028,1.69660000000
+8,2034,R2,gassupply1,2028,1.69660000000
+8,2035,R2,gassupply1,2028,1.69660000000
+8,2040,R2,gassupply1,2028,1.69660000000
+8,2045,R2,gassupply1,2028,1.69660000000
+8,2050,R2,gassupply1,2028,1.69660000000
+8,2060,R2,gassupply1,2028,1.69660000000
+8,2061,R2,gassupply1,2028,1.69660000000
+8,2062,R2,gassupply1,2028,1.69660000000
+8,2063,R2,gassupply1,2028,1.69660000000
+8,2064,R2,gassupply1,2028,1.69660000000
+9,2032,R2,gassupply1,2030,9.19660000000
+9,2034,R2,gassupply1,2030,9.19660000000
+9,2035,R2,gassupply1,2030,9.19660000000
+9,2040,R2,gassupply1,2030,9.19660000000
+9,2045,R2,gassupply1,2030,9.19660000000
+9,2050,R2,gassupply1,2030,9.19660000000
+9,2060,R2,gassupply1,2030,9.19660000000
+9,2061,R2,gassupply1,2030,9.19660000000
+9,2062,R2,gassupply1,2030,9.19660000000
+9,2063,R2,gassupply1,2030,9.19660000000
+9,2064,R2,gassupply1,2030,9.19660000000
+9,2065,R2,gassupply1,2030,9.19660000000
+9,2066,R2,gassupply1,2030,9.19660000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2034.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2034.csv
index 049973023..50fdb27ef 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2034.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2034.csv
@@ -1,81 +1,81 @@
-asset,year,region,installed,technology,capacity
-1,2034,R1,2024,gassupply1,2.18500000000
-1,2035,R1,2024,gassupply1,2.18500000000
-1,2036,R1,2024,gassupply1,2.18500000000
-1,2040,R1,2024,gassupply1,2.18500000000
-1,2045,R1,2024,gassupply1,2.18500000000
-1,2050,R1,2024,gassupply1,2.18500000000
-1,2060,R1,2024,gassupply1,2.18500000000
-2,2034,R1,2026,gassupply1,1.69660000000
-2,2035,R1,2026,gassupply1,1.69660000000
-2,2036,R1,2026,gassupply1,1.69660000000
-2,2040,R1,2026,gassupply1,1.69660000000
-2,2045,R1,2026,gassupply1,1.69660000000
-2,2050,R1,2026,gassupply1,1.69660000000
-2,2060,R1,2026,gassupply1,1.69660000000
-2,2061,R1,2026,gassupply1,1.69660000000
-2,2062,R1,2026,gassupply1,1.69660000000
-3,2034,R1,2028,gassupply1,1.69660000000
-3,2035,R1,2028,gassupply1,1.69660000000
-3,2036,R1,2028,gassupply1,1.69660000000
-3,2040,R1,2028,gassupply1,1.69660000000
-3,2045,R1,2028,gassupply1,1.69660000000
-3,2050,R1,2028,gassupply1,1.69660000000
-3,2060,R1,2028,gassupply1,1.69660000000
-3,2061,R1,2028,gassupply1,1.69660000000
-3,2062,R1,2028,gassupply1,1.69660000000
-3,2063,R1,2028,gassupply1,1.69660000000
-3,2064,R1,2028,gassupply1,1.69660000000
-4,2034,R1,2030,gassupply1,9.19660000000
-4,2035,R1,2030,gassupply1,9.19660000000
-4,2036,R1,2030,gassupply1,9.19660000000
-4,2040,R1,2030,gassupply1,9.19660000000
-4,2045,R1,2030,gassupply1,9.19660000000
-4,2050,R1,2030,gassupply1,9.19660000000
-4,2060,R1,2030,gassupply1,9.19660000000
-4,2061,R1,2030,gassupply1,9.19660000000
-4,2062,R1,2030,gassupply1,9.19660000000
-4,2063,R1,2030,gassupply1,9.19660000000
-4,2064,R1,2030,gassupply1,9.19660000000
-4,2065,R1,2030,gassupply1,9.19660000000
-4,2066,R1,2030,gassupply1,9.19660000000
-6,2034,R2,2024,gassupply1,2.18500000000
-6,2035,R2,2024,gassupply1,2.18500000000
-6,2036,R2,2024,gassupply1,2.18500000000
-6,2040,R2,2024,gassupply1,2.18500000000
-6,2045,R2,2024,gassupply1,2.18500000000
-6,2050,R2,2024,gassupply1,2.18500000000
-6,2060,R2,2024,gassupply1,2.18500000000
-7,2034,R2,2026,gassupply1,1.69660000000
-7,2035,R2,2026,gassupply1,1.69660000000
-7,2036,R2,2026,gassupply1,1.69660000000
-7,2040,R2,2026,gassupply1,1.69660000000
-7,2045,R2,2026,gassupply1,1.69660000000
-7,2050,R2,2026,gassupply1,1.69660000000
-7,2060,R2,2026,gassupply1,1.69660000000
-7,2061,R2,2026,gassupply1,1.69660000000
-7,2062,R2,2026,gassupply1,1.69660000000
-8,2034,R2,2028,gassupply1,1.69660000000
-8,2035,R2,2028,gassupply1,1.69660000000
-8,2036,R2,2028,gassupply1,1.69660000000
-8,2040,R2,2028,gassupply1,1.69660000000
-8,2045,R2,2028,gassupply1,1.69660000000
-8,2050,R2,2028,gassupply1,1.69660000000
-8,2060,R2,2028,gassupply1,1.69660000000
-8,2061,R2,2028,gassupply1,1.69660000000
-8,2062,R2,2028,gassupply1,1.69660000000
-8,2063,R2,2028,gassupply1,1.69660000000
-8,2064,R2,2028,gassupply1,1.69660000000
-9,2034,R2,2030,gassupply1,9.19660000000
-9,2035,R2,2030,gassupply1,9.19660000000
-9,2036,R2,2030,gassupply1,9.19660000000
-9,2040,R2,2030,gassupply1,9.19660000000
-9,2045,R2,2030,gassupply1,9.19660000000
-9,2050,R2,2030,gassupply1,9.19660000000
-9,2060,R2,2030,gassupply1,9.19660000000
-9,2061,R2,2030,gassupply1,9.19660000000
-9,2062,R2,2030,gassupply1,9.19660000000
-9,2063,R2,2030,gassupply1,9.19660000000
-9,2064,R2,2030,gassupply1,9.19660000000
-9,2065,R2,2030,gassupply1,9.19660000000
-9,2066,R2,2030,gassupply1,9.19660000000
+asset,year,region,technology,installed,capacity
+1,2034,R1,gassupply1,2024,2.18500000000
+1,2035,R1,gassupply1,2024,2.18500000000
+1,2036,R1,gassupply1,2024,2.18500000000
+1,2040,R1,gassupply1,2024,2.18500000000
+1,2045,R1,gassupply1,2024,2.18500000000
+1,2050,R1,gassupply1,2024,2.18500000000
+1,2060,R1,gassupply1,2024,2.18500000000
+2,2034,R1,gassupply1,2026,1.69660000000
+2,2035,R1,gassupply1,2026,1.69660000000
+2,2036,R1,gassupply1,2026,1.69660000000
+2,2040,R1,gassupply1,2026,1.69660000000
+2,2045,R1,gassupply1,2026,1.69660000000
+2,2050,R1,gassupply1,2026,1.69660000000
+2,2060,R1,gassupply1,2026,1.69660000000
+2,2061,R1,gassupply1,2026,1.69660000000
+2,2062,R1,gassupply1,2026,1.69660000000
+3,2034,R1,gassupply1,2028,1.69660000000
+3,2035,R1,gassupply1,2028,1.69660000000
+3,2036,R1,gassupply1,2028,1.69660000000
+3,2040,R1,gassupply1,2028,1.69660000000
+3,2045,R1,gassupply1,2028,1.69660000000
+3,2050,R1,gassupply1,2028,1.69660000000
+3,2060,R1,gassupply1,2028,1.69660000000
+3,2061,R1,gassupply1,2028,1.69660000000
+3,2062,R1,gassupply1,2028,1.69660000000
+3,2063,R1,gassupply1,2028,1.69660000000
+3,2064,R1,gassupply1,2028,1.69660000000
+4,2034,R1,gassupply1,2030,9.19660000000
+4,2035,R1,gassupply1,2030,9.19660000000
+4,2036,R1,gassupply1,2030,9.19660000000
+4,2040,R1,gassupply1,2030,9.19660000000
+4,2045,R1,gassupply1,2030,9.19660000000
+4,2050,R1,gassupply1,2030,9.19660000000
+4,2060,R1,gassupply1,2030,9.19660000000
+4,2061,R1,gassupply1,2030,9.19660000000
+4,2062,R1,gassupply1,2030,9.19660000000
+4,2063,R1,gassupply1,2030,9.19660000000
+4,2064,R1,gassupply1,2030,9.19660000000
+4,2065,R1,gassupply1,2030,9.19660000000
+4,2066,R1,gassupply1,2030,9.19660000000
+6,2034,R2,gassupply1,2024,2.18500000000
+6,2035,R2,gassupply1,2024,2.18500000000
+6,2036,R2,gassupply1,2024,2.18500000000
+6,2040,R2,gassupply1,2024,2.18500000000
+6,2045,R2,gassupply1,2024,2.18500000000
+6,2050,R2,gassupply1,2024,2.18500000000
+6,2060,R2,gassupply1,2024,2.18500000000
+7,2034,R2,gassupply1,2026,1.69660000000
+7,2035,R2,gassupply1,2026,1.69660000000
+7,2036,R2,gassupply1,2026,1.69660000000
+7,2040,R2,gassupply1,2026,1.69660000000
+7,2045,R2,gassupply1,2026,1.69660000000
+7,2050,R2,gassupply1,2026,1.69660000000
+7,2060,R2,gassupply1,2026,1.69660000000
+7,2061,R2,gassupply1,2026,1.69660000000
+7,2062,R2,gassupply1,2026,1.69660000000
+8,2034,R2,gassupply1,2028,1.69660000000
+8,2035,R2,gassupply1,2028,1.69660000000
+8,2036,R2,gassupply1,2028,1.69660000000
+8,2040,R2,gassupply1,2028,1.69660000000
+8,2045,R2,gassupply1,2028,1.69660000000
+8,2050,R2,gassupply1,2028,1.69660000000
+8,2060,R2,gassupply1,2028,1.69660000000
+8,2061,R2,gassupply1,2028,1.69660000000
+8,2062,R2,gassupply1,2028,1.69660000000
+8,2063,R2,gassupply1,2028,1.69660000000
+8,2064,R2,gassupply1,2028,1.69660000000
+9,2034,R2,gassupply1,2030,9.19660000000
+9,2035,R2,gassupply1,2030,9.19660000000
+9,2036,R2,gassupply1,2030,9.19660000000
+9,2040,R2,gassupply1,2030,9.19660000000
+9,2045,R2,gassupply1,2030,9.19660000000
+9,2050,R2,gassupply1,2030,9.19660000000
+9,2060,R2,gassupply1,2030,9.19660000000
+9,2061,R2,gassupply1,2030,9.19660000000
+9,2062,R2,gassupply1,2030,9.19660000000
+9,2063,R2,gassupply1,2030,9.19660000000
+9,2064,R2,gassupply1,2030,9.19660000000
+9,2065,R2,gassupply1,2030,9.19660000000
+9,2066,R2,gassupply1,2030,9.19660000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2036.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2036.csv
index 72aa33a61..47f0665cf 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2036.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2036.csv
@@ -1,73 +1,73 @@
-asset,year,region,installed,technology,capacity
-1,2036,R1,2024,gassupply1,2.18500000000
-1,2038,R1,2024,gassupply1,2.18500000000
-1,2040,R1,2024,gassupply1,2.18500000000
-1,2045,R1,2024,gassupply1,2.18500000000
-1,2050,R1,2024,gassupply1,2.18500000000
-1,2060,R1,2024,gassupply1,2.18500000000
-2,2036,R1,2026,gassupply1,1.69660000000
-2,2038,R1,2026,gassupply1,1.69660000000
-2,2040,R1,2026,gassupply1,1.69660000000
-2,2045,R1,2026,gassupply1,1.69660000000
-2,2050,R1,2026,gassupply1,1.69660000000
-2,2060,R1,2026,gassupply1,1.69660000000
-2,2061,R1,2026,gassupply1,1.69660000000
-2,2062,R1,2026,gassupply1,1.69660000000
-3,2036,R1,2028,gassupply1,1.69660000000
-3,2038,R1,2028,gassupply1,1.69660000000
-3,2040,R1,2028,gassupply1,1.69660000000
-3,2045,R1,2028,gassupply1,1.69660000000
-3,2050,R1,2028,gassupply1,1.69660000000
-3,2060,R1,2028,gassupply1,1.69660000000
-3,2061,R1,2028,gassupply1,1.69660000000
-3,2062,R1,2028,gassupply1,1.69660000000
-3,2063,R1,2028,gassupply1,1.69660000000
-3,2064,R1,2028,gassupply1,1.69660000000
-4,2036,R1,2030,gassupply1,9.19660000000
-4,2038,R1,2030,gassupply1,9.19660000000
-4,2040,R1,2030,gassupply1,9.19660000000
-4,2045,R1,2030,gassupply1,9.19660000000
-4,2050,R1,2030,gassupply1,9.19660000000
-4,2060,R1,2030,gassupply1,9.19660000000
-4,2061,R1,2030,gassupply1,9.19660000000
-4,2062,R1,2030,gassupply1,9.19660000000
-4,2063,R1,2030,gassupply1,9.19660000000
-4,2064,R1,2030,gassupply1,9.19660000000
-4,2065,R1,2030,gassupply1,9.19660000000
-4,2066,R1,2030,gassupply1,9.19660000000
-6,2036,R2,2024,gassupply1,2.18500000000
-6,2038,R2,2024,gassupply1,2.18500000000
-6,2040,R2,2024,gassupply1,2.18500000000
-6,2045,R2,2024,gassupply1,2.18500000000
-6,2050,R2,2024,gassupply1,2.18500000000
-6,2060,R2,2024,gassupply1,2.18500000000
-7,2036,R2,2026,gassupply1,1.69660000000
-7,2038,R2,2026,gassupply1,1.69660000000
-7,2040,R2,2026,gassupply1,1.69660000000
-7,2045,R2,2026,gassupply1,1.69660000000
-7,2050,R2,2026,gassupply1,1.69660000000
-7,2060,R2,2026,gassupply1,1.69660000000
-7,2061,R2,2026,gassupply1,1.69660000000
-7,2062,R2,2026,gassupply1,1.69660000000
-8,2036,R2,2028,gassupply1,1.69660000000
-8,2038,R2,2028,gassupply1,1.69660000000
-8,2040,R2,2028,gassupply1,1.69660000000
-8,2045,R2,2028,gassupply1,1.69660000000
-8,2050,R2,2028,gassupply1,1.69660000000
-8,2060,R2,2028,gassupply1,1.69660000000
-8,2061,R2,2028,gassupply1,1.69660000000
-8,2062,R2,2028,gassupply1,1.69660000000
-8,2063,R2,2028,gassupply1,1.69660000000
-8,2064,R2,2028,gassupply1,1.69660000000
-9,2036,R2,2030,gassupply1,9.19660000000
-9,2038,R2,2030,gassupply1,9.19660000000
-9,2040,R2,2030,gassupply1,9.19660000000
-9,2045,R2,2030,gassupply1,9.19660000000
-9,2050,R2,2030,gassupply1,9.19660000000
-9,2060,R2,2030,gassupply1,9.19660000000
-9,2061,R2,2030,gassupply1,9.19660000000
-9,2062,R2,2030,gassupply1,9.19660000000
-9,2063,R2,2030,gassupply1,9.19660000000
-9,2064,R2,2030,gassupply1,9.19660000000
-9,2065,R2,2030,gassupply1,9.19660000000
-9,2066,R2,2030,gassupply1,9.19660000000
+asset,year,region,technology,installed,capacity
+1,2036,R1,gassupply1,2024,2.18500000000
+1,2038,R1,gassupply1,2024,2.18500000000
+1,2040,R1,gassupply1,2024,2.18500000000
+1,2045,R1,gassupply1,2024,2.18500000000
+1,2050,R1,gassupply1,2024,2.18500000000
+1,2060,R1,gassupply1,2024,2.18500000000
+2,2036,R1,gassupply1,2026,1.69660000000
+2,2038,R1,gassupply1,2026,1.69660000000
+2,2040,R1,gassupply1,2026,1.69660000000
+2,2045,R1,gassupply1,2026,1.69660000000
+2,2050,R1,gassupply1,2026,1.69660000000
+2,2060,R1,gassupply1,2026,1.69660000000
+2,2061,R1,gassupply1,2026,1.69660000000
+2,2062,R1,gassupply1,2026,1.69660000000
+3,2036,R1,gassupply1,2028,1.69660000000
+3,2038,R1,gassupply1,2028,1.69660000000
+3,2040,R1,gassupply1,2028,1.69660000000
+3,2045,R1,gassupply1,2028,1.69660000000
+3,2050,R1,gassupply1,2028,1.69660000000
+3,2060,R1,gassupply1,2028,1.69660000000
+3,2061,R1,gassupply1,2028,1.69660000000
+3,2062,R1,gassupply1,2028,1.69660000000
+3,2063,R1,gassupply1,2028,1.69660000000
+3,2064,R1,gassupply1,2028,1.69660000000
+4,2036,R1,gassupply1,2030,9.19660000000
+4,2038,R1,gassupply1,2030,9.19660000000
+4,2040,R1,gassupply1,2030,9.19660000000
+4,2045,R1,gassupply1,2030,9.19660000000
+4,2050,R1,gassupply1,2030,9.19660000000
+4,2060,R1,gassupply1,2030,9.19660000000
+4,2061,R1,gassupply1,2030,9.19660000000
+4,2062,R1,gassupply1,2030,9.19660000000
+4,2063,R1,gassupply1,2030,9.19660000000
+4,2064,R1,gassupply1,2030,9.19660000000
+4,2065,R1,gassupply1,2030,9.19660000000
+4,2066,R1,gassupply1,2030,9.19660000000
+6,2036,R2,gassupply1,2024,2.18500000000
+6,2038,R2,gassupply1,2024,2.18500000000
+6,2040,R2,gassupply1,2024,2.18500000000
+6,2045,R2,gassupply1,2024,2.18500000000
+6,2050,R2,gassupply1,2024,2.18500000000
+6,2060,R2,gassupply1,2024,2.18500000000
+7,2036,R2,gassupply1,2026,1.69660000000
+7,2038,R2,gassupply1,2026,1.69660000000
+7,2040,R2,gassupply1,2026,1.69660000000
+7,2045,R2,gassupply1,2026,1.69660000000
+7,2050,R2,gassupply1,2026,1.69660000000
+7,2060,R2,gassupply1,2026,1.69660000000
+7,2061,R2,gassupply1,2026,1.69660000000
+7,2062,R2,gassupply1,2026,1.69660000000
+8,2036,R2,gassupply1,2028,1.69660000000
+8,2038,R2,gassupply1,2028,1.69660000000
+8,2040,R2,gassupply1,2028,1.69660000000
+8,2045,R2,gassupply1,2028,1.69660000000
+8,2050,R2,gassupply1,2028,1.69660000000
+8,2060,R2,gassupply1,2028,1.69660000000
+8,2061,R2,gassupply1,2028,1.69660000000
+8,2062,R2,gassupply1,2028,1.69660000000
+8,2063,R2,gassupply1,2028,1.69660000000
+8,2064,R2,gassupply1,2028,1.69660000000
+9,2036,R2,gassupply1,2030,9.19660000000
+9,2038,R2,gassupply1,2030,9.19660000000
+9,2040,R2,gassupply1,2030,9.19660000000
+9,2045,R2,gassupply1,2030,9.19660000000
+9,2050,R2,gassupply1,2030,9.19660000000
+9,2060,R2,gassupply1,2030,9.19660000000
+9,2061,R2,gassupply1,2030,9.19660000000
+9,2062,R2,gassupply1,2030,9.19660000000
+9,2063,R2,gassupply1,2030,9.19660000000
+9,2064,R2,gassupply1,2030,9.19660000000
+9,2065,R2,gassupply1,2030,9.19660000000
+9,2066,R2,gassupply1,2030,9.19660000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2038.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2038.csv
index de3b29589..b8ad0c846 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2038.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2038.csv
@@ -1,65 +1,65 @@
-asset,year,region,installed,technology,capacity
-1,2038,R1,2024,gassupply1,2.18500000000
-1,2040,R1,2024,gassupply1,2.18500000000
-1,2045,R1,2024,gassupply1,2.18500000000
-1,2050,R1,2024,gassupply1,2.18500000000
-1,2060,R1,2024,gassupply1,2.18500000000
-2,2038,R1,2026,gassupply1,1.69660000000
-2,2040,R1,2026,gassupply1,1.69660000000
-2,2045,R1,2026,gassupply1,1.69660000000
-2,2050,R1,2026,gassupply1,1.69660000000
-2,2060,R1,2026,gassupply1,1.69660000000
-2,2061,R1,2026,gassupply1,1.69660000000
-2,2062,R1,2026,gassupply1,1.69660000000
-3,2038,R1,2028,gassupply1,1.69660000000
-3,2040,R1,2028,gassupply1,1.69660000000
-3,2045,R1,2028,gassupply1,1.69660000000
-3,2050,R1,2028,gassupply1,1.69660000000
-3,2060,R1,2028,gassupply1,1.69660000000
-3,2061,R1,2028,gassupply1,1.69660000000
-3,2062,R1,2028,gassupply1,1.69660000000
-3,2063,R1,2028,gassupply1,1.69660000000
-3,2064,R1,2028,gassupply1,1.69660000000
-4,2038,R1,2030,gassupply1,9.19660000000
-4,2040,R1,2030,gassupply1,9.19660000000
-4,2045,R1,2030,gassupply1,9.19660000000
-4,2050,R1,2030,gassupply1,9.19660000000
-4,2060,R1,2030,gassupply1,9.19660000000
-4,2061,R1,2030,gassupply1,9.19660000000
-4,2062,R1,2030,gassupply1,9.19660000000
-4,2063,R1,2030,gassupply1,9.19660000000
-4,2064,R1,2030,gassupply1,9.19660000000
-4,2065,R1,2030,gassupply1,9.19660000000
-4,2066,R1,2030,gassupply1,9.19660000000
-6,2038,R2,2024,gassupply1,2.18500000000
-6,2040,R2,2024,gassupply1,2.18500000000
-6,2045,R2,2024,gassupply1,2.18500000000
-6,2050,R2,2024,gassupply1,2.18500000000
-6,2060,R2,2024,gassupply1,2.18500000000
-7,2038,R2,2026,gassupply1,1.69660000000
-7,2040,R2,2026,gassupply1,1.69660000000
-7,2045,R2,2026,gassupply1,1.69660000000
-7,2050,R2,2026,gassupply1,1.69660000000
-7,2060,R2,2026,gassupply1,1.69660000000
-7,2061,R2,2026,gassupply1,1.69660000000
-7,2062,R2,2026,gassupply1,1.69660000000
-8,2038,R2,2028,gassupply1,1.69660000000
-8,2040,R2,2028,gassupply1,1.69660000000
-8,2045,R2,2028,gassupply1,1.69660000000
-8,2050,R2,2028,gassupply1,1.69660000000
-8,2060,R2,2028,gassupply1,1.69660000000
-8,2061,R2,2028,gassupply1,1.69660000000
-8,2062,R2,2028,gassupply1,1.69660000000
-8,2063,R2,2028,gassupply1,1.69660000000
-8,2064,R2,2028,gassupply1,1.69660000000
-9,2038,R2,2030,gassupply1,9.19660000000
-9,2040,R2,2030,gassupply1,9.19660000000
-9,2045,R2,2030,gassupply1,9.19660000000
-9,2050,R2,2030,gassupply1,9.19660000000
-9,2060,R2,2030,gassupply1,9.19660000000
-9,2061,R2,2030,gassupply1,9.19660000000
-9,2062,R2,2030,gassupply1,9.19660000000
-9,2063,R2,2030,gassupply1,9.19660000000
-9,2064,R2,2030,gassupply1,9.19660000000
-9,2065,R2,2030,gassupply1,9.19660000000
-9,2066,R2,2030,gassupply1,9.19660000000
+asset,year,region,technology,installed,capacity
+1,2038,R1,gassupply1,2024,2.18500000000
+1,2040,R1,gassupply1,2024,2.18500000000
+1,2045,R1,gassupply1,2024,2.18500000000
+1,2050,R1,gassupply1,2024,2.18500000000
+1,2060,R1,gassupply1,2024,2.18500000000
+2,2038,R1,gassupply1,2026,1.69660000000
+2,2040,R1,gassupply1,2026,1.69660000000
+2,2045,R1,gassupply1,2026,1.69660000000
+2,2050,R1,gassupply1,2026,1.69660000000
+2,2060,R1,gassupply1,2026,1.69660000000
+2,2061,R1,gassupply1,2026,1.69660000000
+2,2062,R1,gassupply1,2026,1.69660000000
+3,2038,R1,gassupply1,2028,1.69660000000
+3,2040,R1,gassupply1,2028,1.69660000000
+3,2045,R1,gassupply1,2028,1.69660000000
+3,2050,R1,gassupply1,2028,1.69660000000
+3,2060,R1,gassupply1,2028,1.69660000000
+3,2061,R1,gassupply1,2028,1.69660000000
+3,2062,R1,gassupply1,2028,1.69660000000
+3,2063,R1,gassupply1,2028,1.69660000000
+3,2064,R1,gassupply1,2028,1.69660000000
+4,2038,R1,gassupply1,2030,9.19660000000
+4,2040,R1,gassupply1,2030,9.19660000000
+4,2045,R1,gassupply1,2030,9.19660000000
+4,2050,R1,gassupply1,2030,9.19660000000
+4,2060,R1,gassupply1,2030,9.19660000000
+4,2061,R1,gassupply1,2030,9.19660000000
+4,2062,R1,gassupply1,2030,9.19660000000
+4,2063,R1,gassupply1,2030,9.19660000000
+4,2064,R1,gassupply1,2030,9.19660000000
+4,2065,R1,gassupply1,2030,9.19660000000
+4,2066,R1,gassupply1,2030,9.19660000000
+6,2038,R2,gassupply1,2024,2.18500000000
+6,2040,R2,gassupply1,2024,2.18500000000
+6,2045,R2,gassupply1,2024,2.18500000000
+6,2050,R2,gassupply1,2024,2.18500000000
+6,2060,R2,gassupply1,2024,2.18500000000
+7,2038,R2,gassupply1,2026,1.69660000000
+7,2040,R2,gassupply1,2026,1.69660000000
+7,2045,R2,gassupply1,2026,1.69660000000
+7,2050,R2,gassupply1,2026,1.69660000000
+7,2060,R2,gassupply1,2026,1.69660000000
+7,2061,R2,gassupply1,2026,1.69660000000
+7,2062,R2,gassupply1,2026,1.69660000000
+8,2038,R2,gassupply1,2028,1.69660000000
+8,2040,R2,gassupply1,2028,1.69660000000
+8,2045,R2,gassupply1,2028,1.69660000000
+8,2050,R2,gassupply1,2028,1.69660000000
+8,2060,R2,gassupply1,2028,1.69660000000
+8,2061,R2,gassupply1,2028,1.69660000000
+8,2062,R2,gassupply1,2028,1.69660000000
+8,2063,R2,gassupply1,2028,1.69660000000
+8,2064,R2,gassupply1,2028,1.69660000000
+9,2038,R2,gassupply1,2030,9.19660000000
+9,2040,R2,gassupply1,2030,9.19660000000
+9,2045,R2,gassupply1,2030,9.19660000000
+9,2050,R2,gassupply1,2030,9.19660000000
+9,2060,R2,gassupply1,2030,9.19660000000
+9,2061,R2,gassupply1,2030,9.19660000000
+9,2062,R2,gassupply1,2030,9.19660000000
+9,2063,R2,gassupply1,2030,9.19660000000
+9,2064,R2,gassupply1,2030,9.19660000000
+9,2065,R2,gassupply1,2030,9.19660000000
+9,2066,R2,gassupply1,2030,9.19660000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2040.csv
index e36b5e9e5..2a28b22f6 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Gas/Capacity/2040.csv
@@ -1,65 +1,65 @@
-asset,year,region,installed,technology,capacity
-1,2040,R1,2024,gassupply1,2.18500000000
-1,2042,R1,2024,gassupply1,2.18500000000
-1,2045,R1,2024,gassupply1,2.18500000000
-1,2050,R1,2024,gassupply1,2.18500000000
-1,2060,R1,2024,gassupply1,2.18500000000
-2,2040,R1,2026,gassupply1,1.69660000000
-2,2042,R1,2026,gassupply1,1.69660000000
-2,2045,R1,2026,gassupply1,1.69660000000
-2,2050,R1,2026,gassupply1,1.69660000000
-2,2060,R1,2026,gassupply1,1.69660000000
-2,2061,R1,2026,gassupply1,1.69660000000
-2,2062,R1,2026,gassupply1,1.69660000000
-3,2040,R1,2028,gassupply1,1.69660000000
-3,2042,R1,2028,gassupply1,1.69660000000
-3,2045,R1,2028,gassupply1,1.69660000000
-3,2050,R1,2028,gassupply1,1.69660000000
-3,2060,R1,2028,gassupply1,1.69660000000
-3,2061,R1,2028,gassupply1,1.69660000000
-3,2062,R1,2028,gassupply1,1.69660000000
-3,2063,R1,2028,gassupply1,1.69660000000
-3,2064,R1,2028,gassupply1,1.69660000000
-4,2040,R1,2030,gassupply1,9.19660000000
-4,2042,R1,2030,gassupply1,9.19660000000
-4,2045,R1,2030,gassupply1,9.19660000000
-4,2050,R1,2030,gassupply1,9.19660000000
-4,2060,R1,2030,gassupply1,9.19660000000
-4,2061,R1,2030,gassupply1,9.19660000000
-4,2062,R1,2030,gassupply1,9.19660000000
-4,2063,R1,2030,gassupply1,9.19660000000
-4,2064,R1,2030,gassupply1,9.19660000000
-4,2065,R1,2030,gassupply1,9.19660000000
-4,2066,R1,2030,gassupply1,9.19660000000
-6,2040,R2,2024,gassupply1,2.18500000000
-6,2042,R2,2024,gassupply1,2.18500000000
-6,2045,R2,2024,gassupply1,2.18500000000
-6,2050,R2,2024,gassupply1,2.18500000000
-6,2060,R2,2024,gassupply1,2.18500000000
-7,2040,R2,2026,gassupply1,1.69660000000
-7,2042,R2,2026,gassupply1,1.69660000000
-7,2045,R2,2026,gassupply1,1.69660000000
-7,2050,R2,2026,gassupply1,1.69660000000
-7,2060,R2,2026,gassupply1,1.69660000000
-7,2061,R2,2026,gassupply1,1.69660000000
-7,2062,R2,2026,gassupply1,1.69660000000
-8,2040,R2,2028,gassupply1,1.69660000000
-8,2042,R2,2028,gassupply1,1.69660000000
-8,2045,R2,2028,gassupply1,1.69660000000
-8,2050,R2,2028,gassupply1,1.69660000000
-8,2060,R2,2028,gassupply1,1.69660000000
-8,2061,R2,2028,gassupply1,1.69660000000
-8,2062,R2,2028,gassupply1,1.69660000000
-8,2063,R2,2028,gassupply1,1.69660000000
-8,2064,R2,2028,gassupply1,1.69660000000
-9,2040,R2,2030,gassupply1,9.19660000000
-9,2042,R2,2030,gassupply1,9.19660000000
-9,2045,R2,2030,gassupply1,9.19660000000
-9,2050,R2,2030,gassupply1,9.19660000000
-9,2060,R2,2030,gassupply1,9.19660000000
-9,2061,R2,2030,gassupply1,9.19660000000
-9,2062,R2,2030,gassupply1,9.19660000000
-9,2063,R2,2030,gassupply1,9.19660000000
-9,2064,R2,2030,gassupply1,9.19660000000
-9,2065,R2,2030,gassupply1,9.19660000000
-9,2066,R2,2030,gassupply1,9.19660000000
+asset,year,region,technology,installed,capacity
+1,2040,R1,gassupply1,2024,2.18500000000
+1,2042,R1,gassupply1,2024,2.18500000000
+1,2045,R1,gassupply1,2024,2.18500000000
+1,2050,R1,gassupply1,2024,2.18500000000
+1,2060,R1,gassupply1,2024,2.18500000000
+2,2040,R1,gassupply1,2026,1.69660000000
+2,2042,R1,gassupply1,2026,1.69660000000
+2,2045,R1,gassupply1,2026,1.69660000000
+2,2050,R1,gassupply1,2026,1.69660000000
+2,2060,R1,gassupply1,2026,1.69660000000
+2,2061,R1,gassupply1,2026,1.69660000000
+2,2062,R1,gassupply1,2026,1.69660000000
+3,2040,R1,gassupply1,2028,1.69660000000
+3,2042,R1,gassupply1,2028,1.69660000000
+3,2045,R1,gassupply1,2028,1.69660000000
+3,2050,R1,gassupply1,2028,1.69660000000
+3,2060,R1,gassupply1,2028,1.69660000000
+3,2061,R1,gassupply1,2028,1.69660000000
+3,2062,R1,gassupply1,2028,1.69660000000
+3,2063,R1,gassupply1,2028,1.69660000000
+3,2064,R1,gassupply1,2028,1.69660000000
+4,2040,R1,gassupply1,2030,9.19660000000
+4,2042,R1,gassupply1,2030,9.19660000000
+4,2045,R1,gassupply1,2030,9.19660000000
+4,2050,R1,gassupply1,2030,9.19660000000
+4,2060,R1,gassupply1,2030,9.19660000000
+4,2061,R1,gassupply1,2030,9.19660000000
+4,2062,R1,gassupply1,2030,9.19660000000
+4,2063,R1,gassupply1,2030,9.19660000000
+4,2064,R1,gassupply1,2030,9.19660000000
+4,2065,R1,gassupply1,2030,9.19660000000
+4,2066,R1,gassupply1,2030,9.19660000000
+6,2040,R2,gassupply1,2024,2.18500000000
+6,2042,R2,gassupply1,2024,2.18500000000
+6,2045,R2,gassupply1,2024,2.18500000000
+6,2050,R2,gassupply1,2024,2.18500000000
+6,2060,R2,gassupply1,2024,2.18500000000
+7,2040,R2,gassupply1,2026,1.69660000000
+7,2042,R2,gassupply1,2026,1.69660000000
+7,2045,R2,gassupply1,2026,1.69660000000
+7,2050,R2,gassupply1,2026,1.69660000000
+7,2060,R2,gassupply1,2026,1.69660000000
+7,2061,R2,gassupply1,2026,1.69660000000
+7,2062,R2,gassupply1,2026,1.69660000000
+8,2040,R2,gassupply1,2028,1.69660000000
+8,2042,R2,gassupply1,2028,1.69660000000
+8,2045,R2,gassupply1,2028,1.69660000000
+8,2050,R2,gassupply1,2028,1.69660000000
+8,2060,R2,gassupply1,2028,1.69660000000
+8,2061,R2,gassupply1,2028,1.69660000000
+8,2062,R2,gassupply1,2028,1.69660000000
+8,2063,R2,gassupply1,2028,1.69660000000
+8,2064,R2,gassupply1,2028,1.69660000000
+9,2040,R2,gassupply1,2030,9.19660000000
+9,2042,R2,gassupply1,2030,9.19660000000
+9,2045,R2,gassupply1,2030,9.19660000000
+9,2050,R2,gassupply1,2030,9.19660000000
+9,2060,R2,gassupply1,2030,9.19660000000
+9,2061,R2,gassupply1,2030,9.19660000000
+9,2062,R2,gassupply1,2030,9.19660000000
+9,2063,R2,gassupply1,2030,9.19660000000
+9,2064,R2,gassupply1,2030,9.19660000000
+9,2065,R2,gassupply1,2030,9.19660000000
+9,2066,R2,gassupply1,2030,9.19660000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2020.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2020.csv
index f6737d1df..c5f09e316 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2020.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2020.csv
@@ -1,28 +1,28 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gasCCGT,1.00000000000
-0,2022,R1,2020,gasCCGT,1.00000000000
-0,2025,R1,2020,gasCCGT,1.00000000000
-1,2022,R1,2020,solarPV,4.17990000000
-1,2025,R1,2020,solarPV,4.17990000000
-1,2030,R1,2020,solarPV,4.17990000000
-1,2035,R1,2020,solarPV,4.17990000000
-1,2040,R1,2020,solarPV,4.17990000000
-1,2045,R1,2020,solarPV,4.17990000000
-1,2046,R1,2020,solarPV,4.17990000000
-2,2022,R1,2020,windturbine,8.00000000000
-2,2025,R1,2020,windturbine,8.00000000000
-2,2030,R1,2020,windturbine,8.00000000000
-2,2035,R1,2020,windturbine,8.00000000000
-2,2040,R1,2020,windturbine,8.00000000000
-2,2045,R1,2020,windturbine,8.00000000000
-2,2046,R1,2020,windturbine,8.00000000000
-3,2020,R2,2020,gasCCGT,1.00000000000
-3,2022,R2,2020,gasCCGT,1.00000000000
-3,2025,R2,2020,gasCCGT,1.00000000000
-4,2022,R2,2020,windturbine,12.17990000000
-4,2025,R2,2020,windturbine,12.17990000000
-4,2030,R2,2020,windturbine,12.17990000000
-4,2035,R2,2020,windturbine,12.17990000000
-4,2040,R2,2020,windturbine,12.17990000000
-4,2045,R2,2020,windturbine,12.17990000000
-4,2046,R2,2020,windturbine,12.17990000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2022,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2022,R1,solarPV,2020,4.17990000000
+1,2025,R1,solarPV,2020,4.17990000000
+1,2030,R1,solarPV,2020,4.17990000000
+1,2035,R1,solarPV,2020,4.17990000000
+1,2040,R1,solarPV,2020,4.17990000000
+1,2045,R1,solarPV,2020,4.17990000000
+1,2046,R1,solarPV,2020,4.17990000000
+2,2022,R1,windturbine,2020,8.00000000000
+2,2025,R1,windturbine,2020,8.00000000000
+2,2030,R1,windturbine,2020,8.00000000000
+2,2035,R1,windturbine,2020,8.00000000000
+2,2040,R1,windturbine,2020,8.00000000000
+2,2045,R1,windturbine,2020,8.00000000000
+2,2046,R1,windturbine,2020,8.00000000000
+3,2020,R2,gasCCGT,2020,1.00000000000
+3,2022,R2,gasCCGT,2020,1.00000000000
+3,2025,R2,gasCCGT,2020,1.00000000000
+4,2022,R2,windturbine,2020,12.17990000000
+4,2025,R2,windturbine,2020,12.17990000000
+4,2030,R2,windturbine,2020,12.17990000000
+4,2035,R2,windturbine,2020,12.17990000000
+4,2040,R2,windturbine,2020,12.17990000000
+4,2045,R2,windturbine,2020,12.17990000000
+4,2046,R2,windturbine,2020,12.17990000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2022.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2022.csv
index 350eac068..53ca221d6 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2022.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2022.csv
@@ -1,73 +1,73 @@
-asset,year,region,installed,technology,capacity
-0,2022,R1,2020,gasCCGT,1.00000000000
-0,2024,R1,2020,gasCCGT,1.00000000000
-0,2025,R1,2020,gasCCGT,1.00000000000
-1,2022,R1,2020,solarPV,4.17990000000
-1,2024,R1,2020,solarPV,4.17990000000
-1,2025,R1,2020,solarPV,4.17990000000
-1,2030,R1,2020,solarPV,4.17990000000
-1,2035,R1,2020,solarPV,4.17990000000
-1,2040,R1,2020,solarPV,4.17990000000
-1,2045,R1,2020,solarPV,4.17990000000
-1,2046,R1,2020,solarPV,4.17990000000
-2,2022,R1,2020,windturbine,8.00000000000
-2,2024,R1,2020,windturbine,8.00000000000
-2,2025,R1,2020,windturbine,8.00000000000
-2,2030,R1,2020,windturbine,8.00000000000
-2,2035,R1,2020,windturbine,8.00000000000
-2,2040,R1,2020,windturbine,8.00000000000
-2,2045,R1,2020,windturbine,8.00000000000
-2,2046,R1,2020,windturbine,8.00000000000
-3,2024,R1,2022,gasCCGT,0.80000000000
-3,2025,R1,2022,gasCCGT,0.80000000000
-3,2030,R1,2022,gasCCGT,0.80000000000
-3,2035,R1,2022,gasCCGT,0.80000000000
-3,2040,R1,2022,gasCCGT,0.80000000000
-3,2045,R1,2022,gasCCGT,0.80000000000
-3,2046,R1,2022,gasCCGT,0.80000000000
-3,2047,R1,2022,gasCCGT,0.80000000000
-3,2048,R1,2022,gasCCGT,0.80000000000
-3,2049,R1,2022,gasCCGT,0.80000000000
-3,2050,R1,2022,gasCCGT,0.80000000000
-3,2058,R1,2022,gasCCGT,0.80000000000
-4,2024,R1,2022,windturbine,0.48590000000
-4,2025,R1,2022,windturbine,0.48590000000
-4,2030,R1,2022,windturbine,0.48590000000
-4,2035,R1,2022,windturbine,0.48590000000
-4,2040,R1,2022,windturbine,0.48590000000
-4,2045,R1,2022,windturbine,0.48590000000
-4,2046,R1,2022,windturbine,0.48590000000
-4,2047,R1,2022,windturbine,0.48590000000
-4,2048,R1,2022,windturbine,0.48590000000
-5,2022,R2,2020,gasCCGT,1.00000000000
-5,2024,R2,2020,gasCCGT,1.00000000000
-5,2025,R2,2020,gasCCGT,1.00000000000
-6,2022,R2,2020,windturbine,12.17990000000
-6,2024,R2,2020,windturbine,12.17990000000
-6,2025,R2,2020,windturbine,12.17990000000
-6,2030,R2,2020,windturbine,12.17990000000
-6,2035,R2,2020,windturbine,12.17990000000
-6,2040,R2,2020,windturbine,12.17990000000
-6,2045,R2,2020,windturbine,12.17990000000
-6,2046,R2,2020,windturbine,12.17990000000
-7,2024,R2,2022,gasCCGT,0.80000000000
-7,2025,R2,2022,gasCCGT,0.80000000000
-7,2030,R2,2022,gasCCGT,0.80000000000
-7,2035,R2,2022,gasCCGT,0.80000000000
-7,2040,R2,2022,gasCCGT,0.80000000000
-7,2045,R2,2022,gasCCGT,0.80000000000
-7,2046,R2,2022,gasCCGT,0.80000000000
-7,2047,R2,2022,gasCCGT,0.80000000000
-7,2048,R2,2022,gasCCGT,0.80000000000
-7,2049,R2,2022,gasCCGT,0.80000000000
-7,2050,R2,2022,gasCCGT,0.80000000000
-7,2058,R2,2022,gasCCGT,0.80000000000
-8,2024,R2,2022,windturbine,0.48590000000
-8,2025,R2,2022,windturbine,0.48590000000
-8,2030,R2,2022,windturbine,0.48590000000
-8,2035,R2,2022,windturbine,0.48590000000
-8,2040,R2,2022,windturbine,0.48590000000
-8,2045,R2,2022,windturbine,0.48590000000
-8,2046,R2,2022,windturbine,0.48590000000
-8,2047,R2,2022,windturbine,0.48590000000
-8,2048,R2,2022,windturbine,0.48590000000
+asset,year,region,technology,installed,capacity
+0,2022,R1,gasCCGT,2020,1.00000000000
+0,2024,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2024,R1,gasCCGT,2022,0.80000000000
+1,2025,R1,gasCCGT,2022,0.80000000000
+1,2030,R1,gasCCGT,2022,0.80000000000
+1,2035,R1,gasCCGT,2022,0.80000000000
+1,2040,R1,gasCCGT,2022,0.80000000000
+1,2045,R1,gasCCGT,2022,0.80000000000
+1,2046,R1,gasCCGT,2022,0.80000000000
+1,2047,R1,gasCCGT,2022,0.80000000000
+1,2048,R1,gasCCGT,2022,0.80000000000
+1,2049,R1,gasCCGT,2022,0.80000000000
+1,2050,R1,gasCCGT,2022,0.80000000000
+1,2058,R1,gasCCGT,2022,0.80000000000
+2,2022,R1,solarPV,2020,4.17990000000
+2,2024,R1,solarPV,2020,4.17990000000
+2,2025,R1,solarPV,2020,4.17990000000
+2,2030,R1,solarPV,2020,4.17990000000
+2,2035,R1,solarPV,2020,4.17990000000
+2,2040,R1,solarPV,2020,4.17990000000
+2,2045,R1,solarPV,2020,4.17990000000
+2,2046,R1,solarPV,2020,4.17990000000
+3,2022,R1,windturbine,2020,8.00000000000
+3,2024,R1,windturbine,2020,8.00000000000
+3,2025,R1,windturbine,2020,8.00000000000
+3,2030,R1,windturbine,2020,8.00000000000
+3,2035,R1,windturbine,2020,8.00000000000
+3,2040,R1,windturbine,2020,8.00000000000
+3,2045,R1,windturbine,2020,8.00000000000
+3,2046,R1,windturbine,2020,8.00000000000
+4,2024,R1,windturbine,2022,0.48590000000
+4,2025,R1,windturbine,2022,0.48590000000
+4,2030,R1,windturbine,2022,0.48590000000
+4,2035,R1,windturbine,2022,0.48590000000
+4,2040,R1,windturbine,2022,0.48590000000
+4,2045,R1,windturbine,2022,0.48590000000
+4,2046,R1,windturbine,2022,0.48590000000
+4,2047,R1,windturbine,2022,0.48590000000
+4,2048,R1,windturbine,2022,0.48590000000
+5,2022,R2,gasCCGT,2020,1.00000000000
+5,2024,R2,gasCCGT,2020,1.00000000000
+5,2025,R2,gasCCGT,2020,1.00000000000
+6,2024,R2,gasCCGT,2022,0.80000000000
+6,2025,R2,gasCCGT,2022,0.80000000000
+6,2030,R2,gasCCGT,2022,0.80000000000
+6,2035,R2,gasCCGT,2022,0.80000000000
+6,2040,R2,gasCCGT,2022,0.80000000000
+6,2045,R2,gasCCGT,2022,0.80000000000
+6,2046,R2,gasCCGT,2022,0.80000000000
+6,2047,R2,gasCCGT,2022,0.80000000000
+6,2048,R2,gasCCGT,2022,0.80000000000
+6,2049,R2,gasCCGT,2022,0.80000000000
+6,2050,R2,gasCCGT,2022,0.80000000000
+6,2058,R2,gasCCGT,2022,0.80000000000
+7,2022,R2,windturbine,2020,12.17990000000
+7,2024,R2,windturbine,2020,12.17990000000
+7,2025,R2,windturbine,2020,12.17990000000
+7,2030,R2,windturbine,2020,12.17990000000
+7,2035,R2,windturbine,2020,12.17990000000
+7,2040,R2,windturbine,2020,12.17990000000
+7,2045,R2,windturbine,2020,12.17990000000
+7,2046,R2,windturbine,2020,12.17990000000
+8,2024,R2,windturbine,2022,0.48590000000
+8,2025,R2,windturbine,2022,0.48590000000
+8,2030,R2,windturbine,2022,0.48590000000
+8,2035,R2,windturbine,2022,0.48590000000
+8,2040,R2,windturbine,2022,0.48590000000
+8,2045,R2,windturbine,2022,0.48590000000
+8,2046,R2,windturbine,2022,0.48590000000
+8,2047,R2,windturbine,2022,0.48590000000
+8,2048,R2,windturbine,2022,0.48590000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2026.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2026.csv
index 76da3da05..0ac3ac2b0 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2026.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2026.csv
@@ -1,122 +1,122 @@
-asset,year,region,installed,technology,capacity
-1,2026,R1,2020,solarPV,4.17990000000
-1,2028,R1,2020,solarPV,4.17990000000
-1,2030,R1,2020,solarPV,4.17990000000
-1,2035,R1,2020,solarPV,4.17990000000
-1,2040,R1,2020,solarPV,4.17990000000
-1,2045,R1,2020,solarPV,4.17990000000
-1,2046,R1,2020,solarPV,4.17990000000
-2,2026,R1,2020,windturbine,8.00000000000
-2,2028,R1,2020,windturbine,8.00000000000
-2,2030,R1,2020,windturbine,8.00000000000
-2,2035,R1,2020,windturbine,8.00000000000
-2,2040,R1,2020,windturbine,8.00000000000
-2,2045,R1,2020,windturbine,8.00000000000
-2,2046,R1,2020,windturbine,8.00000000000
-3,2026,R1,2022,gasCCGT,0.80000000000
-3,2028,R1,2022,gasCCGT,0.80000000000
-3,2030,R1,2022,gasCCGT,0.80000000000
-3,2035,R1,2022,gasCCGT,0.80000000000
-3,2040,R1,2022,gasCCGT,0.80000000000
-3,2045,R1,2022,gasCCGT,0.80000000000
-3,2046,R1,2022,gasCCGT,0.80000000000
-3,2047,R1,2022,gasCCGT,0.80000000000
-3,2048,R1,2022,gasCCGT,0.80000000000
-3,2049,R1,2022,gasCCGT,0.80000000000
-3,2050,R1,2022,gasCCGT,0.80000000000
-3,2058,R1,2022,gasCCGT,0.80000000000
-4,2026,R1,2022,windturbine,0.48590000000
-4,2028,R1,2022,windturbine,0.48590000000
-4,2030,R1,2022,windturbine,0.48590000000
-4,2035,R1,2022,windturbine,0.48590000000
-4,2040,R1,2022,windturbine,0.48590000000
-4,2045,R1,2022,windturbine,0.48590000000
-4,2046,R1,2022,windturbine,0.48590000000
-4,2047,R1,2022,windturbine,0.48590000000
-4,2048,R1,2022,windturbine,0.48590000000
-5,2026,R1,2024,gasCCGT,3.20460000000
-5,2028,R1,2024,gasCCGT,3.20460000000
-5,2030,R1,2024,gasCCGT,3.20460000000
-5,2035,R1,2024,gasCCGT,3.20460000000
-5,2040,R1,2024,gasCCGT,3.20460000000
-5,2045,R1,2024,gasCCGT,3.20460000000
-5,2046,R1,2024,gasCCGT,3.20460000000
-5,2047,R1,2024,gasCCGT,3.20460000000
-5,2048,R1,2024,gasCCGT,3.20460000000
-5,2049,R1,2024,gasCCGT,3.20460000000
-5,2050,R1,2024,gasCCGT,3.20460000000
-5,2058,R1,2024,gasCCGT,3.20460000000
-5,2059,R1,2024,gasCCGT,3.20460000000
-5,2060,R1,2024,gasCCGT,3.20460000000
-6,2028,R1,2026,gasCCGT,1.01590000000
-6,2030,R1,2026,gasCCGT,1.01590000000
-6,2035,R1,2026,gasCCGT,1.01590000000
-6,2040,R1,2026,gasCCGT,1.01590000000
-6,2045,R1,2026,gasCCGT,1.01590000000
-6,2046,R1,2026,gasCCGT,1.01590000000
-6,2047,R1,2026,gasCCGT,1.01590000000
-6,2048,R1,2026,gasCCGT,1.01590000000
-6,2049,R1,2026,gasCCGT,1.01590000000
-6,2050,R1,2026,gasCCGT,1.01590000000
-6,2058,R1,2026,gasCCGT,1.01590000000
-6,2059,R1,2026,gasCCGT,1.01590000000
-6,2060,R1,2026,gasCCGT,1.01590000000
-6,2061,R1,2026,gasCCGT,1.01590000000
-6,2062,R1,2026,gasCCGT,1.01590000000
-8,2026,R2,2020,windturbine,12.17990000000
-8,2028,R2,2020,windturbine,12.17990000000
-8,2030,R2,2020,windturbine,12.17990000000
-8,2035,R2,2020,windturbine,12.17990000000
-8,2040,R2,2020,windturbine,12.17990000000
-8,2045,R2,2020,windturbine,12.17990000000
-8,2046,R2,2020,windturbine,12.17990000000
-9,2026,R2,2022,gasCCGT,0.80000000000
-9,2028,R2,2022,gasCCGT,0.80000000000
-9,2030,R2,2022,gasCCGT,0.80000000000
-9,2035,R2,2022,gasCCGT,0.80000000000
-9,2040,R2,2022,gasCCGT,0.80000000000
-9,2045,R2,2022,gasCCGT,0.80000000000
-9,2046,R2,2022,gasCCGT,0.80000000000
-9,2047,R2,2022,gasCCGT,0.80000000000
-9,2048,R2,2022,gasCCGT,0.80000000000
-9,2049,R2,2022,gasCCGT,0.80000000000
-9,2050,R2,2022,gasCCGT,0.80000000000
-9,2058,R2,2022,gasCCGT,0.80000000000
-10,2026,R2,2022,windturbine,0.48590000000
-10,2028,R2,2022,windturbine,0.48590000000
-10,2030,R2,2022,windturbine,0.48590000000
-10,2035,R2,2022,windturbine,0.48590000000
-10,2040,R2,2022,windturbine,0.48590000000
-10,2045,R2,2022,windturbine,0.48590000000
-10,2046,R2,2022,windturbine,0.48590000000
-10,2047,R2,2022,windturbine,0.48590000000
-10,2048,R2,2022,windturbine,0.48590000000
-11,2026,R2,2024,gasCCGT,3.20460000000
-11,2028,R2,2024,gasCCGT,3.20460000000
-11,2030,R2,2024,gasCCGT,3.20460000000
-11,2035,R2,2024,gasCCGT,3.20460000000
-11,2040,R2,2024,gasCCGT,3.20460000000
-11,2045,R2,2024,gasCCGT,3.20460000000
-11,2046,R2,2024,gasCCGT,3.20460000000
-11,2047,R2,2024,gasCCGT,3.20460000000
-11,2048,R2,2024,gasCCGT,3.20460000000
-11,2049,R2,2024,gasCCGT,3.20460000000
-11,2050,R2,2024,gasCCGT,3.20460000000
-11,2058,R2,2024,gasCCGT,3.20460000000
-11,2059,R2,2024,gasCCGT,3.20460000000
-11,2060,R2,2024,gasCCGT,3.20460000000
-12,2028,R2,2026,gasCCGT,1.01590000000
-12,2030,R2,2026,gasCCGT,1.01590000000
-12,2035,R2,2026,gasCCGT,1.01590000000
-12,2040,R2,2026,gasCCGT,1.01590000000
-12,2045,R2,2026,gasCCGT,1.01590000000
-12,2046,R2,2026,gasCCGT,1.01590000000
-12,2047,R2,2026,gasCCGT,1.01590000000
-12,2048,R2,2026,gasCCGT,1.01590000000
-12,2049,R2,2026,gasCCGT,1.01590000000
-12,2050,R2,2026,gasCCGT,1.01590000000
-12,2058,R2,2026,gasCCGT,1.01590000000
-12,2059,R2,2026,gasCCGT,1.01590000000
-12,2060,R2,2026,gasCCGT,1.01590000000
-12,2061,R2,2026,gasCCGT,1.01590000000
-12,2062,R2,2026,gasCCGT,1.01590000000
+asset,year,region,technology,installed,capacity
+1,2026,R1,gasCCGT,2022,0.80000000000
+1,2028,R1,gasCCGT,2022,0.80000000000
+1,2030,R1,gasCCGT,2022,0.80000000000
+1,2035,R1,gasCCGT,2022,0.80000000000
+1,2040,R1,gasCCGT,2022,0.80000000000
+1,2045,R1,gasCCGT,2022,0.80000000000
+1,2046,R1,gasCCGT,2022,0.80000000000
+1,2047,R1,gasCCGT,2022,0.80000000000
+1,2048,R1,gasCCGT,2022,0.80000000000
+1,2049,R1,gasCCGT,2022,0.80000000000
+1,2050,R1,gasCCGT,2022,0.80000000000
+1,2058,R1,gasCCGT,2022,0.80000000000
+2,2026,R1,gasCCGT,2024,3.20460000000
+2,2028,R1,gasCCGT,2024,3.20460000000
+2,2030,R1,gasCCGT,2024,3.20460000000
+2,2035,R1,gasCCGT,2024,3.20460000000
+2,2040,R1,gasCCGT,2024,3.20460000000
+2,2045,R1,gasCCGT,2024,3.20460000000
+2,2046,R1,gasCCGT,2024,3.20460000000
+2,2047,R1,gasCCGT,2024,3.20460000000
+2,2048,R1,gasCCGT,2024,3.20460000000
+2,2049,R1,gasCCGT,2024,3.20460000000
+2,2050,R1,gasCCGT,2024,3.20460000000
+2,2058,R1,gasCCGT,2024,3.20460000000
+2,2059,R1,gasCCGT,2024,3.20460000000
+2,2060,R1,gasCCGT,2024,3.20460000000
+3,2028,R1,gasCCGT,2026,1.01590000000
+3,2030,R1,gasCCGT,2026,1.01590000000
+3,2035,R1,gasCCGT,2026,1.01590000000
+3,2040,R1,gasCCGT,2026,1.01590000000
+3,2045,R1,gasCCGT,2026,1.01590000000
+3,2046,R1,gasCCGT,2026,1.01590000000
+3,2047,R1,gasCCGT,2026,1.01590000000
+3,2048,R1,gasCCGT,2026,1.01590000000
+3,2049,R1,gasCCGT,2026,1.01590000000
+3,2050,R1,gasCCGT,2026,1.01590000000
+3,2058,R1,gasCCGT,2026,1.01590000000
+3,2059,R1,gasCCGT,2026,1.01590000000
+3,2060,R1,gasCCGT,2026,1.01590000000
+3,2061,R1,gasCCGT,2026,1.01590000000
+3,2062,R1,gasCCGT,2026,1.01590000000
+4,2026,R1,solarPV,2020,4.17990000000
+4,2028,R1,solarPV,2020,4.17990000000
+4,2030,R1,solarPV,2020,4.17990000000
+4,2035,R1,solarPV,2020,4.17990000000
+4,2040,R1,solarPV,2020,4.17990000000
+4,2045,R1,solarPV,2020,4.17990000000
+4,2046,R1,solarPV,2020,4.17990000000
+5,2026,R1,windturbine,2020,8.00000000000
+5,2028,R1,windturbine,2020,8.00000000000
+5,2030,R1,windturbine,2020,8.00000000000
+5,2035,R1,windturbine,2020,8.00000000000
+5,2040,R1,windturbine,2020,8.00000000000
+5,2045,R1,windturbine,2020,8.00000000000
+5,2046,R1,windturbine,2020,8.00000000000
+6,2026,R1,windturbine,2022,0.48590000000
+6,2028,R1,windturbine,2022,0.48590000000
+6,2030,R1,windturbine,2022,0.48590000000
+6,2035,R1,windturbine,2022,0.48590000000
+6,2040,R1,windturbine,2022,0.48590000000
+6,2045,R1,windturbine,2022,0.48590000000
+6,2046,R1,windturbine,2022,0.48590000000
+6,2047,R1,windturbine,2022,0.48590000000
+6,2048,R1,windturbine,2022,0.48590000000
+8,2026,R2,gasCCGT,2022,0.80000000000
+8,2028,R2,gasCCGT,2022,0.80000000000
+8,2030,R2,gasCCGT,2022,0.80000000000
+8,2035,R2,gasCCGT,2022,0.80000000000
+8,2040,R2,gasCCGT,2022,0.80000000000
+8,2045,R2,gasCCGT,2022,0.80000000000
+8,2046,R2,gasCCGT,2022,0.80000000000
+8,2047,R2,gasCCGT,2022,0.80000000000
+8,2048,R2,gasCCGT,2022,0.80000000000
+8,2049,R2,gasCCGT,2022,0.80000000000
+8,2050,R2,gasCCGT,2022,0.80000000000
+8,2058,R2,gasCCGT,2022,0.80000000000
+9,2026,R2,gasCCGT,2024,3.20460000000
+9,2028,R2,gasCCGT,2024,3.20460000000
+9,2030,R2,gasCCGT,2024,3.20460000000
+9,2035,R2,gasCCGT,2024,3.20460000000
+9,2040,R2,gasCCGT,2024,3.20460000000
+9,2045,R2,gasCCGT,2024,3.20460000000
+9,2046,R2,gasCCGT,2024,3.20460000000
+9,2047,R2,gasCCGT,2024,3.20460000000
+9,2048,R2,gasCCGT,2024,3.20460000000
+9,2049,R2,gasCCGT,2024,3.20460000000
+9,2050,R2,gasCCGT,2024,3.20460000000
+9,2058,R2,gasCCGT,2024,3.20460000000
+9,2059,R2,gasCCGT,2024,3.20460000000
+9,2060,R2,gasCCGT,2024,3.20460000000
+10,2028,R2,gasCCGT,2026,1.01590000000
+10,2030,R2,gasCCGT,2026,1.01590000000
+10,2035,R2,gasCCGT,2026,1.01590000000
+10,2040,R2,gasCCGT,2026,1.01590000000
+10,2045,R2,gasCCGT,2026,1.01590000000
+10,2046,R2,gasCCGT,2026,1.01590000000
+10,2047,R2,gasCCGT,2026,1.01590000000
+10,2048,R2,gasCCGT,2026,1.01590000000
+10,2049,R2,gasCCGT,2026,1.01590000000
+10,2050,R2,gasCCGT,2026,1.01590000000
+10,2058,R2,gasCCGT,2026,1.01590000000
+10,2059,R2,gasCCGT,2026,1.01590000000
+10,2060,R2,gasCCGT,2026,1.01590000000
+10,2061,R2,gasCCGT,2026,1.01590000000
+10,2062,R2,gasCCGT,2026,1.01590000000
+11,2026,R2,windturbine,2020,12.17990000000
+11,2028,R2,windturbine,2020,12.17990000000
+11,2030,R2,windturbine,2020,12.17990000000
+11,2035,R2,windturbine,2020,12.17990000000
+11,2040,R2,windturbine,2020,12.17990000000
+11,2045,R2,windturbine,2020,12.17990000000
+11,2046,R2,windturbine,2020,12.17990000000
+12,2026,R2,windturbine,2022,0.48590000000
+12,2028,R2,windturbine,2022,0.48590000000
+12,2030,R2,windturbine,2022,0.48590000000
+12,2035,R2,windturbine,2022,0.48590000000
+12,2040,R2,windturbine,2022,0.48590000000
+12,2045,R2,windturbine,2022,0.48590000000
+12,2046,R2,windturbine,2022,0.48590000000
+12,2047,R2,windturbine,2022,0.48590000000
+12,2048,R2,windturbine,2022,0.48590000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2028.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2028.csv
index 9bcf9d758..890630577 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2028.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2028.csv
@@ -1,145 +1,145 @@
-asset,year,region,installed,technology,capacity
-1,2028,R1,2020,solarPV,4.17990000000
-1,2030,R1,2020,solarPV,4.17990000000
-1,2035,R1,2020,solarPV,4.17990000000
-1,2040,R1,2020,solarPV,4.17990000000
-1,2045,R1,2020,solarPV,4.17990000000
-1,2046,R1,2020,solarPV,4.17990000000
-2,2028,R1,2020,windturbine,8.00000000000
-2,2030,R1,2020,windturbine,8.00000000000
-2,2035,R1,2020,windturbine,8.00000000000
-2,2040,R1,2020,windturbine,8.00000000000
-2,2045,R1,2020,windturbine,8.00000000000
-2,2046,R1,2020,windturbine,8.00000000000
-3,2028,R1,2022,gasCCGT,0.80000000000
-3,2030,R1,2022,gasCCGT,0.80000000000
-3,2035,R1,2022,gasCCGT,0.80000000000
-3,2040,R1,2022,gasCCGT,0.80000000000
-3,2045,R1,2022,gasCCGT,0.80000000000
-3,2046,R1,2022,gasCCGT,0.80000000000
-3,2047,R1,2022,gasCCGT,0.80000000000
-3,2048,R1,2022,gasCCGT,0.80000000000
-3,2049,R1,2022,gasCCGT,0.80000000000
-3,2050,R1,2022,gasCCGT,0.80000000000
-3,2058,R1,2022,gasCCGT,0.80000000000
-4,2028,R1,2022,windturbine,0.48590000000
-4,2030,R1,2022,windturbine,0.48590000000
-4,2035,R1,2022,windturbine,0.48590000000
-4,2040,R1,2022,windturbine,0.48590000000
-4,2045,R1,2022,windturbine,0.48590000000
-4,2046,R1,2022,windturbine,0.48590000000
-4,2047,R1,2022,windturbine,0.48590000000
-4,2048,R1,2022,windturbine,0.48590000000
-5,2028,R1,2024,gasCCGT,3.20460000000
-5,2030,R1,2024,gasCCGT,3.20460000000
-5,2035,R1,2024,gasCCGT,3.20460000000
-5,2040,R1,2024,gasCCGT,3.20460000000
-5,2045,R1,2024,gasCCGT,3.20460000000
-5,2046,R1,2024,gasCCGT,3.20460000000
-5,2047,R1,2024,gasCCGT,3.20460000000
-5,2048,R1,2024,gasCCGT,3.20460000000
-5,2049,R1,2024,gasCCGT,3.20460000000
-5,2050,R1,2024,gasCCGT,3.20460000000
-5,2058,R1,2024,gasCCGT,3.20460000000
-5,2059,R1,2024,gasCCGT,3.20460000000
-5,2060,R1,2024,gasCCGT,3.20460000000
-6,2028,R1,2026,gasCCGT,1.01590000000
-6,2030,R1,2026,gasCCGT,1.01590000000
-6,2035,R1,2026,gasCCGT,1.01590000000
-6,2040,R1,2026,gasCCGT,1.01590000000
-6,2045,R1,2026,gasCCGT,1.01590000000
-6,2046,R1,2026,gasCCGT,1.01590000000
-6,2047,R1,2026,gasCCGT,1.01590000000
-6,2048,R1,2026,gasCCGT,1.01590000000
-6,2049,R1,2026,gasCCGT,1.01590000000
-6,2050,R1,2026,gasCCGT,1.01590000000
-6,2058,R1,2026,gasCCGT,1.01590000000
-6,2059,R1,2026,gasCCGT,1.01590000000
-6,2060,R1,2026,gasCCGT,1.01590000000
-6,2061,R1,2026,gasCCGT,1.01590000000
-6,2062,R1,2026,gasCCGT,1.01590000000
-7,2030,R1,2028,gasCCGT,1.01590000000
-7,2035,R1,2028,gasCCGT,1.01590000000
-7,2040,R1,2028,gasCCGT,1.01590000000
-7,2045,R1,2028,gasCCGT,1.01590000000
-7,2046,R1,2028,gasCCGT,1.01590000000
-7,2047,R1,2028,gasCCGT,1.01590000000
-7,2048,R1,2028,gasCCGT,1.01590000000
-7,2049,R1,2028,gasCCGT,1.01590000000
-7,2050,R1,2028,gasCCGT,1.01590000000
-7,2058,R1,2028,gasCCGT,1.01590000000
-7,2059,R1,2028,gasCCGT,1.01590000000
-7,2060,R1,2028,gasCCGT,1.01590000000
-7,2061,R1,2028,gasCCGT,1.01590000000
-7,2062,R1,2028,gasCCGT,1.01590000000
-7,2063,R1,2028,gasCCGT,1.01590000000
-7,2064,R1,2028,gasCCGT,1.01590000000
-9,2028,R2,2020,windturbine,12.17990000000
-9,2030,R2,2020,windturbine,12.17990000000
-9,2035,R2,2020,windturbine,12.17990000000
-9,2040,R2,2020,windturbine,12.17990000000
-9,2045,R2,2020,windturbine,12.17990000000
-9,2046,R2,2020,windturbine,12.17990000000
-10,2028,R2,2022,gasCCGT,0.80000000000
-10,2030,R2,2022,gasCCGT,0.80000000000
-10,2035,R2,2022,gasCCGT,0.80000000000
-10,2040,R2,2022,gasCCGT,0.80000000000
-10,2045,R2,2022,gasCCGT,0.80000000000
-10,2046,R2,2022,gasCCGT,0.80000000000
-10,2047,R2,2022,gasCCGT,0.80000000000
-10,2048,R2,2022,gasCCGT,0.80000000000
-10,2049,R2,2022,gasCCGT,0.80000000000
-10,2050,R2,2022,gasCCGT,0.80000000000
-10,2058,R2,2022,gasCCGT,0.80000000000
-11,2028,R2,2022,windturbine,0.48590000000
-11,2030,R2,2022,windturbine,0.48590000000
-11,2035,R2,2022,windturbine,0.48590000000
-11,2040,R2,2022,windturbine,0.48590000000
-11,2045,R2,2022,windturbine,0.48590000000
-11,2046,R2,2022,windturbine,0.48590000000
-11,2047,R2,2022,windturbine,0.48590000000
-11,2048,R2,2022,windturbine,0.48590000000
-12,2028,R2,2024,gasCCGT,3.20460000000
-12,2030,R2,2024,gasCCGT,3.20460000000
-12,2035,R2,2024,gasCCGT,3.20460000000
-12,2040,R2,2024,gasCCGT,3.20460000000
-12,2045,R2,2024,gasCCGT,3.20460000000
-12,2046,R2,2024,gasCCGT,3.20460000000
-12,2047,R2,2024,gasCCGT,3.20460000000
-12,2048,R2,2024,gasCCGT,3.20460000000
-12,2049,R2,2024,gasCCGT,3.20460000000
-12,2050,R2,2024,gasCCGT,3.20460000000
-12,2058,R2,2024,gasCCGT,3.20460000000
-12,2059,R2,2024,gasCCGT,3.20460000000
-12,2060,R2,2024,gasCCGT,3.20460000000
-13,2028,R2,2026,gasCCGT,1.01590000000
-13,2030,R2,2026,gasCCGT,1.01590000000
-13,2035,R2,2026,gasCCGT,1.01590000000
-13,2040,R2,2026,gasCCGT,1.01590000000
-13,2045,R2,2026,gasCCGT,1.01590000000
-13,2046,R2,2026,gasCCGT,1.01590000000
-13,2047,R2,2026,gasCCGT,1.01590000000
-13,2048,R2,2026,gasCCGT,1.01590000000
-13,2049,R2,2026,gasCCGT,1.01590000000
-13,2050,R2,2026,gasCCGT,1.01590000000
-13,2058,R2,2026,gasCCGT,1.01590000000
-13,2059,R2,2026,gasCCGT,1.01590000000
-13,2060,R2,2026,gasCCGT,1.01590000000
-13,2061,R2,2026,gasCCGT,1.01590000000
-13,2062,R2,2026,gasCCGT,1.01590000000
-14,2030,R2,2028,gasCCGT,1.01590000000
-14,2035,R2,2028,gasCCGT,1.01590000000
-14,2040,R2,2028,gasCCGT,1.01590000000
-14,2045,R2,2028,gasCCGT,1.01590000000
-14,2046,R2,2028,gasCCGT,1.01590000000
-14,2047,R2,2028,gasCCGT,1.01590000000
-14,2048,R2,2028,gasCCGT,1.01590000000
-14,2049,R2,2028,gasCCGT,1.01590000000
-14,2050,R2,2028,gasCCGT,1.01590000000
-14,2058,R2,2028,gasCCGT,1.01590000000
-14,2059,R2,2028,gasCCGT,1.01590000000
-14,2060,R2,2028,gasCCGT,1.01590000000
-14,2061,R2,2028,gasCCGT,1.01590000000
-14,2062,R2,2028,gasCCGT,1.01590000000
-14,2063,R2,2028,gasCCGT,1.01590000000
-14,2064,R2,2028,gasCCGT,1.01590000000
+asset,year,region,technology,installed,capacity
+1,2028,R1,gasCCGT,2022,0.80000000000
+1,2030,R1,gasCCGT,2022,0.80000000000
+1,2035,R1,gasCCGT,2022,0.80000000000
+1,2040,R1,gasCCGT,2022,0.80000000000
+1,2045,R1,gasCCGT,2022,0.80000000000
+1,2046,R1,gasCCGT,2022,0.80000000000
+1,2047,R1,gasCCGT,2022,0.80000000000
+1,2048,R1,gasCCGT,2022,0.80000000000
+1,2049,R1,gasCCGT,2022,0.80000000000
+1,2050,R1,gasCCGT,2022,0.80000000000
+1,2058,R1,gasCCGT,2022,0.80000000000
+2,2028,R1,gasCCGT,2024,3.20460000000
+2,2030,R1,gasCCGT,2024,3.20460000000
+2,2035,R1,gasCCGT,2024,3.20460000000
+2,2040,R1,gasCCGT,2024,3.20460000000
+2,2045,R1,gasCCGT,2024,3.20460000000
+2,2046,R1,gasCCGT,2024,3.20460000000
+2,2047,R1,gasCCGT,2024,3.20460000000
+2,2048,R1,gasCCGT,2024,3.20460000000
+2,2049,R1,gasCCGT,2024,3.20460000000
+2,2050,R1,gasCCGT,2024,3.20460000000
+2,2058,R1,gasCCGT,2024,3.20460000000
+2,2059,R1,gasCCGT,2024,3.20460000000
+2,2060,R1,gasCCGT,2024,3.20460000000
+3,2028,R1,gasCCGT,2026,1.01590000000
+3,2030,R1,gasCCGT,2026,1.01590000000
+3,2035,R1,gasCCGT,2026,1.01590000000
+3,2040,R1,gasCCGT,2026,1.01590000000
+3,2045,R1,gasCCGT,2026,1.01590000000
+3,2046,R1,gasCCGT,2026,1.01590000000
+3,2047,R1,gasCCGT,2026,1.01590000000
+3,2048,R1,gasCCGT,2026,1.01590000000
+3,2049,R1,gasCCGT,2026,1.01590000000
+3,2050,R1,gasCCGT,2026,1.01590000000
+3,2058,R1,gasCCGT,2026,1.01590000000
+3,2059,R1,gasCCGT,2026,1.01590000000
+3,2060,R1,gasCCGT,2026,1.01590000000
+3,2061,R1,gasCCGT,2026,1.01590000000
+3,2062,R1,gasCCGT,2026,1.01590000000
+4,2030,R1,gasCCGT,2028,1.01590000000
+4,2035,R1,gasCCGT,2028,1.01590000000
+4,2040,R1,gasCCGT,2028,1.01590000000
+4,2045,R1,gasCCGT,2028,1.01590000000
+4,2046,R1,gasCCGT,2028,1.01590000000
+4,2047,R1,gasCCGT,2028,1.01590000000
+4,2048,R1,gasCCGT,2028,1.01590000000
+4,2049,R1,gasCCGT,2028,1.01590000000
+4,2050,R1,gasCCGT,2028,1.01590000000
+4,2058,R1,gasCCGT,2028,1.01590000000
+4,2059,R1,gasCCGT,2028,1.01590000000
+4,2060,R1,gasCCGT,2028,1.01590000000
+4,2061,R1,gasCCGT,2028,1.01590000000
+4,2062,R1,gasCCGT,2028,1.01590000000
+4,2063,R1,gasCCGT,2028,1.01590000000
+4,2064,R1,gasCCGT,2028,1.01590000000
+5,2028,R1,solarPV,2020,4.17990000000
+5,2030,R1,solarPV,2020,4.17990000000
+5,2035,R1,solarPV,2020,4.17990000000
+5,2040,R1,solarPV,2020,4.17990000000
+5,2045,R1,solarPV,2020,4.17990000000
+5,2046,R1,solarPV,2020,4.17990000000
+6,2028,R1,windturbine,2020,8.00000000000
+6,2030,R1,windturbine,2020,8.00000000000
+6,2035,R1,windturbine,2020,8.00000000000
+6,2040,R1,windturbine,2020,8.00000000000
+6,2045,R1,windturbine,2020,8.00000000000
+6,2046,R1,windturbine,2020,8.00000000000
+7,2028,R1,windturbine,2022,0.48590000000
+7,2030,R1,windturbine,2022,0.48590000000
+7,2035,R1,windturbine,2022,0.48590000000
+7,2040,R1,windturbine,2022,0.48590000000
+7,2045,R1,windturbine,2022,0.48590000000
+7,2046,R1,windturbine,2022,0.48590000000
+7,2047,R1,windturbine,2022,0.48590000000
+7,2048,R1,windturbine,2022,0.48590000000
+9,2028,R2,gasCCGT,2022,0.80000000000
+9,2030,R2,gasCCGT,2022,0.80000000000
+9,2035,R2,gasCCGT,2022,0.80000000000
+9,2040,R2,gasCCGT,2022,0.80000000000
+9,2045,R2,gasCCGT,2022,0.80000000000
+9,2046,R2,gasCCGT,2022,0.80000000000
+9,2047,R2,gasCCGT,2022,0.80000000000
+9,2048,R2,gasCCGT,2022,0.80000000000
+9,2049,R2,gasCCGT,2022,0.80000000000
+9,2050,R2,gasCCGT,2022,0.80000000000
+9,2058,R2,gasCCGT,2022,0.80000000000
+10,2028,R2,gasCCGT,2024,3.20460000000
+10,2030,R2,gasCCGT,2024,3.20460000000
+10,2035,R2,gasCCGT,2024,3.20460000000
+10,2040,R2,gasCCGT,2024,3.20460000000
+10,2045,R2,gasCCGT,2024,3.20460000000
+10,2046,R2,gasCCGT,2024,3.20460000000
+10,2047,R2,gasCCGT,2024,3.20460000000
+10,2048,R2,gasCCGT,2024,3.20460000000
+10,2049,R2,gasCCGT,2024,3.20460000000
+10,2050,R2,gasCCGT,2024,3.20460000000
+10,2058,R2,gasCCGT,2024,3.20460000000
+10,2059,R2,gasCCGT,2024,3.20460000000
+10,2060,R2,gasCCGT,2024,3.20460000000
+11,2028,R2,gasCCGT,2026,1.01590000000
+11,2030,R2,gasCCGT,2026,1.01590000000
+11,2035,R2,gasCCGT,2026,1.01590000000
+11,2040,R2,gasCCGT,2026,1.01590000000
+11,2045,R2,gasCCGT,2026,1.01590000000
+11,2046,R2,gasCCGT,2026,1.01590000000
+11,2047,R2,gasCCGT,2026,1.01590000000
+11,2048,R2,gasCCGT,2026,1.01590000000
+11,2049,R2,gasCCGT,2026,1.01590000000
+11,2050,R2,gasCCGT,2026,1.01590000000
+11,2058,R2,gasCCGT,2026,1.01590000000
+11,2059,R2,gasCCGT,2026,1.01590000000
+11,2060,R2,gasCCGT,2026,1.01590000000
+11,2061,R2,gasCCGT,2026,1.01590000000
+11,2062,R2,gasCCGT,2026,1.01590000000
+12,2030,R2,gasCCGT,2028,1.01590000000
+12,2035,R2,gasCCGT,2028,1.01590000000
+12,2040,R2,gasCCGT,2028,1.01590000000
+12,2045,R2,gasCCGT,2028,1.01590000000
+12,2046,R2,gasCCGT,2028,1.01590000000
+12,2047,R2,gasCCGT,2028,1.01590000000
+12,2048,R2,gasCCGT,2028,1.01590000000
+12,2049,R2,gasCCGT,2028,1.01590000000
+12,2050,R2,gasCCGT,2028,1.01590000000
+12,2058,R2,gasCCGT,2028,1.01590000000
+12,2059,R2,gasCCGT,2028,1.01590000000
+12,2060,R2,gasCCGT,2028,1.01590000000
+12,2061,R2,gasCCGT,2028,1.01590000000
+12,2062,R2,gasCCGT,2028,1.01590000000
+12,2063,R2,gasCCGT,2028,1.01590000000
+12,2064,R2,gasCCGT,2028,1.01590000000
+13,2028,R2,windturbine,2020,12.17990000000
+13,2030,R2,windturbine,2020,12.17990000000
+13,2035,R2,windturbine,2020,12.17990000000
+13,2040,R2,windturbine,2020,12.17990000000
+13,2045,R2,windturbine,2020,12.17990000000
+13,2046,R2,windturbine,2020,12.17990000000
+14,2028,R2,windturbine,2022,0.48590000000
+14,2030,R2,windturbine,2022,0.48590000000
+14,2035,R2,windturbine,2022,0.48590000000
+14,2040,R2,windturbine,2022,0.48590000000
+14,2045,R2,windturbine,2022,0.48590000000
+14,2046,R2,windturbine,2022,0.48590000000
+14,2047,R2,windturbine,2022,0.48590000000
+14,2048,R2,windturbine,2022,0.48590000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2030.csv
index 90db9e920..39f357948 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2030.csv
@@ -1,183 +1,183 @@
-asset,year,region,installed,technology,capacity
-1,2030,R1,2020,solarPV,4.17990000000
-1,2032,R1,2020,solarPV,4.17990000000
-1,2035,R1,2020,solarPV,4.17990000000
-1,2040,R1,2020,solarPV,4.17990000000
-1,2045,R1,2020,solarPV,4.17990000000
-1,2046,R1,2020,solarPV,4.17990000000
-2,2030,R1,2020,windturbine,8.00000000000
-2,2032,R1,2020,windturbine,8.00000000000
-2,2035,R1,2020,windturbine,8.00000000000
-2,2040,R1,2020,windturbine,8.00000000000
-2,2045,R1,2020,windturbine,8.00000000000
-2,2046,R1,2020,windturbine,8.00000000000
-3,2030,R1,2022,gasCCGT,0.80000000000
-3,2032,R1,2022,gasCCGT,0.80000000000
-3,2035,R1,2022,gasCCGT,0.80000000000
-3,2040,R1,2022,gasCCGT,0.80000000000
-3,2045,R1,2022,gasCCGT,0.80000000000
-3,2046,R1,2022,gasCCGT,0.80000000000
-3,2047,R1,2022,gasCCGT,0.80000000000
-3,2048,R1,2022,gasCCGT,0.80000000000
-3,2049,R1,2022,gasCCGT,0.80000000000
-3,2050,R1,2022,gasCCGT,0.80000000000
-3,2058,R1,2022,gasCCGT,0.80000000000
-4,2030,R1,2022,windturbine,0.48590000000
-4,2032,R1,2022,windturbine,0.48590000000
-4,2035,R1,2022,windturbine,0.48590000000
-4,2040,R1,2022,windturbine,0.48590000000
-4,2045,R1,2022,windturbine,0.48590000000
-4,2046,R1,2022,windturbine,0.48590000000
-4,2047,R1,2022,windturbine,0.48590000000
-4,2048,R1,2022,windturbine,0.48590000000
-5,2030,R1,2024,gasCCGT,3.20460000000
-5,2032,R1,2024,gasCCGT,3.20460000000
-5,2035,R1,2024,gasCCGT,3.20460000000
-5,2040,R1,2024,gasCCGT,3.20460000000
-5,2045,R1,2024,gasCCGT,3.20460000000
-5,2046,R1,2024,gasCCGT,3.20460000000
-5,2047,R1,2024,gasCCGT,3.20460000000
-5,2048,R1,2024,gasCCGT,3.20460000000
-5,2049,R1,2024,gasCCGT,3.20460000000
-5,2050,R1,2024,gasCCGT,3.20460000000
-5,2058,R1,2024,gasCCGT,3.20460000000
-5,2059,R1,2024,gasCCGT,3.20460000000
-5,2060,R1,2024,gasCCGT,3.20460000000
-6,2030,R1,2026,gasCCGT,1.01590000000
-6,2032,R1,2026,gasCCGT,1.01590000000
-6,2035,R1,2026,gasCCGT,1.01590000000
-6,2040,R1,2026,gasCCGT,1.01590000000
-6,2045,R1,2026,gasCCGT,1.01590000000
-6,2046,R1,2026,gasCCGT,1.01590000000
-6,2047,R1,2026,gasCCGT,1.01590000000
-6,2048,R1,2026,gasCCGT,1.01590000000
-6,2049,R1,2026,gasCCGT,1.01590000000
-6,2050,R1,2026,gasCCGT,1.01590000000
-6,2058,R1,2026,gasCCGT,1.01590000000
-6,2059,R1,2026,gasCCGT,1.01590000000
-6,2060,R1,2026,gasCCGT,1.01590000000
-6,2061,R1,2026,gasCCGT,1.01590000000
-6,2062,R1,2026,gasCCGT,1.01590000000
-7,2030,R1,2028,gasCCGT,1.01590000000
-7,2032,R1,2028,gasCCGT,1.01590000000
-7,2035,R1,2028,gasCCGT,1.01590000000
-7,2040,R1,2028,gasCCGT,1.01590000000
-7,2045,R1,2028,gasCCGT,1.01590000000
-7,2046,R1,2028,gasCCGT,1.01590000000
-7,2047,R1,2028,gasCCGT,1.01590000000
-7,2048,R1,2028,gasCCGT,1.01590000000
-7,2049,R1,2028,gasCCGT,1.01590000000
-7,2050,R1,2028,gasCCGT,1.01590000000
-7,2058,R1,2028,gasCCGT,1.01590000000
-7,2059,R1,2028,gasCCGT,1.01590000000
-7,2060,R1,2028,gasCCGT,1.01590000000
-7,2061,R1,2028,gasCCGT,1.01590000000
-7,2062,R1,2028,gasCCGT,1.01590000000
-7,2063,R1,2028,gasCCGT,1.01590000000
-7,2064,R1,2028,gasCCGT,1.01590000000
-8,2032,R1,2030,gasCCGT,1.01590000000
-8,2035,R1,2030,gasCCGT,1.01590000000
-8,2040,R1,2030,gasCCGT,1.01590000000
-8,2045,R1,2030,gasCCGT,1.01590000000
-8,2046,R1,2030,gasCCGT,1.01590000000
-8,2047,R1,2030,gasCCGT,1.01590000000
-8,2048,R1,2030,gasCCGT,1.01590000000
-8,2049,R1,2030,gasCCGT,1.01590000000
-8,2050,R1,2030,gasCCGT,1.01590000000
-8,2058,R1,2030,gasCCGT,1.01590000000
-8,2059,R1,2030,gasCCGT,1.01590000000
-8,2060,R1,2030,gasCCGT,1.01590000000
-8,2061,R1,2030,gasCCGT,1.01590000000
-8,2062,R1,2030,gasCCGT,1.01590000000
-8,2063,R1,2030,gasCCGT,1.01590000000
-8,2064,R1,2030,gasCCGT,1.01590000000
-8,2065,R1,2030,gasCCGT,1.01590000000
-8,2066,R1,2030,gasCCGT,1.01590000000
-10,2030,R2,2020,windturbine,12.17990000000
-10,2032,R2,2020,windturbine,12.17990000000
-10,2035,R2,2020,windturbine,12.17990000000
-10,2040,R2,2020,windturbine,12.17990000000
-10,2045,R2,2020,windturbine,12.17990000000
-10,2046,R2,2020,windturbine,12.17990000000
-11,2030,R2,2022,gasCCGT,0.80000000000
-11,2032,R2,2022,gasCCGT,0.80000000000
-11,2035,R2,2022,gasCCGT,0.80000000000
-11,2040,R2,2022,gasCCGT,0.80000000000
-11,2045,R2,2022,gasCCGT,0.80000000000
-11,2046,R2,2022,gasCCGT,0.80000000000
-11,2047,R2,2022,gasCCGT,0.80000000000
-11,2048,R2,2022,gasCCGT,0.80000000000
-11,2049,R2,2022,gasCCGT,0.80000000000
-11,2050,R2,2022,gasCCGT,0.80000000000
-11,2058,R2,2022,gasCCGT,0.80000000000
-12,2030,R2,2022,windturbine,0.48590000000
-12,2032,R2,2022,windturbine,0.48590000000
-12,2035,R2,2022,windturbine,0.48590000000
-12,2040,R2,2022,windturbine,0.48590000000
-12,2045,R2,2022,windturbine,0.48590000000
-12,2046,R2,2022,windturbine,0.48590000000
-12,2047,R2,2022,windturbine,0.48590000000
-12,2048,R2,2022,windturbine,0.48590000000
-13,2030,R2,2024,gasCCGT,3.20460000000
-13,2032,R2,2024,gasCCGT,3.20460000000
-13,2035,R2,2024,gasCCGT,3.20460000000
-13,2040,R2,2024,gasCCGT,3.20460000000
-13,2045,R2,2024,gasCCGT,3.20460000000
-13,2046,R2,2024,gasCCGT,3.20460000000
-13,2047,R2,2024,gasCCGT,3.20460000000
-13,2048,R2,2024,gasCCGT,3.20460000000
-13,2049,R2,2024,gasCCGT,3.20460000000
-13,2050,R2,2024,gasCCGT,3.20460000000
-13,2058,R2,2024,gasCCGT,3.20460000000
-13,2059,R2,2024,gasCCGT,3.20460000000
-13,2060,R2,2024,gasCCGT,3.20460000000
-14,2030,R2,2026,gasCCGT,1.01590000000
-14,2032,R2,2026,gasCCGT,1.01590000000
-14,2035,R2,2026,gasCCGT,1.01590000000
-14,2040,R2,2026,gasCCGT,1.01590000000
-14,2045,R2,2026,gasCCGT,1.01590000000
-14,2046,R2,2026,gasCCGT,1.01590000000
-14,2047,R2,2026,gasCCGT,1.01590000000
-14,2048,R2,2026,gasCCGT,1.01590000000
-14,2049,R2,2026,gasCCGT,1.01590000000
-14,2050,R2,2026,gasCCGT,1.01590000000
-14,2058,R2,2026,gasCCGT,1.01590000000
-14,2059,R2,2026,gasCCGT,1.01590000000
-14,2060,R2,2026,gasCCGT,1.01590000000
-14,2061,R2,2026,gasCCGT,1.01590000000
-14,2062,R2,2026,gasCCGT,1.01590000000
-15,2030,R2,2028,gasCCGT,1.01590000000
-15,2032,R2,2028,gasCCGT,1.01590000000
-15,2035,R2,2028,gasCCGT,1.01590000000
-15,2040,R2,2028,gasCCGT,1.01590000000
-15,2045,R2,2028,gasCCGT,1.01590000000
-15,2046,R2,2028,gasCCGT,1.01590000000
-15,2047,R2,2028,gasCCGT,1.01590000000
-15,2048,R2,2028,gasCCGT,1.01590000000
-15,2049,R2,2028,gasCCGT,1.01590000000
-15,2050,R2,2028,gasCCGT,1.01590000000
-15,2058,R2,2028,gasCCGT,1.01590000000
-15,2059,R2,2028,gasCCGT,1.01590000000
-15,2060,R2,2028,gasCCGT,1.01590000000
-15,2061,R2,2028,gasCCGT,1.01590000000
-15,2062,R2,2028,gasCCGT,1.01590000000
-15,2063,R2,2028,gasCCGT,1.01590000000
-15,2064,R2,2028,gasCCGT,1.01590000000
-16,2032,R2,2030,gasCCGT,1.01590000000
-16,2035,R2,2030,gasCCGT,1.01590000000
-16,2040,R2,2030,gasCCGT,1.01590000000
-16,2045,R2,2030,gasCCGT,1.01590000000
-16,2046,R2,2030,gasCCGT,1.01590000000
-16,2047,R2,2030,gasCCGT,1.01590000000
-16,2048,R2,2030,gasCCGT,1.01590000000
-16,2049,R2,2030,gasCCGT,1.01590000000
-16,2050,R2,2030,gasCCGT,1.01590000000
-16,2058,R2,2030,gasCCGT,1.01590000000
-16,2059,R2,2030,gasCCGT,1.01590000000
-16,2060,R2,2030,gasCCGT,1.01590000000
-16,2061,R2,2030,gasCCGT,1.01590000000
-16,2062,R2,2030,gasCCGT,1.01590000000
-16,2063,R2,2030,gasCCGT,1.01590000000
-16,2064,R2,2030,gasCCGT,1.01590000000
-16,2065,R2,2030,gasCCGT,1.01590000000
-16,2066,R2,2030,gasCCGT,1.01590000000
+asset,year,region,technology,installed,capacity
+1,2030,R1,gasCCGT,2022,0.80000000000
+1,2032,R1,gasCCGT,2022,0.80000000000
+1,2035,R1,gasCCGT,2022,0.80000000000
+1,2040,R1,gasCCGT,2022,0.80000000000
+1,2045,R1,gasCCGT,2022,0.80000000000
+1,2046,R1,gasCCGT,2022,0.80000000000
+1,2047,R1,gasCCGT,2022,0.80000000000
+1,2048,R1,gasCCGT,2022,0.80000000000
+1,2049,R1,gasCCGT,2022,0.80000000000
+1,2050,R1,gasCCGT,2022,0.80000000000
+1,2058,R1,gasCCGT,2022,0.80000000000
+2,2030,R1,gasCCGT,2024,3.20460000000
+2,2032,R1,gasCCGT,2024,3.20460000000
+2,2035,R1,gasCCGT,2024,3.20460000000
+2,2040,R1,gasCCGT,2024,3.20460000000
+2,2045,R1,gasCCGT,2024,3.20460000000
+2,2046,R1,gasCCGT,2024,3.20460000000
+2,2047,R1,gasCCGT,2024,3.20460000000
+2,2048,R1,gasCCGT,2024,3.20460000000
+2,2049,R1,gasCCGT,2024,3.20460000000
+2,2050,R1,gasCCGT,2024,3.20460000000
+2,2058,R1,gasCCGT,2024,3.20460000000
+2,2059,R1,gasCCGT,2024,3.20460000000
+2,2060,R1,gasCCGT,2024,3.20460000000
+3,2030,R1,gasCCGT,2026,1.01590000000
+3,2032,R1,gasCCGT,2026,1.01590000000
+3,2035,R1,gasCCGT,2026,1.01590000000
+3,2040,R1,gasCCGT,2026,1.01590000000
+3,2045,R1,gasCCGT,2026,1.01590000000
+3,2046,R1,gasCCGT,2026,1.01590000000
+3,2047,R1,gasCCGT,2026,1.01590000000
+3,2048,R1,gasCCGT,2026,1.01590000000
+3,2049,R1,gasCCGT,2026,1.01590000000
+3,2050,R1,gasCCGT,2026,1.01590000000
+3,2058,R1,gasCCGT,2026,1.01590000000
+3,2059,R1,gasCCGT,2026,1.01590000000
+3,2060,R1,gasCCGT,2026,1.01590000000
+3,2061,R1,gasCCGT,2026,1.01590000000
+3,2062,R1,gasCCGT,2026,1.01590000000
+4,2030,R1,gasCCGT,2028,1.01590000000
+4,2032,R1,gasCCGT,2028,1.01590000000
+4,2035,R1,gasCCGT,2028,1.01590000000
+4,2040,R1,gasCCGT,2028,1.01590000000
+4,2045,R1,gasCCGT,2028,1.01590000000
+4,2046,R1,gasCCGT,2028,1.01590000000
+4,2047,R1,gasCCGT,2028,1.01590000000
+4,2048,R1,gasCCGT,2028,1.01590000000
+4,2049,R1,gasCCGT,2028,1.01590000000
+4,2050,R1,gasCCGT,2028,1.01590000000
+4,2058,R1,gasCCGT,2028,1.01590000000
+4,2059,R1,gasCCGT,2028,1.01590000000
+4,2060,R1,gasCCGT,2028,1.01590000000
+4,2061,R1,gasCCGT,2028,1.01590000000
+4,2062,R1,gasCCGT,2028,1.01590000000
+4,2063,R1,gasCCGT,2028,1.01590000000
+4,2064,R1,gasCCGT,2028,1.01590000000
+5,2032,R1,gasCCGT,2030,1.01590000000
+5,2035,R1,gasCCGT,2030,1.01590000000
+5,2040,R1,gasCCGT,2030,1.01590000000
+5,2045,R1,gasCCGT,2030,1.01590000000
+5,2046,R1,gasCCGT,2030,1.01590000000
+5,2047,R1,gasCCGT,2030,1.01590000000
+5,2048,R1,gasCCGT,2030,1.01590000000
+5,2049,R1,gasCCGT,2030,1.01590000000
+5,2050,R1,gasCCGT,2030,1.01590000000
+5,2058,R1,gasCCGT,2030,1.01590000000
+5,2059,R1,gasCCGT,2030,1.01590000000
+5,2060,R1,gasCCGT,2030,1.01590000000
+5,2061,R1,gasCCGT,2030,1.01590000000
+5,2062,R1,gasCCGT,2030,1.01590000000
+5,2063,R1,gasCCGT,2030,1.01590000000
+5,2064,R1,gasCCGT,2030,1.01590000000
+5,2065,R1,gasCCGT,2030,1.01590000000
+5,2066,R1,gasCCGT,2030,1.01590000000
+6,2030,R1,solarPV,2020,4.17990000000
+6,2032,R1,solarPV,2020,4.17990000000
+6,2035,R1,solarPV,2020,4.17990000000
+6,2040,R1,solarPV,2020,4.17990000000
+6,2045,R1,solarPV,2020,4.17990000000
+6,2046,R1,solarPV,2020,4.17990000000
+7,2030,R1,windturbine,2020,8.00000000000
+7,2032,R1,windturbine,2020,8.00000000000
+7,2035,R1,windturbine,2020,8.00000000000
+7,2040,R1,windturbine,2020,8.00000000000
+7,2045,R1,windturbine,2020,8.00000000000
+7,2046,R1,windturbine,2020,8.00000000000
+8,2030,R1,windturbine,2022,0.48590000000
+8,2032,R1,windturbine,2022,0.48590000000
+8,2035,R1,windturbine,2022,0.48590000000
+8,2040,R1,windturbine,2022,0.48590000000
+8,2045,R1,windturbine,2022,0.48590000000
+8,2046,R1,windturbine,2022,0.48590000000
+8,2047,R1,windturbine,2022,0.48590000000
+8,2048,R1,windturbine,2022,0.48590000000
+10,2030,R2,gasCCGT,2022,0.80000000000
+10,2032,R2,gasCCGT,2022,0.80000000000
+10,2035,R2,gasCCGT,2022,0.80000000000
+10,2040,R2,gasCCGT,2022,0.80000000000
+10,2045,R2,gasCCGT,2022,0.80000000000
+10,2046,R2,gasCCGT,2022,0.80000000000
+10,2047,R2,gasCCGT,2022,0.80000000000
+10,2048,R2,gasCCGT,2022,0.80000000000
+10,2049,R2,gasCCGT,2022,0.80000000000
+10,2050,R2,gasCCGT,2022,0.80000000000
+10,2058,R2,gasCCGT,2022,0.80000000000
+11,2030,R2,gasCCGT,2024,3.20460000000
+11,2032,R2,gasCCGT,2024,3.20460000000
+11,2035,R2,gasCCGT,2024,3.20460000000
+11,2040,R2,gasCCGT,2024,3.20460000000
+11,2045,R2,gasCCGT,2024,3.20460000000
+11,2046,R2,gasCCGT,2024,3.20460000000
+11,2047,R2,gasCCGT,2024,3.20460000000
+11,2048,R2,gasCCGT,2024,3.20460000000
+11,2049,R2,gasCCGT,2024,3.20460000000
+11,2050,R2,gasCCGT,2024,3.20460000000
+11,2058,R2,gasCCGT,2024,3.20460000000
+11,2059,R2,gasCCGT,2024,3.20460000000
+11,2060,R2,gasCCGT,2024,3.20460000000
+12,2030,R2,gasCCGT,2026,1.01590000000
+12,2032,R2,gasCCGT,2026,1.01590000000
+12,2035,R2,gasCCGT,2026,1.01590000000
+12,2040,R2,gasCCGT,2026,1.01590000000
+12,2045,R2,gasCCGT,2026,1.01590000000
+12,2046,R2,gasCCGT,2026,1.01590000000
+12,2047,R2,gasCCGT,2026,1.01590000000
+12,2048,R2,gasCCGT,2026,1.01590000000
+12,2049,R2,gasCCGT,2026,1.01590000000
+12,2050,R2,gasCCGT,2026,1.01590000000
+12,2058,R2,gasCCGT,2026,1.01590000000
+12,2059,R2,gasCCGT,2026,1.01590000000
+12,2060,R2,gasCCGT,2026,1.01590000000
+12,2061,R2,gasCCGT,2026,1.01590000000
+12,2062,R2,gasCCGT,2026,1.01590000000
+13,2030,R2,gasCCGT,2028,1.01590000000
+13,2032,R2,gasCCGT,2028,1.01590000000
+13,2035,R2,gasCCGT,2028,1.01590000000
+13,2040,R2,gasCCGT,2028,1.01590000000
+13,2045,R2,gasCCGT,2028,1.01590000000
+13,2046,R2,gasCCGT,2028,1.01590000000
+13,2047,R2,gasCCGT,2028,1.01590000000
+13,2048,R2,gasCCGT,2028,1.01590000000
+13,2049,R2,gasCCGT,2028,1.01590000000
+13,2050,R2,gasCCGT,2028,1.01590000000
+13,2058,R2,gasCCGT,2028,1.01590000000
+13,2059,R2,gasCCGT,2028,1.01590000000
+13,2060,R2,gasCCGT,2028,1.01590000000
+13,2061,R2,gasCCGT,2028,1.01590000000
+13,2062,R2,gasCCGT,2028,1.01590000000
+13,2063,R2,gasCCGT,2028,1.01590000000
+13,2064,R2,gasCCGT,2028,1.01590000000
+14,2032,R2,gasCCGT,2030,1.01590000000
+14,2035,R2,gasCCGT,2030,1.01590000000
+14,2040,R2,gasCCGT,2030,1.01590000000
+14,2045,R2,gasCCGT,2030,1.01590000000
+14,2046,R2,gasCCGT,2030,1.01590000000
+14,2047,R2,gasCCGT,2030,1.01590000000
+14,2048,R2,gasCCGT,2030,1.01590000000
+14,2049,R2,gasCCGT,2030,1.01590000000
+14,2050,R2,gasCCGT,2030,1.01590000000
+14,2058,R2,gasCCGT,2030,1.01590000000
+14,2059,R2,gasCCGT,2030,1.01590000000
+14,2060,R2,gasCCGT,2030,1.01590000000
+14,2061,R2,gasCCGT,2030,1.01590000000
+14,2062,R2,gasCCGT,2030,1.01590000000
+14,2063,R2,gasCCGT,2030,1.01590000000
+14,2064,R2,gasCCGT,2030,1.01590000000
+14,2065,R2,gasCCGT,2030,1.01590000000
+14,2066,R2,gasCCGT,2030,1.01590000000
+15,2030,R2,windturbine,2020,12.17990000000
+15,2032,R2,windturbine,2020,12.17990000000
+15,2035,R2,windturbine,2020,12.17990000000
+15,2040,R2,windturbine,2020,12.17990000000
+15,2045,R2,windturbine,2020,12.17990000000
+15,2046,R2,windturbine,2020,12.17990000000
+16,2030,R2,windturbine,2022,0.48590000000
+16,2032,R2,windturbine,2022,0.48590000000
+16,2035,R2,windturbine,2022,0.48590000000
+16,2040,R2,windturbine,2022,0.48590000000
+16,2045,R2,windturbine,2022,0.48590000000
+16,2046,R2,windturbine,2022,0.48590000000
+16,2047,R2,windturbine,2022,0.48590000000
+16,2048,R2,windturbine,2022,0.48590000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2032.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2032.csv
index 8700e017a..d9b12ffd3 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2032.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2032.csv
@@ -1,205 +1,205 @@
-asset,year,region,installed,technology,capacity
-1,2032,R1,2020,solarPV,4.17990000000
-1,2034,R1,2020,solarPV,4.17990000000
-1,2035,R1,2020,solarPV,4.17990000000
-1,2040,R1,2020,solarPV,4.17990000000
-1,2045,R1,2020,solarPV,4.17990000000
-1,2046,R1,2020,solarPV,4.17990000000
-2,2032,R1,2020,windturbine,8.00000000000
-2,2034,R1,2020,windturbine,8.00000000000
-2,2035,R1,2020,windturbine,8.00000000000
-2,2040,R1,2020,windturbine,8.00000000000
-2,2045,R1,2020,windturbine,8.00000000000
-2,2046,R1,2020,windturbine,8.00000000000
-3,2032,R1,2022,gasCCGT,0.80000000000
-3,2034,R1,2022,gasCCGT,0.80000000000
-3,2035,R1,2022,gasCCGT,0.80000000000
-3,2040,R1,2022,gasCCGT,0.80000000000
-3,2045,R1,2022,gasCCGT,0.80000000000
-3,2046,R1,2022,gasCCGT,0.80000000000
-3,2047,R1,2022,gasCCGT,0.80000000000
-3,2048,R1,2022,gasCCGT,0.80000000000
-3,2049,R1,2022,gasCCGT,0.80000000000
-3,2050,R1,2022,gasCCGT,0.80000000000
-3,2058,R1,2022,gasCCGT,0.80000000000
-4,2032,R1,2022,windturbine,0.48590000000
-4,2034,R1,2022,windturbine,0.48590000000
-4,2035,R1,2022,windturbine,0.48590000000
-4,2040,R1,2022,windturbine,0.48590000000
-4,2045,R1,2022,windturbine,0.48590000000
-4,2046,R1,2022,windturbine,0.48590000000
-4,2047,R1,2022,windturbine,0.48590000000
-4,2048,R1,2022,windturbine,0.48590000000
-5,2032,R1,2024,gasCCGT,3.20460000000
-5,2034,R1,2024,gasCCGT,3.20460000000
-5,2035,R1,2024,gasCCGT,3.20460000000
-5,2040,R1,2024,gasCCGT,3.20460000000
-5,2045,R1,2024,gasCCGT,3.20460000000
-5,2046,R1,2024,gasCCGT,3.20460000000
-5,2047,R1,2024,gasCCGT,3.20460000000
-5,2048,R1,2024,gasCCGT,3.20460000000
-5,2049,R1,2024,gasCCGT,3.20460000000
-5,2050,R1,2024,gasCCGT,3.20460000000
-5,2058,R1,2024,gasCCGT,3.20460000000
-5,2059,R1,2024,gasCCGT,3.20460000000
-5,2060,R1,2024,gasCCGT,3.20460000000
-6,2032,R1,2026,gasCCGT,1.01590000000
-6,2034,R1,2026,gasCCGT,1.01590000000
-6,2035,R1,2026,gasCCGT,1.01590000000
-6,2040,R1,2026,gasCCGT,1.01590000000
-6,2045,R1,2026,gasCCGT,1.01590000000
-6,2046,R1,2026,gasCCGT,1.01590000000
-6,2047,R1,2026,gasCCGT,1.01590000000
-6,2048,R1,2026,gasCCGT,1.01590000000
-6,2049,R1,2026,gasCCGT,1.01590000000
-6,2050,R1,2026,gasCCGT,1.01590000000
-6,2058,R1,2026,gasCCGT,1.01590000000
-6,2059,R1,2026,gasCCGT,1.01590000000
-6,2060,R1,2026,gasCCGT,1.01590000000
-6,2061,R1,2026,gasCCGT,1.01590000000
-6,2062,R1,2026,gasCCGT,1.01590000000
-7,2032,R1,2028,gasCCGT,1.01590000000
-7,2034,R1,2028,gasCCGT,1.01590000000
-7,2035,R1,2028,gasCCGT,1.01590000000
-7,2040,R1,2028,gasCCGT,1.01590000000
-7,2045,R1,2028,gasCCGT,1.01590000000
-7,2046,R1,2028,gasCCGT,1.01590000000
-7,2047,R1,2028,gasCCGT,1.01590000000
-7,2048,R1,2028,gasCCGT,1.01590000000
-7,2049,R1,2028,gasCCGT,1.01590000000
-7,2050,R1,2028,gasCCGT,1.01590000000
-7,2058,R1,2028,gasCCGT,1.01590000000
-7,2059,R1,2028,gasCCGT,1.01590000000
-7,2060,R1,2028,gasCCGT,1.01590000000
-7,2061,R1,2028,gasCCGT,1.01590000000
-7,2062,R1,2028,gasCCGT,1.01590000000
-7,2063,R1,2028,gasCCGT,1.01590000000
-7,2064,R1,2028,gasCCGT,1.01590000000
-8,2032,R1,2030,gasCCGT,1.01590000000
-8,2034,R1,2030,gasCCGT,1.01590000000
-8,2035,R1,2030,gasCCGT,1.01590000000
-8,2040,R1,2030,gasCCGT,1.01590000000
-8,2045,R1,2030,gasCCGT,1.01590000000
-8,2046,R1,2030,gasCCGT,1.01590000000
-8,2047,R1,2030,gasCCGT,1.01590000000
-8,2048,R1,2030,gasCCGT,1.01590000000
-8,2049,R1,2030,gasCCGT,1.01590000000
-8,2050,R1,2030,gasCCGT,1.01590000000
-8,2058,R1,2030,gasCCGT,1.01590000000
-8,2059,R1,2030,gasCCGT,1.01590000000
-8,2060,R1,2030,gasCCGT,1.01590000000
-8,2061,R1,2030,gasCCGT,1.01590000000
-8,2062,R1,2030,gasCCGT,1.01590000000
-8,2063,R1,2030,gasCCGT,1.01590000000
-8,2064,R1,2030,gasCCGT,1.01590000000
-8,2065,R1,2030,gasCCGT,1.01590000000
-8,2066,R1,2030,gasCCGT,1.01590000000
-9,2034,R1,2032,solarPV,2.28590000000
-9,2035,R1,2032,solarPV,2.28590000000
-9,2040,R1,2032,solarPV,2.28590000000
-9,2045,R1,2032,solarPV,2.28590000000
-9,2046,R1,2032,solarPV,2.28590000000
-9,2047,R1,2032,solarPV,2.28590000000
-9,2048,R1,2032,solarPV,2.28590000000
-9,2049,R1,2032,solarPV,2.28590000000
-9,2050,R1,2032,solarPV,2.28590000000
-9,2058,R1,2032,solarPV,2.28590000000
-11,2032,R2,2020,windturbine,12.17990000000
-11,2034,R2,2020,windturbine,12.17990000000
-11,2035,R2,2020,windturbine,12.17990000000
-11,2040,R2,2020,windturbine,12.17990000000
-11,2045,R2,2020,windturbine,12.17990000000
-11,2046,R2,2020,windturbine,12.17990000000
-12,2032,R2,2022,gasCCGT,0.80000000000
-12,2034,R2,2022,gasCCGT,0.80000000000
-12,2035,R2,2022,gasCCGT,0.80000000000
-12,2040,R2,2022,gasCCGT,0.80000000000
-12,2045,R2,2022,gasCCGT,0.80000000000
-12,2046,R2,2022,gasCCGT,0.80000000000
-12,2047,R2,2022,gasCCGT,0.80000000000
-12,2048,R2,2022,gasCCGT,0.80000000000
-12,2049,R2,2022,gasCCGT,0.80000000000
-12,2050,R2,2022,gasCCGT,0.80000000000
-12,2058,R2,2022,gasCCGT,0.80000000000
-13,2032,R2,2022,windturbine,0.48590000000
-13,2034,R2,2022,windturbine,0.48590000000
-13,2035,R2,2022,windturbine,0.48590000000
-13,2040,R2,2022,windturbine,0.48590000000
-13,2045,R2,2022,windturbine,0.48590000000
-13,2046,R2,2022,windturbine,0.48590000000
-13,2047,R2,2022,windturbine,0.48590000000
-13,2048,R2,2022,windturbine,0.48590000000
-14,2032,R2,2024,gasCCGT,3.20460000000
-14,2034,R2,2024,gasCCGT,3.20460000000
-14,2035,R2,2024,gasCCGT,3.20460000000
-14,2040,R2,2024,gasCCGT,3.20460000000
-14,2045,R2,2024,gasCCGT,3.20460000000
-14,2046,R2,2024,gasCCGT,3.20460000000
-14,2047,R2,2024,gasCCGT,3.20460000000
-14,2048,R2,2024,gasCCGT,3.20460000000
-14,2049,R2,2024,gasCCGT,3.20460000000
-14,2050,R2,2024,gasCCGT,3.20460000000
-14,2058,R2,2024,gasCCGT,3.20460000000
-14,2059,R2,2024,gasCCGT,3.20460000000
-14,2060,R2,2024,gasCCGT,3.20460000000
-15,2032,R2,2026,gasCCGT,1.01590000000
-15,2034,R2,2026,gasCCGT,1.01590000000
-15,2035,R2,2026,gasCCGT,1.01590000000
-15,2040,R2,2026,gasCCGT,1.01590000000
-15,2045,R2,2026,gasCCGT,1.01590000000
-15,2046,R2,2026,gasCCGT,1.01590000000
-15,2047,R2,2026,gasCCGT,1.01590000000
-15,2048,R2,2026,gasCCGT,1.01590000000
-15,2049,R2,2026,gasCCGT,1.01590000000
-15,2050,R2,2026,gasCCGT,1.01590000000
-15,2058,R2,2026,gasCCGT,1.01590000000
-15,2059,R2,2026,gasCCGT,1.01590000000
-15,2060,R2,2026,gasCCGT,1.01590000000
-15,2061,R2,2026,gasCCGT,1.01590000000
-15,2062,R2,2026,gasCCGT,1.01590000000
-16,2032,R2,2028,gasCCGT,1.01590000000
-16,2034,R2,2028,gasCCGT,1.01590000000
-16,2035,R2,2028,gasCCGT,1.01590000000
-16,2040,R2,2028,gasCCGT,1.01590000000
-16,2045,R2,2028,gasCCGT,1.01590000000
-16,2046,R2,2028,gasCCGT,1.01590000000
-16,2047,R2,2028,gasCCGT,1.01590000000
-16,2048,R2,2028,gasCCGT,1.01590000000
-16,2049,R2,2028,gasCCGT,1.01590000000
-16,2050,R2,2028,gasCCGT,1.01590000000
-16,2058,R2,2028,gasCCGT,1.01590000000
-16,2059,R2,2028,gasCCGT,1.01590000000
-16,2060,R2,2028,gasCCGT,1.01590000000
-16,2061,R2,2028,gasCCGT,1.01590000000
-16,2062,R2,2028,gasCCGT,1.01590000000
-16,2063,R2,2028,gasCCGT,1.01590000000
-16,2064,R2,2028,gasCCGT,1.01590000000
-17,2032,R2,2030,gasCCGT,1.01590000000
-17,2034,R2,2030,gasCCGT,1.01590000000
-17,2035,R2,2030,gasCCGT,1.01590000000
-17,2040,R2,2030,gasCCGT,1.01590000000
-17,2045,R2,2030,gasCCGT,1.01590000000
-17,2046,R2,2030,gasCCGT,1.01590000000
-17,2047,R2,2030,gasCCGT,1.01590000000
-17,2048,R2,2030,gasCCGT,1.01590000000
-17,2049,R2,2030,gasCCGT,1.01590000000
-17,2050,R2,2030,gasCCGT,1.01590000000
-17,2058,R2,2030,gasCCGT,1.01590000000
-17,2059,R2,2030,gasCCGT,1.01590000000
-17,2060,R2,2030,gasCCGT,1.01590000000
-17,2061,R2,2030,gasCCGT,1.01590000000
-17,2062,R2,2030,gasCCGT,1.01590000000
-17,2063,R2,2030,gasCCGT,1.01590000000
-17,2064,R2,2030,gasCCGT,1.01590000000
-17,2065,R2,2030,gasCCGT,1.01590000000
-17,2066,R2,2030,gasCCGT,1.01590000000
-18,2034,R2,2032,solarPV,2.28590000000
-18,2035,R2,2032,solarPV,2.28590000000
-18,2040,R2,2032,solarPV,2.28590000000
-18,2045,R2,2032,solarPV,2.28590000000
-18,2046,R2,2032,solarPV,2.28590000000
-18,2047,R2,2032,solarPV,2.28590000000
-18,2048,R2,2032,solarPV,2.28590000000
-18,2049,R2,2032,solarPV,2.28590000000
-18,2050,R2,2032,solarPV,2.28590000000
-18,2058,R2,2032,solarPV,2.28590000000
+asset,year,region,technology,installed,capacity
+1,2032,R1,gasCCGT,2022,0.80000000000
+1,2034,R1,gasCCGT,2022,0.80000000000
+1,2035,R1,gasCCGT,2022,0.80000000000
+1,2040,R1,gasCCGT,2022,0.80000000000
+1,2045,R1,gasCCGT,2022,0.80000000000
+1,2046,R1,gasCCGT,2022,0.80000000000
+1,2047,R1,gasCCGT,2022,0.80000000000
+1,2048,R1,gasCCGT,2022,0.80000000000
+1,2049,R1,gasCCGT,2022,0.80000000000
+1,2050,R1,gasCCGT,2022,0.80000000000
+1,2058,R1,gasCCGT,2022,0.80000000000
+2,2032,R1,gasCCGT,2024,3.20460000000
+2,2034,R1,gasCCGT,2024,3.20460000000
+2,2035,R1,gasCCGT,2024,3.20460000000
+2,2040,R1,gasCCGT,2024,3.20460000000
+2,2045,R1,gasCCGT,2024,3.20460000000
+2,2046,R1,gasCCGT,2024,3.20460000000
+2,2047,R1,gasCCGT,2024,3.20460000000
+2,2048,R1,gasCCGT,2024,3.20460000000
+2,2049,R1,gasCCGT,2024,3.20460000000
+2,2050,R1,gasCCGT,2024,3.20460000000
+2,2058,R1,gasCCGT,2024,3.20460000000
+2,2059,R1,gasCCGT,2024,3.20460000000
+2,2060,R1,gasCCGT,2024,3.20460000000
+3,2032,R1,gasCCGT,2026,1.01590000000
+3,2034,R1,gasCCGT,2026,1.01590000000
+3,2035,R1,gasCCGT,2026,1.01590000000
+3,2040,R1,gasCCGT,2026,1.01590000000
+3,2045,R1,gasCCGT,2026,1.01590000000
+3,2046,R1,gasCCGT,2026,1.01590000000
+3,2047,R1,gasCCGT,2026,1.01590000000
+3,2048,R1,gasCCGT,2026,1.01590000000
+3,2049,R1,gasCCGT,2026,1.01590000000
+3,2050,R1,gasCCGT,2026,1.01590000000
+3,2058,R1,gasCCGT,2026,1.01590000000
+3,2059,R1,gasCCGT,2026,1.01590000000
+3,2060,R1,gasCCGT,2026,1.01590000000
+3,2061,R1,gasCCGT,2026,1.01590000000
+3,2062,R1,gasCCGT,2026,1.01590000000
+4,2032,R1,gasCCGT,2028,1.01590000000
+4,2034,R1,gasCCGT,2028,1.01590000000
+4,2035,R1,gasCCGT,2028,1.01590000000
+4,2040,R1,gasCCGT,2028,1.01590000000
+4,2045,R1,gasCCGT,2028,1.01590000000
+4,2046,R1,gasCCGT,2028,1.01590000000
+4,2047,R1,gasCCGT,2028,1.01590000000
+4,2048,R1,gasCCGT,2028,1.01590000000
+4,2049,R1,gasCCGT,2028,1.01590000000
+4,2050,R1,gasCCGT,2028,1.01590000000
+4,2058,R1,gasCCGT,2028,1.01590000000
+4,2059,R1,gasCCGT,2028,1.01590000000
+4,2060,R1,gasCCGT,2028,1.01590000000
+4,2061,R1,gasCCGT,2028,1.01590000000
+4,2062,R1,gasCCGT,2028,1.01590000000
+4,2063,R1,gasCCGT,2028,1.01590000000
+4,2064,R1,gasCCGT,2028,1.01590000000
+5,2032,R1,gasCCGT,2030,1.01590000000
+5,2034,R1,gasCCGT,2030,1.01590000000
+5,2035,R1,gasCCGT,2030,1.01590000000
+5,2040,R1,gasCCGT,2030,1.01590000000
+5,2045,R1,gasCCGT,2030,1.01590000000
+5,2046,R1,gasCCGT,2030,1.01590000000
+5,2047,R1,gasCCGT,2030,1.01590000000
+5,2048,R1,gasCCGT,2030,1.01590000000
+5,2049,R1,gasCCGT,2030,1.01590000000
+5,2050,R1,gasCCGT,2030,1.01590000000
+5,2058,R1,gasCCGT,2030,1.01590000000
+5,2059,R1,gasCCGT,2030,1.01590000000
+5,2060,R1,gasCCGT,2030,1.01590000000
+5,2061,R1,gasCCGT,2030,1.01590000000
+5,2062,R1,gasCCGT,2030,1.01590000000
+5,2063,R1,gasCCGT,2030,1.01590000000
+5,2064,R1,gasCCGT,2030,1.01590000000
+5,2065,R1,gasCCGT,2030,1.01590000000
+5,2066,R1,gasCCGT,2030,1.01590000000
+6,2032,R1,solarPV,2020,4.17990000000
+6,2034,R1,solarPV,2020,4.17990000000
+6,2035,R1,solarPV,2020,4.17990000000
+6,2040,R1,solarPV,2020,4.17990000000
+6,2045,R1,solarPV,2020,4.17990000000
+6,2046,R1,solarPV,2020,4.17990000000
+7,2034,R1,solarPV,2032,2.28590000000
+7,2035,R1,solarPV,2032,2.28590000000
+7,2040,R1,solarPV,2032,2.28590000000
+7,2045,R1,solarPV,2032,2.28590000000
+7,2046,R1,solarPV,2032,2.28590000000
+7,2047,R1,solarPV,2032,2.28590000000
+7,2048,R1,solarPV,2032,2.28590000000
+7,2049,R1,solarPV,2032,2.28590000000
+7,2050,R1,solarPV,2032,2.28590000000
+7,2058,R1,solarPV,2032,2.28590000000
+8,2032,R1,windturbine,2020,8.00000000000
+8,2034,R1,windturbine,2020,8.00000000000
+8,2035,R1,windturbine,2020,8.00000000000
+8,2040,R1,windturbine,2020,8.00000000000
+8,2045,R1,windturbine,2020,8.00000000000
+8,2046,R1,windturbine,2020,8.00000000000
+9,2032,R1,windturbine,2022,0.48590000000
+9,2034,R1,windturbine,2022,0.48590000000
+9,2035,R1,windturbine,2022,0.48590000000
+9,2040,R1,windturbine,2022,0.48590000000
+9,2045,R1,windturbine,2022,0.48590000000
+9,2046,R1,windturbine,2022,0.48590000000
+9,2047,R1,windturbine,2022,0.48590000000
+9,2048,R1,windturbine,2022,0.48590000000
+11,2032,R2,gasCCGT,2022,0.80000000000
+11,2034,R2,gasCCGT,2022,0.80000000000
+11,2035,R2,gasCCGT,2022,0.80000000000
+11,2040,R2,gasCCGT,2022,0.80000000000
+11,2045,R2,gasCCGT,2022,0.80000000000
+11,2046,R2,gasCCGT,2022,0.80000000000
+11,2047,R2,gasCCGT,2022,0.80000000000
+11,2048,R2,gasCCGT,2022,0.80000000000
+11,2049,R2,gasCCGT,2022,0.80000000000
+11,2050,R2,gasCCGT,2022,0.80000000000
+11,2058,R2,gasCCGT,2022,0.80000000000
+12,2032,R2,gasCCGT,2024,3.20460000000
+12,2034,R2,gasCCGT,2024,3.20460000000
+12,2035,R2,gasCCGT,2024,3.20460000000
+12,2040,R2,gasCCGT,2024,3.20460000000
+12,2045,R2,gasCCGT,2024,3.20460000000
+12,2046,R2,gasCCGT,2024,3.20460000000
+12,2047,R2,gasCCGT,2024,3.20460000000
+12,2048,R2,gasCCGT,2024,3.20460000000
+12,2049,R2,gasCCGT,2024,3.20460000000
+12,2050,R2,gasCCGT,2024,3.20460000000
+12,2058,R2,gasCCGT,2024,3.20460000000
+12,2059,R2,gasCCGT,2024,3.20460000000
+12,2060,R2,gasCCGT,2024,3.20460000000
+13,2032,R2,gasCCGT,2026,1.01590000000
+13,2034,R2,gasCCGT,2026,1.01590000000
+13,2035,R2,gasCCGT,2026,1.01590000000
+13,2040,R2,gasCCGT,2026,1.01590000000
+13,2045,R2,gasCCGT,2026,1.01590000000
+13,2046,R2,gasCCGT,2026,1.01590000000
+13,2047,R2,gasCCGT,2026,1.01590000000
+13,2048,R2,gasCCGT,2026,1.01590000000
+13,2049,R2,gasCCGT,2026,1.01590000000
+13,2050,R2,gasCCGT,2026,1.01590000000
+13,2058,R2,gasCCGT,2026,1.01590000000
+13,2059,R2,gasCCGT,2026,1.01590000000
+13,2060,R2,gasCCGT,2026,1.01590000000
+13,2061,R2,gasCCGT,2026,1.01590000000
+13,2062,R2,gasCCGT,2026,1.01590000000
+14,2032,R2,gasCCGT,2028,1.01590000000
+14,2034,R2,gasCCGT,2028,1.01590000000
+14,2035,R2,gasCCGT,2028,1.01590000000
+14,2040,R2,gasCCGT,2028,1.01590000000
+14,2045,R2,gasCCGT,2028,1.01590000000
+14,2046,R2,gasCCGT,2028,1.01590000000
+14,2047,R2,gasCCGT,2028,1.01590000000
+14,2048,R2,gasCCGT,2028,1.01590000000
+14,2049,R2,gasCCGT,2028,1.01590000000
+14,2050,R2,gasCCGT,2028,1.01590000000
+14,2058,R2,gasCCGT,2028,1.01590000000
+14,2059,R2,gasCCGT,2028,1.01590000000
+14,2060,R2,gasCCGT,2028,1.01590000000
+14,2061,R2,gasCCGT,2028,1.01590000000
+14,2062,R2,gasCCGT,2028,1.01590000000
+14,2063,R2,gasCCGT,2028,1.01590000000
+14,2064,R2,gasCCGT,2028,1.01590000000
+15,2032,R2,gasCCGT,2030,1.01590000000
+15,2034,R2,gasCCGT,2030,1.01590000000
+15,2035,R2,gasCCGT,2030,1.01590000000
+15,2040,R2,gasCCGT,2030,1.01590000000
+15,2045,R2,gasCCGT,2030,1.01590000000
+15,2046,R2,gasCCGT,2030,1.01590000000
+15,2047,R2,gasCCGT,2030,1.01590000000
+15,2048,R2,gasCCGT,2030,1.01590000000
+15,2049,R2,gasCCGT,2030,1.01590000000
+15,2050,R2,gasCCGT,2030,1.01590000000
+15,2058,R2,gasCCGT,2030,1.01590000000
+15,2059,R2,gasCCGT,2030,1.01590000000
+15,2060,R2,gasCCGT,2030,1.01590000000
+15,2061,R2,gasCCGT,2030,1.01590000000
+15,2062,R2,gasCCGT,2030,1.01590000000
+15,2063,R2,gasCCGT,2030,1.01590000000
+15,2064,R2,gasCCGT,2030,1.01590000000
+15,2065,R2,gasCCGT,2030,1.01590000000
+15,2066,R2,gasCCGT,2030,1.01590000000
+16,2034,R2,solarPV,2032,2.28590000000
+16,2035,R2,solarPV,2032,2.28590000000
+16,2040,R2,solarPV,2032,2.28590000000
+16,2045,R2,solarPV,2032,2.28590000000
+16,2046,R2,solarPV,2032,2.28590000000
+16,2047,R2,solarPV,2032,2.28590000000
+16,2048,R2,solarPV,2032,2.28590000000
+16,2049,R2,solarPV,2032,2.28590000000
+16,2050,R2,solarPV,2032,2.28590000000
+16,2058,R2,solarPV,2032,2.28590000000
+17,2032,R2,windturbine,2020,12.17990000000
+17,2034,R2,windturbine,2020,12.17990000000
+17,2035,R2,windturbine,2020,12.17990000000
+17,2040,R2,windturbine,2020,12.17990000000
+17,2045,R2,windturbine,2020,12.17990000000
+17,2046,R2,windturbine,2020,12.17990000000
+18,2032,R2,windturbine,2022,0.48590000000
+18,2034,R2,windturbine,2022,0.48590000000
+18,2035,R2,windturbine,2022,0.48590000000
+18,2040,R2,windturbine,2022,0.48590000000
+18,2045,R2,windturbine,2022,0.48590000000
+18,2046,R2,windturbine,2022,0.48590000000
+18,2047,R2,windturbine,2022,0.48590000000
+18,2048,R2,windturbine,2022,0.48590000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2034.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2034.csv
index f5d513a8a..74a26d6bd 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2034.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2034.csv
@@ -1,240 +1,240 @@
-asset,year,region,installed,technology,capacity
-1,2034,R1,2020,solarPV,4.17990000000
-1,2035,R1,2020,solarPV,4.17990000000
-1,2036,R1,2020,solarPV,4.17990000000
-1,2040,R1,2020,solarPV,4.17990000000
-1,2045,R1,2020,solarPV,4.17990000000
-1,2046,R1,2020,solarPV,4.17990000000
-2,2034,R1,2020,windturbine,8.00000000000
-2,2035,R1,2020,windturbine,8.00000000000
-2,2036,R1,2020,windturbine,8.00000000000
-2,2040,R1,2020,windturbine,8.00000000000
-2,2045,R1,2020,windturbine,8.00000000000
-2,2046,R1,2020,windturbine,8.00000000000
-3,2034,R1,2022,gasCCGT,0.80000000000
-3,2035,R1,2022,gasCCGT,0.80000000000
-3,2036,R1,2022,gasCCGT,0.80000000000
-3,2040,R1,2022,gasCCGT,0.80000000000
-3,2045,R1,2022,gasCCGT,0.80000000000
-3,2046,R1,2022,gasCCGT,0.80000000000
-3,2047,R1,2022,gasCCGT,0.80000000000
-3,2048,R1,2022,gasCCGT,0.80000000000
-3,2049,R1,2022,gasCCGT,0.80000000000
-3,2050,R1,2022,gasCCGT,0.80000000000
-3,2058,R1,2022,gasCCGT,0.80000000000
-4,2034,R1,2022,windturbine,0.48590000000
-4,2035,R1,2022,windturbine,0.48590000000
-4,2036,R1,2022,windturbine,0.48590000000
-4,2040,R1,2022,windturbine,0.48590000000
-4,2045,R1,2022,windturbine,0.48590000000
-4,2046,R1,2022,windturbine,0.48590000000
-4,2047,R1,2022,windturbine,0.48590000000
-4,2048,R1,2022,windturbine,0.48590000000
-5,2034,R1,2024,gasCCGT,3.20460000000
-5,2035,R1,2024,gasCCGT,3.20460000000
-5,2036,R1,2024,gasCCGT,3.20460000000
-5,2040,R1,2024,gasCCGT,3.20460000000
-5,2045,R1,2024,gasCCGT,3.20460000000
-5,2046,R1,2024,gasCCGT,3.20460000000
-5,2047,R1,2024,gasCCGT,3.20460000000
-5,2048,R1,2024,gasCCGT,3.20460000000
-5,2049,R1,2024,gasCCGT,3.20460000000
-5,2050,R1,2024,gasCCGT,3.20460000000
-5,2058,R1,2024,gasCCGT,3.20460000000
-5,2059,R1,2024,gasCCGT,3.20460000000
-5,2060,R1,2024,gasCCGT,3.20460000000
-6,2034,R1,2026,gasCCGT,1.01590000000
-6,2035,R1,2026,gasCCGT,1.01590000000
-6,2036,R1,2026,gasCCGT,1.01590000000
-6,2040,R1,2026,gasCCGT,1.01590000000
-6,2045,R1,2026,gasCCGT,1.01590000000
-6,2046,R1,2026,gasCCGT,1.01590000000
-6,2047,R1,2026,gasCCGT,1.01590000000
-6,2048,R1,2026,gasCCGT,1.01590000000
-6,2049,R1,2026,gasCCGT,1.01590000000
-6,2050,R1,2026,gasCCGT,1.01590000000
-6,2058,R1,2026,gasCCGT,1.01590000000
-6,2059,R1,2026,gasCCGT,1.01590000000
-6,2060,R1,2026,gasCCGT,1.01590000000
-6,2061,R1,2026,gasCCGT,1.01590000000
-6,2062,R1,2026,gasCCGT,1.01590000000
-7,2034,R1,2028,gasCCGT,1.01590000000
-7,2035,R1,2028,gasCCGT,1.01590000000
-7,2036,R1,2028,gasCCGT,1.01590000000
-7,2040,R1,2028,gasCCGT,1.01590000000
-7,2045,R1,2028,gasCCGT,1.01590000000
-7,2046,R1,2028,gasCCGT,1.01590000000
-7,2047,R1,2028,gasCCGT,1.01590000000
-7,2048,R1,2028,gasCCGT,1.01590000000
-7,2049,R1,2028,gasCCGT,1.01590000000
-7,2050,R1,2028,gasCCGT,1.01590000000
-7,2058,R1,2028,gasCCGT,1.01590000000
-7,2059,R1,2028,gasCCGT,1.01590000000
-7,2060,R1,2028,gasCCGT,1.01590000000
-7,2061,R1,2028,gasCCGT,1.01590000000
-7,2062,R1,2028,gasCCGT,1.01590000000
-7,2063,R1,2028,gasCCGT,1.01590000000
-7,2064,R1,2028,gasCCGT,1.01590000000
-8,2034,R1,2030,gasCCGT,1.01590000000
-8,2035,R1,2030,gasCCGT,1.01590000000
-8,2036,R1,2030,gasCCGT,1.01590000000
-8,2040,R1,2030,gasCCGT,1.01590000000
-8,2045,R1,2030,gasCCGT,1.01590000000
-8,2046,R1,2030,gasCCGT,1.01590000000
-8,2047,R1,2030,gasCCGT,1.01590000000
-8,2048,R1,2030,gasCCGT,1.01590000000
-8,2049,R1,2030,gasCCGT,1.01590000000
-8,2050,R1,2030,gasCCGT,1.01590000000
-8,2058,R1,2030,gasCCGT,1.01590000000
-8,2059,R1,2030,gasCCGT,1.01590000000
-8,2060,R1,2030,gasCCGT,1.01590000000
-8,2061,R1,2030,gasCCGT,1.01590000000
-8,2062,R1,2030,gasCCGT,1.01590000000
-8,2063,R1,2030,gasCCGT,1.01590000000
-8,2064,R1,2030,gasCCGT,1.01590000000
-8,2065,R1,2030,gasCCGT,1.01590000000
-8,2066,R1,2030,gasCCGT,1.01590000000
-9,2034,R1,2032,solarPV,2.28590000000
-9,2035,R1,2032,solarPV,2.28590000000
-9,2036,R1,2032,solarPV,2.28590000000
-9,2040,R1,2032,solarPV,2.28590000000
-9,2045,R1,2032,solarPV,2.28590000000
-9,2046,R1,2032,solarPV,2.28590000000
-9,2047,R1,2032,solarPV,2.28590000000
-9,2048,R1,2032,solarPV,2.28590000000
-9,2049,R1,2032,solarPV,2.28590000000
-9,2050,R1,2032,solarPV,2.28590000000
-9,2058,R1,2032,solarPV,2.28590000000
-10,2036,R1,2034,solarPV,4.61130000000
-10,2040,R1,2034,solarPV,4.61130000000
-10,2045,R1,2034,solarPV,4.61130000000
-10,2046,R1,2034,solarPV,4.61130000000
-10,2047,R1,2034,solarPV,4.61130000000
-10,2048,R1,2034,solarPV,4.61130000000
-10,2049,R1,2034,solarPV,4.61130000000
-10,2050,R1,2034,solarPV,4.61130000000
-10,2058,R1,2034,solarPV,4.61130000000
-10,2059,R1,2034,solarPV,4.61130000000
-10,2060,R1,2034,solarPV,4.61130000000
-12,2034,R2,2020,windturbine,12.17990000000
-12,2035,R2,2020,windturbine,12.17990000000
-12,2036,R2,2020,windturbine,12.17990000000
-12,2040,R2,2020,windturbine,12.17990000000
-12,2045,R2,2020,windturbine,12.17990000000
-12,2046,R2,2020,windturbine,12.17990000000
-13,2034,R2,2022,gasCCGT,0.80000000000
-13,2035,R2,2022,gasCCGT,0.80000000000
-13,2036,R2,2022,gasCCGT,0.80000000000
-13,2040,R2,2022,gasCCGT,0.80000000000
-13,2045,R2,2022,gasCCGT,0.80000000000
-13,2046,R2,2022,gasCCGT,0.80000000000
-13,2047,R2,2022,gasCCGT,0.80000000000
-13,2048,R2,2022,gasCCGT,0.80000000000
-13,2049,R2,2022,gasCCGT,0.80000000000
-13,2050,R2,2022,gasCCGT,0.80000000000
-13,2058,R2,2022,gasCCGT,0.80000000000
-14,2034,R2,2022,windturbine,0.48590000000
-14,2035,R2,2022,windturbine,0.48590000000
-14,2036,R2,2022,windturbine,0.48590000000
-14,2040,R2,2022,windturbine,0.48590000000
-14,2045,R2,2022,windturbine,0.48590000000
-14,2046,R2,2022,windturbine,0.48590000000
-14,2047,R2,2022,windturbine,0.48590000000
-14,2048,R2,2022,windturbine,0.48590000000
-15,2034,R2,2024,gasCCGT,3.20460000000
-15,2035,R2,2024,gasCCGT,3.20460000000
-15,2036,R2,2024,gasCCGT,3.20460000000
-15,2040,R2,2024,gasCCGT,3.20460000000
-15,2045,R2,2024,gasCCGT,3.20460000000
-15,2046,R2,2024,gasCCGT,3.20460000000
-15,2047,R2,2024,gasCCGT,3.20460000000
-15,2048,R2,2024,gasCCGT,3.20460000000
-15,2049,R2,2024,gasCCGT,3.20460000000
-15,2050,R2,2024,gasCCGT,3.20460000000
-15,2058,R2,2024,gasCCGT,3.20460000000
-15,2059,R2,2024,gasCCGT,3.20460000000
-15,2060,R2,2024,gasCCGT,3.20460000000
-16,2034,R2,2026,gasCCGT,1.01590000000
-16,2035,R2,2026,gasCCGT,1.01590000000
-16,2036,R2,2026,gasCCGT,1.01590000000
-16,2040,R2,2026,gasCCGT,1.01590000000
-16,2045,R2,2026,gasCCGT,1.01590000000
-16,2046,R2,2026,gasCCGT,1.01590000000
-16,2047,R2,2026,gasCCGT,1.01590000000
-16,2048,R2,2026,gasCCGT,1.01590000000
-16,2049,R2,2026,gasCCGT,1.01590000000
-16,2050,R2,2026,gasCCGT,1.01590000000
-16,2058,R2,2026,gasCCGT,1.01590000000
-16,2059,R2,2026,gasCCGT,1.01590000000
-16,2060,R2,2026,gasCCGT,1.01590000000
-16,2061,R2,2026,gasCCGT,1.01590000000
-16,2062,R2,2026,gasCCGT,1.01590000000
-17,2034,R2,2028,gasCCGT,1.01590000000
-17,2035,R2,2028,gasCCGT,1.01590000000
-17,2036,R2,2028,gasCCGT,1.01590000000
-17,2040,R2,2028,gasCCGT,1.01590000000
-17,2045,R2,2028,gasCCGT,1.01590000000
-17,2046,R2,2028,gasCCGT,1.01590000000
-17,2047,R2,2028,gasCCGT,1.01590000000
-17,2048,R2,2028,gasCCGT,1.01590000000
-17,2049,R2,2028,gasCCGT,1.01590000000
-17,2050,R2,2028,gasCCGT,1.01590000000
-17,2058,R2,2028,gasCCGT,1.01590000000
-17,2059,R2,2028,gasCCGT,1.01590000000
-17,2060,R2,2028,gasCCGT,1.01590000000
-17,2061,R2,2028,gasCCGT,1.01590000000
-17,2062,R2,2028,gasCCGT,1.01590000000
-17,2063,R2,2028,gasCCGT,1.01590000000
-17,2064,R2,2028,gasCCGT,1.01590000000
-18,2034,R2,2030,gasCCGT,1.01590000000
-18,2035,R2,2030,gasCCGT,1.01590000000
-18,2036,R2,2030,gasCCGT,1.01590000000
-18,2040,R2,2030,gasCCGT,1.01590000000
-18,2045,R2,2030,gasCCGT,1.01590000000
-18,2046,R2,2030,gasCCGT,1.01590000000
-18,2047,R2,2030,gasCCGT,1.01590000000
-18,2048,R2,2030,gasCCGT,1.01590000000
-18,2049,R2,2030,gasCCGT,1.01590000000
-18,2050,R2,2030,gasCCGT,1.01590000000
-18,2058,R2,2030,gasCCGT,1.01590000000
-18,2059,R2,2030,gasCCGT,1.01590000000
-18,2060,R2,2030,gasCCGT,1.01590000000
-18,2061,R2,2030,gasCCGT,1.01590000000
-18,2062,R2,2030,gasCCGT,1.01590000000
-18,2063,R2,2030,gasCCGT,1.01590000000
-18,2064,R2,2030,gasCCGT,1.01590000000
-18,2065,R2,2030,gasCCGT,1.01590000000
-18,2066,R2,2030,gasCCGT,1.01590000000
-19,2034,R2,2032,solarPV,2.28590000000
-19,2035,R2,2032,solarPV,2.28590000000
-19,2036,R2,2032,solarPV,2.28590000000
-19,2040,R2,2032,solarPV,2.28590000000
-19,2045,R2,2032,solarPV,2.28590000000
-19,2046,R2,2032,solarPV,2.28590000000
-19,2047,R2,2032,solarPV,2.28590000000
-19,2048,R2,2032,solarPV,2.28590000000
-19,2049,R2,2032,solarPV,2.28590000000
-19,2050,R2,2032,solarPV,2.28590000000
-19,2058,R2,2032,solarPV,2.28590000000
-20,2036,R2,2034,solarPV,1.82870000000
-20,2040,R2,2034,solarPV,1.82870000000
-20,2045,R2,2034,solarPV,1.82870000000
-20,2046,R2,2034,solarPV,1.82870000000
-20,2047,R2,2034,solarPV,1.82870000000
-20,2048,R2,2034,solarPV,1.82870000000
-20,2049,R2,2034,solarPV,1.82870000000
-20,2050,R2,2034,solarPV,1.82870000000
-20,2058,R2,2034,solarPV,1.82870000000
-20,2059,R2,2034,solarPV,1.82870000000
-20,2060,R2,2034,solarPV,1.82870000000
-21,2036,R2,2034,windturbine,2.78270000000
-21,2040,R2,2034,windturbine,2.78270000000
-21,2045,R2,2034,windturbine,2.78270000000
-21,2046,R2,2034,windturbine,2.78270000000
-21,2047,R2,2034,windturbine,2.78270000000
-21,2048,R2,2034,windturbine,2.78270000000
-21,2049,R2,2034,windturbine,2.78270000000
-21,2050,R2,2034,windturbine,2.78270000000
-21,2058,R2,2034,windturbine,2.78270000000
-21,2059,R2,2034,windturbine,2.78270000000
-21,2060,R2,2034,windturbine,2.78270000000
+asset,year,region,technology,installed,capacity
+1,2034,R1,gasCCGT,2022,0.80000000000
+1,2035,R1,gasCCGT,2022,0.80000000000
+1,2036,R1,gasCCGT,2022,0.80000000000
+1,2040,R1,gasCCGT,2022,0.80000000000
+1,2045,R1,gasCCGT,2022,0.80000000000
+1,2046,R1,gasCCGT,2022,0.80000000000
+1,2047,R1,gasCCGT,2022,0.80000000000
+1,2048,R1,gasCCGT,2022,0.80000000000
+1,2049,R1,gasCCGT,2022,0.80000000000
+1,2050,R1,gasCCGT,2022,0.80000000000
+1,2058,R1,gasCCGT,2022,0.80000000000
+2,2034,R1,gasCCGT,2024,3.20460000000
+2,2035,R1,gasCCGT,2024,3.20460000000
+2,2036,R1,gasCCGT,2024,3.20460000000
+2,2040,R1,gasCCGT,2024,3.20460000000
+2,2045,R1,gasCCGT,2024,3.20460000000
+2,2046,R1,gasCCGT,2024,3.20460000000
+2,2047,R1,gasCCGT,2024,3.20460000000
+2,2048,R1,gasCCGT,2024,3.20460000000
+2,2049,R1,gasCCGT,2024,3.20460000000
+2,2050,R1,gasCCGT,2024,3.20460000000
+2,2058,R1,gasCCGT,2024,3.20460000000
+2,2059,R1,gasCCGT,2024,3.20460000000
+2,2060,R1,gasCCGT,2024,3.20460000000
+3,2034,R1,gasCCGT,2026,1.01590000000
+3,2035,R1,gasCCGT,2026,1.01590000000
+3,2036,R1,gasCCGT,2026,1.01590000000
+3,2040,R1,gasCCGT,2026,1.01590000000
+3,2045,R1,gasCCGT,2026,1.01590000000
+3,2046,R1,gasCCGT,2026,1.01590000000
+3,2047,R1,gasCCGT,2026,1.01590000000
+3,2048,R1,gasCCGT,2026,1.01590000000
+3,2049,R1,gasCCGT,2026,1.01590000000
+3,2050,R1,gasCCGT,2026,1.01590000000
+3,2058,R1,gasCCGT,2026,1.01590000000
+3,2059,R1,gasCCGT,2026,1.01590000000
+3,2060,R1,gasCCGT,2026,1.01590000000
+3,2061,R1,gasCCGT,2026,1.01590000000
+3,2062,R1,gasCCGT,2026,1.01590000000
+4,2034,R1,gasCCGT,2028,1.01590000000
+4,2035,R1,gasCCGT,2028,1.01590000000
+4,2036,R1,gasCCGT,2028,1.01590000000
+4,2040,R1,gasCCGT,2028,1.01590000000
+4,2045,R1,gasCCGT,2028,1.01590000000
+4,2046,R1,gasCCGT,2028,1.01590000000
+4,2047,R1,gasCCGT,2028,1.01590000000
+4,2048,R1,gasCCGT,2028,1.01590000000
+4,2049,R1,gasCCGT,2028,1.01590000000
+4,2050,R1,gasCCGT,2028,1.01590000000
+4,2058,R1,gasCCGT,2028,1.01590000000
+4,2059,R1,gasCCGT,2028,1.01590000000
+4,2060,R1,gasCCGT,2028,1.01590000000
+4,2061,R1,gasCCGT,2028,1.01590000000
+4,2062,R1,gasCCGT,2028,1.01590000000
+4,2063,R1,gasCCGT,2028,1.01590000000
+4,2064,R1,gasCCGT,2028,1.01590000000
+5,2034,R1,gasCCGT,2030,1.01590000000
+5,2035,R1,gasCCGT,2030,1.01590000000
+5,2036,R1,gasCCGT,2030,1.01590000000
+5,2040,R1,gasCCGT,2030,1.01590000000
+5,2045,R1,gasCCGT,2030,1.01590000000
+5,2046,R1,gasCCGT,2030,1.01590000000
+5,2047,R1,gasCCGT,2030,1.01590000000
+5,2048,R1,gasCCGT,2030,1.01590000000
+5,2049,R1,gasCCGT,2030,1.01590000000
+5,2050,R1,gasCCGT,2030,1.01590000000
+5,2058,R1,gasCCGT,2030,1.01590000000
+5,2059,R1,gasCCGT,2030,1.01590000000
+5,2060,R1,gasCCGT,2030,1.01590000000
+5,2061,R1,gasCCGT,2030,1.01590000000
+5,2062,R1,gasCCGT,2030,1.01590000000
+5,2063,R1,gasCCGT,2030,1.01590000000
+5,2064,R1,gasCCGT,2030,1.01590000000
+5,2065,R1,gasCCGT,2030,1.01590000000
+5,2066,R1,gasCCGT,2030,1.01590000000
+6,2034,R1,solarPV,2020,4.17990000000
+6,2035,R1,solarPV,2020,4.17990000000
+6,2036,R1,solarPV,2020,4.17990000000
+6,2040,R1,solarPV,2020,4.17990000000
+6,2045,R1,solarPV,2020,4.17990000000
+6,2046,R1,solarPV,2020,4.17990000000
+7,2034,R1,solarPV,2032,2.28590000000
+7,2035,R1,solarPV,2032,2.28590000000
+7,2036,R1,solarPV,2032,2.28590000000
+7,2040,R1,solarPV,2032,2.28590000000
+7,2045,R1,solarPV,2032,2.28590000000
+7,2046,R1,solarPV,2032,2.28590000000
+7,2047,R1,solarPV,2032,2.28590000000
+7,2048,R1,solarPV,2032,2.28590000000
+7,2049,R1,solarPV,2032,2.28590000000
+7,2050,R1,solarPV,2032,2.28590000000
+7,2058,R1,solarPV,2032,2.28590000000
+8,2036,R1,solarPV,2034,4.61130000000
+8,2040,R1,solarPV,2034,4.61130000000
+8,2045,R1,solarPV,2034,4.61130000000
+8,2046,R1,solarPV,2034,4.61130000000
+8,2047,R1,solarPV,2034,4.61130000000
+8,2048,R1,solarPV,2034,4.61130000000
+8,2049,R1,solarPV,2034,4.61130000000
+8,2050,R1,solarPV,2034,4.61130000000
+8,2058,R1,solarPV,2034,4.61130000000
+8,2059,R1,solarPV,2034,4.61130000000
+8,2060,R1,solarPV,2034,4.61130000000
+9,2034,R1,windturbine,2020,8.00000000000
+9,2035,R1,windturbine,2020,8.00000000000
+9,2036,R1,windturbine,2020,8.00000000000
+9,2040,R1,windturbine,2020,8.00000000000
+9,2045,R1,windturbine,2020,8.00000000000
+9,2046,R1,windturbine,2020,8.00000000000
+10,2034,R1,windturbine,2022,0.48590000000
+10,2035,R1,windturbine,2022,0.48590000000
+10,2036,R1,windturbine,2022,0.48590000000
+10,2040,R1,windturbine,2022,0.48590000000
+10,2045,R1,windturbine,2022,0.48590000000
+10,2046,R1,windturbine,2022,0.48590000000
+10,2047,R1,windturbine,2022,0.48590000000
+10,2048,R1,windturbine,2022,0.48590000000
+12,2034,R2,gasCCGT,2022,0.80000000000
+12,2035,R2,gasCCGT,2022,0.80000000000
+12,2036,R2,gasCCGT,2022,0.80000000000
+12,2040,R2,gasCCGT,2022,0.80000000000
+12,2045,R2,gasCCGT,2022,0.80000000000
+12,2046,R2,gasCCGT,2022,0.80000000000
+12,2047,R2,gasCCGT,2022,0.80000000000
+12,2048,R2,gasCCGT,2022,0.80000000000
+12,2049,R2,gasCCGT,2022,0.80000000000
+12,2050,R2,gasCCGT,2022,0.80000000000
+12,2058,R2,gasCCGT,2022,0.80000000000
+13,2034,R2,gasCCGT,2024,3.20460000000
+13,2035,R2,gasCCGT,2024,3.20460000000
+13,2036,R2,gasCCGT,2024,3.20460000000
+13,2040,R2,gasCCGT,2024,3.20460000000
+13,2045,R2,gasCCGT,2024,3.20460000000
+13,2046,R2,gasCCGT,2024,3.20460000000
+13,2047,R2,gasCCGT,2024,3.20460000000
+13,2048,R2,gasCCGT,2024,3.20460000000
+13,2049,R2,gasCCGT,2024,3.20460000000
+13,2050,R2,gasCCGT,2024,3.20460000000
+13,2058,R2,gasCCGT,2024,3.20460000000
+13,2059,R2,gasCCGT,2024,3.20460000000
+13,2060,R2,gasCCGT,2024,3.20460000000
+14,2034,R2,gasCCGT,2026,1.01590000000
+14,2035,R2,gasCCGT,2026,1.01590000000
+14,2036,R2,gasCCGT,2026,1.01590000000
+14,2040,R2,gasCCGT,2026,1.01590000000
+14,2045,R2,gasCCGT,2026,1.01590000000
+14,2046,R2,gasCCGT,2026,1.01590000000
+14,2047,R2,gasCCGT,2026,1.01590000000
+14,2048,R2,gasCCGT,2026,1.01590000000
+14,2049,R2,gasCCGT,2026,1.01590000000
+14,2050,R2,gasCCGT,2026,1.01590000000
+14,2058,R2,gasCCGT,2026,1.01590000000
+14,2059,R2,gasCCGT,2026,1.01590000000
+14,2060,R2,gasCCGT,2026,1.01590000000
+14,2061,R2,gasCCGT,2026,1.01590000000
+14,2062,R2,gasCCGT,2026,1.01590000000
+15,2034,R2,gasCCGT,2028,1.01590000000
+15,2035,R2,gasCCGT,2028,1.01590000000
+15,2036,R2,gasCCGT,2028,1.01590000000
+15,2040,R2,gasCCGT,2028,1.01590000000
+15,2045,R2,gasCCGT,2028,1.01590000000
+15,2046,R2,gasCCGT,2028,1.01590000000
+15,2047,R2,gasCCGT,2028,1.01590000000
+15,2048,R2,gasCCGT,2028,1.01590000000
+15,2049,R2,gasCCGT,2028,1.01590000000
+15,2050,R2,gasCCGT,2028,1.01590000000
+15,2058,R2,gasCCGT,2028,1.01590000000
+15,2059,R2,gasCCGT,2028,1.01590000000
+15,2060,R2,gasCCGT,2028,1.01590000000
+15,2061,R2,gasCCGT,2028,1.01590000000
+15,2062,R2,gasCCGT,2028,1.01590000000
+15,2063,R2,gasCCGT,2028,1.01590000000
+15,2064,R2,gasCCGT,2028,1.01590000000
+16,2034,R2,gasCCGT,2030,1.01590000000
+16,2035,R2,gasCCGT,2030,1.01590000000
+16,2036,R2,gasCCGT,2030,1.01590000000
+16,2040,R2,gasCCGT,2030,1.01590000000
+16,2045,R2,gasCCGT,2030,1.01590000000
+16,2046,R2,gasCCGT,2030,1.01590000000
+16,2047,R2,gasCCGT,2030,1.01590000000
+16,2048,R2,gasCCGT,2030,1.01590000000
+16,2049,R2,gasCCGT,2030,1.01590000000
+16,2050,R2,gasCCGT,2030,1.01590000000
+16,2058,R2,gasCCGT,2030,1.01590000000
+16,2059,R2,gasCCGT,2030,1.01590000000
+16,2060,R2,gasCCGT,2030,1.01590000000
+16,2061,R2,gasCCGT,2030,1.01590000000
+16,2062,R2,gasCCGT,2030,1.01590000000
+16,2063,R2,gasCCGT,2030,1.01590000000
+16,2064,R2,gasCCGT,2030,1.01590000000
+16,2065,R2,gasCCGT,2030,1.01590000000
+16,2066,R2,gasCCGT,2030,1.01590000000
+17,2034,R2,solarPV,2032,2.28590000000
+17,2035,R2,solarPV,2032,2.28590000000
+17,2036,R2,solarPV,2032,2.28590000000
+17,2040,R2,solarPV,2032,2.28590000000
+17,2045,R2,solarPV,2032,2.28590000000
+17,2046,R2,solarPV,2032,2.28590000000
+17,2047,R2,solarPV,2032,2.28590000000
+17,2048,R2,solarPV,2032,2.28590000000
+17,2049,R2,solarPV,2032,2.28590000000
+17,2050,R2,solarPV,2032,2.28590000000
+17,2058,R2,solarPV,2032,2.28590000000
+18,2036,R2,solarPV,2034,1.82870000000
+18,2040,R2,solarPV,2034,1.82870000000
+18,2045,R2,solarPV,2034,1.82870000000
+18,2046,R2,solarPV,2034,1.82870000000
+18,2047,R2,solarPV,2034,1.82870000000
+18,2048,R2,solarPV,2034,1.82870000000
+18,2049,R2,solarPV,2034,1.82870000000
+18,2050,R2,solarPV,2034,1.82870000000
+18,2058,R2,solarPV,2034,1.82870000000
+18,2059,R2,solarPV,2034,1.82870000000
+18,2060,R2,solarPV,2034,1.82870000000
+19,2034,R2,windturbine,2020,12.17990000000
+19,2035,R2,windturbine,2020,12.17990000000
+19,2036,R2,windturbine,2020,12.17990000000
+19,2040,R2,windturbine,2020,12.17990000000
+19,2045,R2,windturbine,2020,12.17990000000
+19,2046,R2,windturbine,2020,12.17990000000
+20,2034,R2,windturbine,2022,0.48590000000
+20,2035,R2,windturbine,2022,0.48590000000
+20,2036,R2,windturbine,2022,0.48590000000
+20,2040,R2,windturbine,2022,0.48590000000
+20,2045,R2,windturbine,2022,0.48590000000
+20,2046,R2,windturbine,2022,0.48590000000
+20,2047,R2,windturbine,2022,0.48590000000
+20,2048,R2,windturbine,2022,0.48590000000
+21,2036,R2,windturbine,2034,2.78270000000
+21,2040,R2,windturbine,2034,2.78270000000
+21,2045,R2,windturbine,2034,2.78270000000
+21,2046,R2,windturbine,2034,2.78270000000
+21,2047,R2,windturbine,2034,2.78270000000
+21,2048,R2,windturbine,2034,2.78270000000
+21,2049,R2,windturbine,2034,2.78270000000
+21,2050,R2,windturbine,2034,2.78270000000
+21,2058,R2,windturbine,2034,2.78270000000
+21,2059,R2,windturbine,2034,2.78270000000
+21,2060,R2,windturbine,2034,2.78270000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2036.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2036.csv
index 911983cc1..aaafb15e9 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2036.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2036.csv
@@ -1,252 +1,252 @@
-asset,year,region,installed,technology,capacity
-1,2036,R1,2020,solarPV,4.17990000000
-1,2038,R1,2020,solarPV,4.17990000000
-1,2040,R1,2020,solarPV,4.17990000000
-1,2045,R1,2020,solarPV,4.17990000000
-1,2046,R1,2020,solarPV,4.17990000000
-2,2036,R1,2020,windturbine,8.00000000000
-2,2038,R1,2020,windturbine,8.00000000000
-2,2040,R1,2020,windturbine,8.00000000000
-2,2045,R1,2020,windturbine,8.00000000000
-2,2046,R1,2020,windturbine,8.00000000000
-3,2036,R1,2022,gasCCGT,0.80000000000
-3,2038,R1,2022,gasCCGT,0.80000000000
-3,2040,R1,2022,gasCCGT,0.80000000000
-3,2045,R1,2022,gasCCGT,0.80000000000
-3,2046,R1,2022,gasCCGT,0.80000000000
-3,2047,R1,2022,gasCCGT,0.80000000000
-3,2048,R1,2022,gasCCGT,0.80000000000
-3,2049,R1,2022,gasCCGT,0.80000000000
-3,2050,R1,2022,gasCCGT,0.80000000000
-3,2058,R1,2022,gasCCGT,0.80000000000
-4,2036,R1,2022,windturbine,0.48590000000
-4,2038,R1,2022,windturbine,0.48590000000
-4,2040,R1,2022,windturbine,0.48590000000
-4,2045,R1,2022,windturbine,0.48590000000
-4,2046,R1,2022,windturbine,0.48590000000
-4,2047,R1,2022,windturbine,0.48590000000
-4,2048,R1,2022,windturbine,0.48590000000
-5,2036,R1,2024,gasCCGT,3.20460000000
-5,2038,R1,2024,gasCCGT,3.20460000000
-5,2040,R1,2024,gasCCGT,3.20460000000
-5,2045,R1,2024,gasCCGT,3.20460000000
-5,2046,R1,2024,gasCCGT,3.20460000000
-5,2047,R1,2024,gasCCGT,3.20460000000
-5,2048,R1,2024,gasCCGT,3.20460000000
-5,2049,R1,2024,gasCCGT,3.20460000000
-5,2050,R1,2024,gasCCGT,3.20460000000
-5,2058,R1,2024,gasCCGT,3.20460000000
-5,2059,R1,2024,gasCCGT,3.20460000000
-5,2060,R1,2024,gasCCGT,3.20460000000
-6,2036,R1,2026,gasCCGT,1.01590000000
-6,2038,R1,2026,gasCCGT,1.01590000000
-6,2040,R1,2026,gasCCGT,1.01590000000
-6,2045,R1,2026,gasCCGT,1.01590000000
-6,2046,R1,2026,gasCCGT,1.01590000000
-6,2047,R1,2026,gasCCGT,1.01590000000
-6,2048,R1,2026,gasCCGT,1.01590000000
-6,2049,R1,2026,gasCCGT,1.01590000000
-6,2050,R1,2026,gasCCGT,1.01590000000
-6,2058,R1,2026,gasCCGT,1.01590000000
-6,2059,R1,2026,gasCCGT,1.01590000000
-6,2060,R1,2026,gasCCGT,1.01590000000
-6,2061,R1,2026,gasCCGT,1.01590000000
-6,2062,R1,2026,gasCCGT,1.01590000000
-7,2036,R1,2028,gasCCGT,1.01590000000
-7,2038,R1,2028,gasCCGT,1.01590000000
-7,2040,R1,2028,gasCCGT,1.01590000000
-7,2045,R1,2028,gasCCGT,1.01590000000
-7,2046,R1,2028,gasCCGT,1.01590000000
-7,2047,R1,2028,gasCCGT,1.01590000000
-7,2048,R1,2028,gasCCGT,1.01590000000
-7,2049,R1,2028,gasCCGT,1.01590000000
-7,2050,R1,2028,gasCCGT,1.01590000000
-7,2058,R1,2028,gasCCGT,1.01590000000
-7,2059,R1,2028,gasCCGT,1.01590000000
-7,2060,R1,2028,gasCCGT,1.01590000000
-7,2061,R1,2028,gasCCGT,1.01590000000
-7,2062,R1,2028,gasCCGT,1.01590000000
-7,2063,R1,2028,gasCCGT,1.01590000000
-7,2064,R1,2028,gasCCGT,1.01590000000
-8,2036,R1,2030,gasCCGT,1.01590000000
-8,2038,R1,2030,gasCCGT,1.01590000000
-8,2040,R1,2030,gasCCGT,1.01590000000
-8,2045,R1,2030,gasCCGT,1.01590000000
-8,2046,R1,2030,gasCCGT,1.01590000000
-8,2047,R1,2030,gasCCGT,1.01590000000
-8,2048,R1,2030,gasCCGT,1.01590000000
-8,2049,R1,2030,gasCCGT,1.01590000000
-8,2050,R1,2030,gasCCGT,1.01590000000
-8,2058,R1,2030,gasCCGT,1.01590000000
-8,2059,R1,2030,gasCCGT,1.01590000000
-8,2060,R1,2030,gasCCGT,1.01590000000
-8,2061,R1,2030,gasCCGT,1.01590000000
-8,2062,R1,2030,gasCCGT,1.01590000000
-8,2063,R1,2030,gasCCGT,1.01590000000
-8,2064,R1,2030,gasCCGT,1.01590000000
-8,2065,R1,2030,gasCCGT,1.01590000000
-8,2066,R1,2030,gasCCGT,1.01590000000
-9,2036,R1,2032,solarPV,2.28590000000
-9,2038,R1,2032,solarPV,2.28590000000
-9,2040,R1,2032,solarPV,2.28590000000
-9,2045,R1,2032,solarPV,2.28590000000
-9,2046,R1,2032,solarPV,2.28590000000
-9,2047,R1,2032,solarPV,2.28590000000
-9,2048,R1,2032,solarPV,2.28590000000
-9,2049,R1,2032,solarPV,2.28590000000
-9,2050,R1,2032,solarPV,2.28590000000
-9,2058,R1,2032,solarPV,2.28590000000
-10,2036,R1,2034,solarPV,4.61130000000
-10,2038,R1,2034,solarPV,4.61130000000
-10,2040,R1,2034,solarPV,4.61130000000
-10,2045,R1,2034,solarPV,4.61130000000
-10,2046,R1,2034,solarPV,4.61130000000
-10,2047,R1,2034,solarPV,4.61130000000
-10,2048,R1,2034,solarPV,4.61130000000
-10,2049,R1,2034,solarPV,4.61130000000
-10,2050,R1,2034,solarPV,4.61130000000
-10,2058,R1,2034,solarPV,4.61130000000
-10,2059,R1,2034,solarPV,4.61130000000
-10,2060,R1,2034,solarPV,4.61130000000
-11,2038,R1,2036,solarPV,2.28590000000
-11,2040,R1,2036,solarPV,2.28590000000
-11,2045,R1,2036,solarPV,2.28590000000
-11,2046,R1,2036,solarPV,2.28590000000
-11,2047,R1,2036,solarPV,2.28590000000
-11,2048,R1,2036,solarPV,2.28590000000
-11,2049,R1,2036,solarPV,2.28590000000
-11,2050,R1,2036,solarPV,2.28590000000
-11,2058,R1,2036,solarPV,2.28590000000
-11,2059,R1,2036,solarPV,2.28590000000
-11,2060,R1,2036,solarPV,2.28590000000
-11,2061,R1,2036,solarPV,2.28590000000
-11,2062,R1,2036,solarPV,2.28590000000
-13,2036,R2,2020,windturbine,12.17990000000
-13,2038,R2,2020,windturbine,12.17990000000
-13,2040,R2,2020,windturbine,12.17990000000
-13,2045,R2,2020,windturbine,12.17990000000
-13,2046,R2,2020,windturbine,12.17990000000
-14,2036,R2,2022,gasCCGT,0.80000000000
-14,2038,R2,2022,gasCCGT,0.80000000000
-14,2040,R2,2022,gasCCGT,0.80000000000
-14,2045,R2,2022,gasCCGT,0.80000000000
-14,2046,R2,2022,gasCCGT,0.80000000000
-14,2047,R2,2022,gasCCGT,0.80000000000
-14,2048,R2,2022,gasCCGT,0.80000000000
-14,2049,R2,2022,gasCCGT,0.80000000000
-14,2050,R2,2022,gasCCGT,0.80000000000
-14,2058,R2,2022,gasCCGT,0.80000000000
-15,2036,R2,2022,windturbine,0.48590000000
-15,2038,R2,2022,windturbine,0.48590000000
-15,2040,R2,2022,windturbine,0.48590000000
-15,2045,R2,2022,windturbine,0.48590000000
-15,2046,R2,2022,windturbine,0.48590000000
-15,2047,R2,2022,windturbine,0.48590000000
-15,2048,R2,2022,windturbine,0.48590000000
-16,2036,R2,2024,gasCCGT,3.20460000000
-16,2038,R2,2024,gasCCGT,3.20460000000
-16,2040,R2,2024,gasCCGT,3.20460000000
-16,2045,R2,2024,gasCCGT,3.20460000000
-16,2046,R2,2024,gasCCGT,3.20460000000
-16,2047,R2,2024,gasCCGT,3.20460000000
-16,2048,R2,2024,gasCCGT,3.20460000000
-16,2049,R2,2024,gasCCGT,3.20460000000
-16,2050,R2,2024,gasCCGT,3.20460000000
-16,2058,R2,2024,gasCCGT,3.20460000000
-16,2059,R2,2024,gasCCGT,3.20460000000
-16,2060,R2,2024,gasCCGT,3.20460000000
-17,2036,R2,2026,gasCCGT,1.01590000000
-17,2038,R2,2026,gasCCGT,1.01590000000
-17,2040,R2,2026,gasCCGT,1.01590000000
-17,2045,R2,2026,gasCCGT,1.01590000000
-17,2046,R2,2026,gasCCGT,1.01590000000
-17,2047,R2,2026,gasCCGT,1.01590000000
-17,2048,R2,2026,gasCCGT,1.01590000000
-17,2049,R2,2026,gasCCGT,1.01590000000
-17,2050,R2,2026,gasCCGT,1.01590000000
-17,2058,R2,2026,gasCCGT,1.01590000000
-17,2059,R2,2026,gasCCGT,1.01590000000
-17,2060,R2,2026,gasCCGT,1.01590000000
-17,2061,R2,2026,gasCCGT,1.01590000000
-17,2062,R2,2026,gasCCGT,1.01590000000
-18,2036,R2,2028,gasCCGT,1.01590000000
-18,2038,R2,2028,gasCCGT,1.01590000000
-18,2040,R2,2028,gasCCGT,1.01590000000
-18,2045,R2,2028,gasCCGT,1.01590000000
-18,2046,R2,2028,gasCCGT,1.01590000000
-18,2047,R2,2028,gasCCGT,1.01590000000
-18,2048,R2,2028,gasCCGT,1.01590000000
-18,2049,R2,2028,gasCCGT,1.01590000000
-18,2050,R2,2028,gasCCGT,1.01590000000
-18,2058,R2,2028,gasCCGT,1.01590000000
-18,2059,R2,2028,gasCCGT,1.01590000000
-18,2060,R2,2028,gasCCGT,1.01590000000
-18,2061,R2,2028,gasCCGT,1.01590000000
-18,2062,R2,2028,gasCCGT,1.01590000000
-18,2063,R2,2028,gasCCGT,1.01590000000
-18,2064,R2,2028,gasCCGT,1.01590000000
-19,2036,R2,2030,gasCCGT,1.01590000000
-19,2038,R2,2030,gasCCGT,1.01590000000
-19,2040,R2,2030,gasCCGT,1.01590000000
-19,2045,R2,2030,gasCCGT,1.01590000000
-19,2046,R2,2030,gasCCGT,1.01590000000
-19,2047,R2,2030,gasCCGT,1.01590000000
-19,2048,R2,2030,gasCCGT,1.01590000000
-19,2049,R2,2030,gasCCGT,1.01590000000
-19,2050,R2,2030,gasCCGT,1.01590000000
-19,2058,R2,2030,gasCCGT,1.01590000000
-19,2059,R2,2030,gasCCGT,1.01590000000
-19,2060,R2,2030,gasCCGT,1.01590000000
-19,2061,R2,2030,gasCCGT,1.01590000000
-19,2062,R2,2030,gasCCGT,1.01590000000
-19,2063,R2,2030,gasCCGT,1.01590000000
-19,2064,R2,2030,gasCCGT,1.01590000000
-19,2065,R2,2030,gasCCGT,1.01590000000
-19,2066,R2,2030,gasCCGT,1.01590000000
-20,2036,R2,2032,solarPV,2.28590000000
-20,2038,R2,2032,solarPV,2.28590000000
-20,2040,R2,2032,solarPV,2.28590000000
-20,2045,R2,2032,solarPV,2.28590000000
-20,2046,R2,2032,solarPV,2.28590000000
-20,2047,R2,2032,solarPV,2.28590000000
-20,2048,R2,2032,solarPV,2.28590000000
-20,2049,R2,2032,solarPV,2.28590000000
-20,2050,R2,2032,solarPV,2.28590000000
-20,2058,R2,2032,solarPV,2.28590000000
-21,2036,R2,2034,solarPV,1.82870000000
-21,2038,R2,2034,solarPV,1.82870000000
-21,2040,R2,2034,solarPV,1.82870000000
-21,2045,R2,2034,solarPV,1.82870000000
-21,2046,R2,2034,solarPV,1.82870000000
-21,2047,R2,2034,solarPV,1.82870000000
-21,2048,R2,2034,solarPV,1.82870000000
-21,2049,R2,2034,solarPV,1.82870000000
-21,2050,R2,2034,solarPV,1.82870000000
-21,2058,R2,2034,solarPV,1.82870000000
-21,2059,R2,2034,solarPV,1.82870000000
-21,2060,R2,2034,solarPV,1.82870000000
-22,2036,R2,2034,windturbine,2.78270000000
-22,2038,R2,2034,windturbine,2.78270000000
-22,2040,R2,2034,windturbine,2.78270000000
-22,2045,R2,2034,windturbine,2.78270000000
-22,2046,R2,2034,windturbine,2.78270000000
-22,2047,R2,2034,windturbine,2.78270000000
-22,2048,R2,2034,windturbine,2.78270000000
-22,2049,R2,2034,windturbine,2.78270000000
-22,2050,R2,2034,windturbine,2.78270000000
-22,2058,R2,2034,windturbine,2.78270000000
-22,2059,R2,2034,windturbine,2.78270000000
-22,2060,R2,2034,windturbine,2.78270000000
-23,2038,R2,2036,solarPV,2.28590000000
-23,2040,R2,2036,solarPV,2.28590000000
-23,2045,R2,2036,solarPV,2.28590000000
-23,2046,R2,2036,solarPV,2.28590000000
-23,2047,R2,2036,solarPV,2.28590000000
-23,2048,R2,2036,solarPV,2.28590000000
-23,2049,R2,2036,solarPV,2.28590000000
-23,2050,R2,2036,solarPV,2.28590000000
-23,2058,R2,2036,solarPV,2.28590000000
-23,2059,R2,2036,solarPV,2.28590000000
-23,2060,R2,2036,solarPV,2.28590000000
-23,2061,R2,2036,solarPV,2.28590000000
-23,2062,R2,2036,solarPV,2.28590000000
+asset,year,region,technology,installed,capacity
+1,2036,R1,gasCCGT,2022,0.80000000000
+1,2038,R1,gasCCGT,2022,0.80000000000
+1,2040,R1,gasCCGT,2022,0.80000000000
+1,2045,R1,gasCCGT,2022,0.80000000000
+1,2046,R1,gasCCGT,2022,0.80000000000
+1,2047,R1,gasCCGT,2022,0.80000000000
+1,2048,R1,gasCCGT,2022,0.80000000000
+1,2049,R1,gasCCGT,2022,0.80000000000
+1,2050,R1,gasCCGT,2022,0.80000000000
+1,2058,R1,gasCCGT,2022,0.80000000000
+2,2036,R1,gasCCGT,2024,3.20460000000
+2,2038,R1,gasCCGT,2024,3.20460000000
+2,2040,R1,gasCCGT,2024,3.20460000000
+2,2045,R1,gasCCGT,2024,3.20460000000
+2,2046,R1,gasCCGT,2024,3.20460000000
+2,2047,R1,gasCCGT,2024,3.20460000000
+2,2048,R1,gasCCGT,2024,3.20460000000
+2,2049,R1,gasCCGT,2024,3.20460000000
+2,2050,R1,gasCCGT,2024,3.20460000000
+2,2058,R1,gasCCGT,2024,3.20460000000
+2,2059,R1,gasCCGT,2024,3.20460000000
+2,2060,R1,gasCCGT,2024,3.20460000000
+3,2036,R1,gasCCGT,2026,1.01590000000
+3,2038,R1,gasCCGT,2026,1.01590000000
+3,2040,R1,gasCCGT,2026,1.01590000000
+3,2045,R1,gasCCGT,2026,1.01590000000
+3,2046,R1,gasCCGT,2026,1.01590000000
+3,2047,R1,gasCCGT,2026,1.01590000000
+3,2048,R1,gasCCGT,2026,1.01590000000
+3,2049,R1,gasCCGT,2026,1.01590000000
+3,2050,R1,gasCCGT,2026,1.01590000000
+3,2058,R1,gasCCGT,2026,1.01590000000
+3,2059,R1,gasCCGT,2026,1.01590000000
+3,2060,R1,gasCCGT,2026,1.01590000000
+3,2061,R1,gasCCGT,2026,1.01590000000
+3,2062,R1,gasCCGT,2026,1.01590000000
+4,2036,R1,gasCCGT,2028,1.01590000000
+4,2038,R1,gasCCGT,2028,1.01590000000
+4,2040,R1,gasCCGT,2028,1.01590000000
+4,2045,R1,gasCCGT,2028,1.01590000000
+4,2046,R1,gasCCGT,2028,1.01590000000
+4,2047,R1,gasCCGT,2028,1.01590000000
+4,2048,R1,gasCCGT,2028,1.01590000000
+4,2049,R1,gasCCGT,2028,1.01590000000
+4,2050,R1,gasCCGT,2028,1.01590000000
+4,2058,R1,gasCCGT,2028,1.01590000000
+4,2059,R1,gasCCGT,2028,1.01590000000
+4,2060,R1,gasCCGT,2028,1.01590000000
+4,2061,R1,gasCCGT,2028,1.01590000000
+4,2062,R1,gasCCGT,2028,1.01590000000
+4,2063,R1,gasCCGT,2028,1.01590000000
+4,2064,R1,gasCCGT,2028,1.01590000000
+5,2036,R1,gasCCGT,2030,1.01590000000
+5,2038,R1,gasCCGT,2030,1.01590000000
+5,2040,R1,gasCCGT,2030,1.01590000000
+5,2045,R1,gasCCGT,2030,1.01590000000
+5,2046,R1,gasCCGT,2030,1.01590000000
+5,2047,R1,gasCCGT,2030,1.01590000000
+5,2048,R1,gasCCGT,2030,1.01590000000
+5,2049,R1,gasCCGT,2030,1.01590000000
+5,2050,R1,gasCCGT,2030,1.01590000000
+5,2058,R1,gasCCGT,2030,1.01590000000
+5,2059,R1,gasCCGT,2030,1.01590000000
+5,2060,R1,gasCCGT,2030,1.01590000000
+5,2061,R1,gasCCGT,2030,1.01590000000
+5,2062,R1,gasCCGT,2030,1.01590000000
+5,2063,R1,gasCCGT,2030,1.01590000000
+5,2064,R1,gasCCGT,2030,1.01590000000
+5,2065,R1,gasCCGT,2030,1.01590000000
+5,2066,R1,gasCCGT,2030,1.01590000000
+6,2036,R1,solarPV,2020,4.17990000000
+6,2038,R1,solarPV,2020,4.17990000000
+6,2040,R1,solarPV,2020,4.17990000000
+6,2045,R1,solarPV,2020,4.17990000000
+6,2046,R1,solarPV,2020,4.17990000000
+7,2036,R1,solarPV,2032,2.28590000000
+7,2038,R1,solarPV,2032,2.28590000000
+7,2040,R1,solarPV,2032,2.28590000000
+7,2045,R1,solarPV,2032,2.28590000000
+7,2046,R1,solarPV,2032,2.28590000000
+7,2047,R1,solarPV,2032,2.28590000000
+7,2048,R1,solarPV,2032,2.28590000000
+7,2049,R1,solarPV,2032,2.28590000000
+7,2050,R1,solarPV,2032,2.28590000000
+7,2058,R1,solarPV,2032,2.28590000000
+8,2036,R1,solarPV,2034,4.61130000000
+8,2038,R1,solarPV,2034,4.61130000000
+8,2040,R1,solarPV,2034,4.61130000000
+8,2045,R1,solarPV,2034,4.61130000000
+8,2046,R1,solarPV,2034,4.61130000000
+8,2047,R1,solarPV,2034,4.61130000000
+8,2048,R1,solarPV,2034,4.61130000000
+8,2049,R1,solarPV,2034,4.61130000000
+8,2050,R1,solarPV,2034,4.61130000000
+8,2058,R1,solarPV,2034,4.61130000000
+8,2059,R1,solarPV,2034,4.61130000000
+8,2060,R1,solarPV,2034,4.61130000000
+9,2038,R1,solarPV,2036,2.28590000000
+9,2040,R1,solarPV,2036,2.28590000000
+9,2045,R1,solarPV,2036,2.28590000000
+9,2046,R1,solarPV,2036,2.28590000000
+9,2047,R1,solarPV,2036,2.28590000000
+9,2048,R1,solarPV,2036,2.28590000000
+9,2049,R1,solarPV,2036,2.28590000000
+9,2050,R1,solarPV,2036,2.28590000000
+9,2058,R1,solarPV,2036,2.28590000000
+9,2059,R1,solarPV,2036,2.28590000000
+9,2060,R1,solarPV,2036,2.28590000000
+9,2061,R1,solarPV,2036,2.28590000000
+9,2062,R1,solarPV,2036,2.28590000000
+10,2036,R1,windturbine,2020,8.00000000000
+10,2038,R1,windturbine,2020,8.00000000000
+10,2040,R1,windturbine,2020,8.00000000000
+10,2045,R1,windturbine,2020,8.00000000000
+10,2046,R1,windturbine,2020,8.00000000000
+11,2036,R1,windturbine,2022,0.48590000000
+11,2038,R1,windturbine,2022,0.48590000000
+11,2040,R1,windturbine,2022,0.48590000000
+11,2045,R1,windturbine,2022,0.48590000000
+11,2046,R1,windturbine,2022,0.48590000000
+11,2047,R1,windturbine,2022,0.48590000000
+11,2048,R1,windturbine,2022,0.48590000000
+13,2036,R2,gasCCGT,2022,0.80000000000
+13,2038,R2,gasCCGT,2022,0.80000000000
+13,2040,R2,gasCCGT,2022,0.80000000000
+13,2045,R2,gasCCGT,2022,0.80000000000
+13,2046,R2,gasCCGT,2022,0.80000000000
+13,2047,R2,gasCCGT,2022,0.80000000000
+13,2048,R2,gasCCGT,2022,0.80000000000
+13,2049,R2,gasCCGT,2022,0.80000000000
+13,2050,R2,gasCCGT,2022,0.80000000000
+13,2058,R2,gasCCGT,2022,0.80000000000
+14,2036,R2,gasCCGT,2024,3.20460000000
+14,2038,R2,gasCCGT,2024,3.20460000000
+14,2040,R2,gasCCGT,2024,3.20460000000
+14,2045,R2,gasCCGT,2024,3.20460000000
+14,2046,R2,gasCCGT,2024,3.20460000000
+14,2047,R2,gasCCGT,2024,3.20460000000
+14,2048,R2,gasCCGT,2024,3.20460000000
+14,2049,R2,gasCCGT,2024,3.20460000000
+14,2050,R2,gasCCGT,2024,3.20460000000
+14,2058,R2,gasCCGT,2024,3.20460000000
+14,2059,R2,gasCCGT,2024,3.20460000000
+14,2060,R2,gasCCGT,2024,3.20460000000
+15,2036,R2,gasCCGT,2026,1.01590000000
+15,2038,R2,gasCCGT,2026,1.01590000000
+15,2040,R2,gasCCGT,2026,1.01590000000
+15,2045,R2,gasCCGT,2026,1.01590000000
+15,2046,R2,gasCCGT,2026,1.01590000000
+15,2047,R2,gasCCGT,2026,1.01590000000
+15,2048,R2,gasCCGT,2026,1.01590000000
+15,2049,R2,gasCCGT,2026,1.01590000000
+15,2050,R2,gasCCGT,2026,1.01590000000
+15,2058,R2,gasCCGT,2026,1.01590000000
+15,2059,R2,gasCCGT,2026,1.01590000000
+15,2060,R2,gasCCGT,2026,1.01590000000
+15,2061,R2,gasCCGT,2026,1.01590000000
+15,2062,R2,gasCCGT,2026,1.01590000000
+16,2036,R2,gasCCGT,2028,1.01590000000
+16,2038,R2,gasCCGT,2028,1.01590000000
+16,2040,R2,gasCCGT,2028,1.01590000000
+16,2045,R2,gasCCGT,2028,1.01590000000
+16,2046,R2,gasCCGT,2028,1.01590000000
+16,2047,R2,gasCCGT,2028,1.01590000000
+16,2048,R2,gasCCGT,2028,1.01590000000
+16,2049,R2,gasCCGT,2028,1.01590000000
+16,2050,R2,gasCCGT,2028,1.01590000000
+16,2058,R2,gasCCGT,2028,1.01590000000
+16,2059,R2,gasCCGT,2028,1.01590000000
+16,2060,R2,gasCCGT,2028,1.01590000000
+16,2061,R2,gasCCGT,2028,1.01590000000
+16,2062,R2,gasCCGT,2028,1.01590000000
+16,2063,R2,gasCCGT,2028,1.01590000000
+16,2064,R2,gasCCGT,2028,1.01590000000
+17,2036,R2,gasCCGT,2030,1.01590000000
+17,2038,R2,gasCCGT,2030,1.01590000000
+17,2040,R2,gasCCGT,2030,1.01590000000
+17,2045,R2,gasCCGT,2030,1.01590000000
+17,2046,R2,gasCCGT,2030,1.01590000000
+17,2047,R2,gasCCGT,2030,1.01590000000
+17,2048,R2,gasCCGT,2030,1.01590000000
+17,2049,R2,gasCCGT,2030,1.01590000000
+17,2050,R2,gasCCGT,2030,1.01590000000
+17,2058,R2,gasCCGT,2030,1.01590000000
+17,2059,R2,gasCCGT,2030,1.01590000000
+17,2060,R2,gasCCGT,2030,1.01590000000
+17,2061,R2,gasCCGT,2030,1.01590000000
+17,2062,R2,gasCCGT,2030,1.01590000000
+17,2063,R2,gasCCGT,2030,1.01590000000
+17,2064,R2,gasCCGT,2030,1.01590000000
+17,2065,R2,gasCCGT,2030,1.01590000000
+17,2066,R2,gasCCGT,2030,1.01590000000
+18,2036,R2,solarPV,2032,2.28590000000
+18,2038,R2,solarPV,2032,2.28590000000
+18,2040,R2,solarPV,2032,2.28590000000
+18,2045,R2,solarPV,2032,2.28590000000
+18,2046,R2,solarPV,2032,2.28590000000
+18,2047,R2,solarPV,2032,2.28590000000
+18,2048,R2,solarPV,2032,2.28590000000
+18,2049,R2,solarPV,2032,2.28590000000
+18,2050,R2,solarPV,2032,2.28590000000
+18,2058,R2,solarPV,2032,2.28590000000
+19,2036,R2,solarPV,2034,1.82870000000
+19,2038,R2,solarPV,2034,1.82870000000
+19,2040,R2,solarPV,2034,1.82870000000
+19,2045,R2,solarPV,2034,1.82870000000
+19,2046,R2,solarPV,2034,1.82870000000
+19,2047,R2,solarPV,2034,1.82870000000
+19,2048,R2,solarPV,2034,1.82870000000
+19,2049,R2,solarPV,2034,1.82870000000
+19,2050,R2,solarPV,2034,1.82870000000
+19,2058,R2,solarPV,2034,1.82870000000
+19,2059,R2,solarPV,2034,1.82870000000
+19,2060,R2,solarPV,2034,1.82870000000
+20,2038,R2,solarPV,2036,2.28590000000
+20,2040,R2,solarPV,2036,2.28590000000
+20,2045,R2,solarPV,2036,2.28590000000
+20,2046,R2,solarPV,2036,2.28590000000
+20,2047,R2,solarPV,2036,2.28590000000
+20,2048,R2,solarPV,2036,2.28590000000
+20,2049,R2,solarPV,2036,2.28590000000
+20,2050,R2,solarPV,2036,2.28590000000
+20,2058,R2,solarPV,2036,2.28590000000
+20,2059,R2,solarPV,2036,2.28590000000
+20,2060,R2,solarPV,2036,2.28590000000
+20,2061,R2,solarPV,2036,2.28590000000
+20,2062,R2,solarPV,2036,2.28590000000
+21,2036,R2,windturbine,2020,12.17990000000
+21,2038,R2,windturbine,2020,12.17990000000
+21,2040,R2,windturbine,2020,12.17990000000
+21,2045,R2,windturbine,2020,12.17990000000
+21,2046,R2,windturbine,2020,12.17990000000
+22,2036,R2,windturbine,2022,0.48590000000
+22,2038,R2,windturbine,2022,0.48590000000
+22,2040,R2,windturbine,2022,0.48590000000
+22,2045,R2,windturbine,2022,0.48590000000
+22,2046,R2,windturbine,2022,0.48590000000
+22,2047,R2,windturbine,2022,0.48590000000
+22,2048,R2,windturbine,2022,0.48590000000
+23,2036,R2,windturbine,2034,2.78270000000
+23,2038,R2,windturbine,2034,2.78270000000
+23,2040,R2,windturbine,2034,2.78270000000
+23,2045,R2,windturbine,2034,2.78270000000
+23,2046,R2,windturbine,2034,2.78270000000
+23,2047,R2,windturbine,2034,2.78270000000
+23,2048,R2,windturbine,2034,2.78270000000
+23,2049,R2,windturbine,2034,2.78270000000
+23,2050,R2,windturbine,2034,2.78270000000
+23,2058,R2,windturbine,2034,2.78270000000
+23,2059,R2,windturbine,2034,2.78270000000
+23,2060,R2,windturbine,2034,2.78270000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2038.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2038.csv
index 06e4c47cc..46187e911 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2038.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2038.csv
@@ -1,260 +1,260 @@
-asset,year,region,installed,technology,capacity
-1,2038,R1,2020,solarPV,4.17990000000
-1,2040,R1,2020,solarPV,4.17990000000
-1,2045,R1,2020,solarPV,4.17990000000
-1,2046,R1,2020,solarPV,4.17990000000
-2,2038,R1,2020,windturbine,8.00000000000
-2,2040,R1,2020,windturbine,8.00000000000
-2,2045,R1,2020,windturbine,8.00000000000
-2,2046,R1,2020,windturbine,8.00000000000
-3,2038,R1,2022,gasCCGT,0.80000000000
-3,2040,R1,2022,gasCCGT,0.80000000000
-3,2045,R1,2022,gasCCGT,0.80000000000
-3,2046,R1,2022,gasCCGT,0.80000000000
-3,2047,R1,2022,gasCCGT,0.80000000000
-3,2048,R1,2022,gasCCGT,0.80000000000
-3,2049,R1,2022,gasCCGT,0.80000000000
-3,2050,R1,2022,gasCCGT,0.80000000000
-3,2058,R1,2022,gasCCGT,0.80000000000
-4,2038,R1,2022,windturbine,0.48590000000
-4,2040,R1,2022,windturbine,0.48590000000
-4,2045,R1,2022,windturbine,0.48590000000
-4,2046,R1,2022,windturbine,0.48590000000
-4,2047,R1,2022,windturbine,0.48590000000
-4,2048,R1,2022,windturbine,0.48590000000
-5,2038,R1,2024,gasCCGT,3.20460000000
-5,2040,R1,2024,gasCCGT,3.20460000000
-5,2045,R1,2024,gasCCGT,3.20460000000
-5,2046,R1,2024,gasCCGT,3.20460000000
-5,2047,R1,2024,gasCCGT,3.20460000000
-5,2048,R1,2024,gasCCGT,3.20460000000
-5,2049,R1,2024,gasCCGT,3.20460000000
-5,2050,R1,2024,gasCCGT,3.20460000000
-5,2058,R1,2024,gasCCGT,3.20460000000
-5,2059,R1,2024,gasCCGT,3.20460000000
-5,2060,R1,2024,gasCCGT,3.20460000000
-6,2038,R1,2026,gasCCGT,1.01590000000
-6,2040,R1,2026,gasCCGT,1.01590000000
-6,2045,R1,2026,gasCCGT,1.01590000000
-6,2046,R1,2026,gasCCGT,1.01590000000
-6,2047,R1,2026,gasCCGT,1.01590000000
-6,2048,R1,2026,gasCCGT,1.01590000000
-6,2049,R1,2026,gasCCGT,1.01590000000
-6,2050,R1,2026,gasCCGT,1.01590000000
-6,2058,R1,2026,gasCCGT,1.01590000000
-6,2059,R1,2026,gasCCGT,1.01590000000
-6,2060,R1,2026,gasCCGT,1.01590000000
-6,2061,R1,2026,gasCCGT,1.01590000000
-6,2062,R1,2026,gasCCGT,1.01590000000
-7,2038,R1,2028,gasCCGT,1.01590000000
-7,2040,R1,2028,gasCCGT,1.01590000000
-7,2045,R1,2028,gasCCGT,1.01590000000
-7,2046,R1,2028,gasCCGT,1.01590000000
-7,2047,R1,2028,gasCCGT,1.01590000000
-7,2048,R1,2028,gasCCGT,1.01590000000
-7,2049,R1,2028,gasCCGT,1.01590000000
-7,2050,R1,2028,gasCCGT,1.01590000000
-7,2058,R1,2028,gasCCGT,1.01590000000
-7,2059,R1,2028,gasCCGT,1.01590000000
-7,2060,R1,2028,gasCCGT,1.01590000000
-7,2061,R1,2028,gasCCGT,1.01590000000
-7,2062,R1,2028,gasCCGT,1.01590000000
-7,2063,R1,2028,gasCCGT,1.01590000000
-7,2064,R1,2028,gasCCGT,1.01590000000
-8,2038,R1,2030,gasCCGT,1.01590000000
-8,2040,R1,2030,gasCCGT,1.01590000000
-8,2045,R1,2030,gasCCGT,1.01590000000
-8,2046,R1,2030,gasCCGT,1.01590000000
-8,2047,R1,2030,gasCCGT,1.01590000000
-8,2048,R1,2030,gasCCGT,1.01590000000
-8,2049,R1,2030,gasCCGT,1.01590000000
-8,2050,R1,2030,gasCCGT,1.01590000000
-8,2058,R1,2030,gasCCGT,1.01590000000
-8,2059,R1,2030,gasCCGT,1.01590000000
-8,2060,R1,2030,gasCCGT,1.01590000000
-8,2061,R1,2030,gasCCGT,1.01590000000
-8,2062,R1,2030,gasCCGT,1.01590000000
-8,2063,R1,2030,gasCCGT,1.01590000000
-8,2064,R1,2030,gasCCGT,1.01590000000
-8,2065,R1,2030,gasCCGT,1.01590000000
-8,2066,R1,2030,gasCCGT,1.01590000000
-9,2038,R1,2032,solarPV,2.28590000000
-9,2040,R1,2032,solarPV,2.28590000000
-9,2045,R1,2032,solarPV,2.28590000000
-9,2046,R1,2032,solarPV,2.28590000000
-9,2047,R1,2032,solarPV,2.28590000000
-9,2048,R1,2032,solarPV,2.28590000000
-9,2049,R1,2032,solarPV,2.28590000000
-9,2050,R1,2032,solarPV,2.28590000000
-9,2058,R1,2032,solarPV,2.28590000000
-10,2038,R1,2034,solarPV,4.61130000000
-10,2040,R1,2034,solarPV,4.61130000000
-10,2045,R1,2034,solarPV,4.61130000000
-10,2046,R1,2034,solarPV,4.61130000000
-10,2047,R1,2034,solarPV,4.61130000000
-10,2048,R1,2034,solarPV,4.61130000000
-10,2049,R1,2034,solarPV,4.61130000000
-10,2050,R1,2034,solarPV,4.61130000000
-10,2058,R1,2034,solarPV,4.61130000000
-10,2059,R1,2034,solarPV,4.61130000000
-10,2060,R1,2034,solarPV,4.61130000000
-11,2038,R1,2036,solarPV,2.28590000000
-11,2040,R1,2036,solarPV,2.28590000000
-11,2045,R1,2036,solarPV,2.28590000000
-11,2046,R1,2036,solarPV,2.28590000000
-11,2047,R1,2036,solarPV,2.28590000000
-11,2048,R1,2036,solarPV,2.28590000000
-11,2049,R1,2036,solarPV,2.28590000000
-11,2050,R1,2036,solarPV,2.28590000000
-11,2058,R1,2036,solarPV,2.28590000000
-11,2059,R1,2036,solarPV,2.28590000000
-11,2060,R1,2036,solarPV,2.28590000000
-11,2061,R1,2036,solarPV,2.28590000000
-11,2062,R1,2036,solarPV,2.28590000000
-12,2040,R1,2038,solarPV,2.28590000000
-12,2045,R1,2038,solarPV,2.28590000000
-12,2046,R1,2038,solarPV,2.28590000000
-12,2047,R1,2038,solarPV,2.28590000000
-12,2048,R1,2038,solarPV,2.28590000000
-12,2049,R1,2038,solarPV,2.28590000000
-12,2050,R1,2038,solarPV,2.28590000000
-12,2058,R1,2038,solarPV,2.28590000000
-12,2059,R1,2038,solarPV,2.28590000000
-12,2060,R1,2038,solarPV,2.28590000000
-12,2061,R1,2038,solarPV,2.28590000000
-12,2062,R1,2038,solarPV,2.28590000000
-12,2063,R1,2038,solarPV,2.28590000000
-12,2064,R1,2038,solarPV,2.28590000000
-14,2038,R2,2020,windturbine,12.17990000000
-14,2040,R2,2020,windturbine,12.17990000000
-14,2045,R2,2020,windturbine,12.17990000000
-14,2046,R2,2020,windturbine,12.17990000000
-15,2038,R2,2022,gasCCGT,0.80000000000
-15,2040,R2,2022,gasCCGT,0.80000000000
-15,2045,R2,2022,gasCCGT,0.80000000000
-15,2046,R2,2022,gasCCGT,0.80000000000
-15,2047,R2,2022,gasCCGT,0.80000000000
-15,2048,R2,2022,gasCCGT,0.80000000000
-15,2049,R2,2022,gasCCGT,0.80000000000
-15,2050,R2,2022,gasCCGT,0.80000000000
-15,2058,R2,2022,gasCCGT,0.80000000000
-16,2038,R2,2022,windturbine,0.48590000000
-16,2040,R2,2022,windturbine,0.48590000000
-16,2045,R2,2022,windturbine,0.48590000000
-16,2046,R2,2022,windturbine,0.48590000000
-16,2047,R2,2022,windturbine,0.48590000000
-16,2048,R2,2022,windturbine,0.48590000000
-17,2038,R2,2024,gasCCGT,3.20460000000
-17,2040,R2,2024,gasCCGT,3.20460000000
-17,2045,R2,2024,gasCCGT,3.20460000000
-17,2046,R2,2024,gasCCGT,3.20460000000
-17,2047,R2,2024,gasCCGT,3.20460000000
-17,2048,R2,2024,gasCCGT,3.20460000000
-17,2049,R2,2024,gasCCGT,3.20460000000
-17,2050,R2,2024,gasCCGT,3.20460000000
-17,2058,R2,2024,gasCCGT,3.20460000000
-17,2059,R2,2024,gasCCGT,3.20460000000
-17,2060,R2,2024,gasCCGT,3.20460000000
-18,2038,R2,2026,gasCCGT,1.01590000000
-18,2040,R2,2026,gasCCGT,1.01590000000
-18,2045,R2,2026,gasCCGT,1.01590000000
-18,2046,R2,2026,gasCCGT,1.01590000000
-18,2047,R2,2026,gasCCGT,1.01590000000
-18,2048,R2,2026,gasCCGT,1.01590000000
-18,2049,R2,2026,gasCCGT,1.01590000000
-18,2050,R2,2026,gasCCGT,1.01590000000
-18,2058,R2,2026,gasCCGT,1.01590000000
-18,2059,R2,2026,gasCCGT,1.01590000000
-18,2060,R2,2026,gasCCGT,1.01590000000
-18,2061,R2,2026,gasCCGT,1.01590000000
-18,2062,R2,2026,gasCCGT,1.01590000000
-19,2038,R2,2028,gasCCGT,1.01590000000
-19,2040,R2,2028,gasCCGT,1.01590000000
-19,2045,R2,2028,gasCCGT,1.01590000000
-19,2046,R2,2028,gasCCGT,1.01590000000
-19,2047,R2,2028,gasCCGT,1.01590000000
-19,2048,R2,2028,gasCCGT,1.01590000000
-19,2049,R2,2028,gasCCGT,1.01590000000
-19,2050,R2,2028,gasCCGT,1.01590000000
-19,2058,R2,2028,gasCCGT,1.01590000000
-19,2059,R2,2028,gasCCGT,1.01590000000
-19,2060,R2,2028,gasCCGT,1.01590000000
-19,2061,R2,2028,gasCCGT,1.01590000000
-19,2062,R2,2028,gasCCGT,1.01590000000
-19,2063,R2,2028,gasCCGT,1.01590000000
-19,2064,R2,2028,gasCCGT,1.01590000000
-20,2038,R2,2030,gasCCGT,1.01590000000
-20,2040,R2,2030,gasCCGT,1.01590000000
-20,2045,R2,2030,gasCCGT,1.01590000000
-20,2046,R2,2030,gasCCGT,1.01590000000
-20,2047,R2,2030,gasCCGT,1.01590000000
-20,2048,R2,2030,gasCCGT,1.01590000000
-20,2049,R2,2030,gasCCGT,1.01590000000
-20,2050,R2,2030,gasCCGT,1.01590000000
-20,2058,R2,2030,gasCCGT,1.01590000000
-20,2059,R2,2030,gasCCGT,1.01590000000
-20,2060,R2,2030,gasCCGT,1.01590000000
-20,2061,R2,2030,gasCCGT,1.01590000000
-20,2062,R2,2030,gasCCGT,1.01590000000
-20,2063,R2,2030,gasCCGT,1.01590000000
-20,2064,R2,2030,gasCCGT,1.01590000000
-20,2065,R2,2030,gasCCGT,1.01590000000
-20,2066,R2,2030,gasCCGT,1.01590000000
-21,2038,R2,2032,solarPV,2.28590000000
-21,2040,R2,2032,solarPV,2.28590000000
-21,2045,R2,2032,solarPV,2.28590000000
-21,2046,R2,2032,solarPV,2.28590000000
-21,2047,R2,2032,solarPV,2.28590000000
-21,2048,R2,2032,solarPV,2.28590000000
-21,2049,R2,2032,solarPV,2.28590000000
-21,2050,R2,2032,solarPV,2.28590000000
-21,2058,R2,2032,solarPV,2.28590000000
-22,2038,R2,2034,solarPV,1.82870000000
-22,2040,R2,2034,solarPV,1.82870000000
-22,2045,R2,2034,solarPV,1.82870000000
-22,2046,R2,2034,solarPV,1.82870000000
-22,2047,R2,2034,solarPV,1.82870000000
-22,2048,R2,2034,solarPV,1.82870000000
-22,2049,R2,2034,solarPV,1.82870000000
-22,2050,R2,2034,solarPV,1.82870000000
-22,2058,R2,2034,solarPV,1.82870000000
-22,2059,R2,2034,solarPV,1.82870000000
-22,2060,R2,2034,solarPV,1.82870000000
-23,2038,R2,2034,windturbine,2.78270000000
-23,2040,R2,2034,windturbine,2.78270000000
-23,2045,R2,2034,windturbine,2.78270000000
-23,2046,R2,2034,windturbine,2.78270000000
-23,2047,R2,2034,windturbine,2.78270000000
-23,2048,R2,2034,windturbine,2.78270000000
-23,2049,R2,2034,windturbine,2.78270000000
-23,2050,R2,2034,windturbine,2.78270000000
-23,2058,R2,2034,windturbine,2.78270000000
-23,2059,R2,2034,windturbine,2.78270000000
-23,2060,R2,2034,windturbine,2.78270000000
-24,2038,R2,2036,solarPV,2.28590000000
-24,2040,R2,2036,solarPV,2.28590000000
-24,2045,R2,2036,solarPV,2.28590000000
-24,2046,R2,2036,solarPV,2.28590000000
-24,2047,R2,2036,solarPV,2.28590000000
-24,2048,R2,2036,solarPV,2.28590000000
-24,2049,R2,2036,solarPV,2.28590000000
-24,2050,R2,2036,solarPV,2.28590000000
-24,2058,R2,2036,solarPV,2.28590000000
-24,2059,R2,2036,solarPV,2.28590000000
-24,2060,R2,2036,solarPV,2.28590000000
-24,2061,R2,2036,solarPV,2.28590000000
-24,2062,R2,2036,solarPV,2.28590000000
-25,2040,R2,2038,solarPV,2.28590000000
-25,2045,R2,2038,solarPV,2.28590000000
-25,2046,R2,2038,solarPV,2.28590000000
-25,2047,R2,2038,solarPV,2.28590000000
-25,2048,R2,2038,solarPV,2.28590000000
-25,2049,R2,2038,solarPV,2.28590000000
-25,2050,R2,2038,solarPV,2.28590000000
-25,2058,R2,2038,solarPV,2.28590000000
-25,2059,R2,2038,solarPV,2.28590000000
-25,2060,R2,2038,solarPV,2.28590000000
-25,2061,R2,2038,solarPV,2.28590000000
-25,2062,R2,2038,solarPV,2.28590000000
-25,2063,R2,2038,solarPV,2.28590000000
-25,2064,R2,2038,solarPV,2.28590000000
+asset,year,region,technology,installed,capacity
+1,2038,R1,gasCCGT,2022,0.80000000000
+1,2040,R1,gasCCGT,2022,0.80000000000
+1,2045,R1,gasCCGT,2022,0.80000000000
+1,2046,R1,gasCCGT,2022,0.80000000000
+1,2047,R1,gasCCGT,2022,0.80000000000
+1,2048,R1,gasCCGT,2022,0.80000000000
+1,2049,R1,gasCCGT,2022,0.80000000000
+1,2050,R1,gasCCGT,2022,0.80000000000
+1,2058,R1,gasCCGT,2022,0.80000000000
+2,2038,R1,gasCCGT,2024,3.20460000000
+2,2040,R1,gasCCGT,2024,3.20460000000
+2,2045,R1,gasCCGT,2024,3.20460000000
+2,2046,R1,gasCCGT,2024,3.20460000000
+2,2047,R1,gasCCGT,2024,3.20460000000
+2,2048,R1,gasCCGT,2024,3.20460000000
+2,2049,R1,gasCCGT,2024,3.20460000000
+2,2050,R1,gasCCGT,2024,3.20460000000
+2,2058,R1,gasCCGT,2024,3.20460000000
+2,2059,R1,gasCCGT,2024,3.20460000000
+2,2060,R1,gasCCGT,2024,3.20460000000
+3,2038,R1,gasCCGT,2026,1.01590000000
+3,2040,R1,gasCCGT,2026,1.01590000000
+3,2045,R1,gasCCGT,2026,1.01590000000
+3,2046,R1,gasCCGT,2026,1.01590000000
+3,2047,R1,gasCCGT,2026,1.01590000000
+3,2048,R1,gasCCGT,2026,1.01590000000
+3,2049,R1,gasCCGT,2026,1.01590000000
+3,2050,R1,gasCCGT,2026,1.01590000000
+3,2058,R1,gasCCGT,2026,1.01590000000
+3,2059,R1,gasCCGT,2026,1.01590000000
+3,2060,R1,gasCCGT,2026,1.01590000000
+3,2061,R1,gasCCGT,2026,1.01590000000
+3,2062,R1,gasCCGT,2026,1.01590000000
+4,2038,R1,gasCCGT,2028,1.01590000000
+4,2040,R1,gasCCGT,2028,1.01590000000
+4,2045,R1,gasCCGT,2028,1.01590000000
+4,2046,R1,gasCCGT,2028,1.01590000000
+4,2047,R1,gasCCGT,2028,1.01590000000
+4,2048,R1,gasCCGT,2028,1.01590000000
+4,2049,R1,gasCCGT,2028,1.01590000000
+4,2050,R1,gasCCGT,2028,1.01590000000
+4,2058,R1,gasCCGT,2028,1.01590000000
+4,2059,R1,gasCCGT,2028,1.01590000000
+4,2060,R1,gasCCGT,2028,1.01590000000
+4,2061,R1,gasCCGT,2028,1.01590000000
+4,2062,R1,gasCCGT,2028,1.01590000000
+4,2063,R1,gasCCGT,2028,1.01590000000
+4,2064,R1,gasCCGT,2028,1.01590000000
+5,2038,R1,gasCCGT,2030,1.01590000000
+5,2040,R1,gasCCGT,2030,1.01590000000
+5,2045,R1,gasCCGT,2030,1.01590000000
+5,2046,R1,gasCCGT,2030,1.01590000000
+5,2047,R1,gasCCGT,2030,1.01590000000
+5,2048,R1,gasCCGT,2030,1.01590000000
+5,2049,R1,gasCCGT,2030,1.01590000000
+5,2050,R1,gasCCGT,2030,1.01590000000
+5,2058,R1,gasCCGT,2030,1.01590000000
+5,2059,R1,gasCCGT,2030,1.01590000000
+5,2060,R1,gasCCGT,2030,1.01590000000
+5,2061,R1,gasCCGT,2030,1.01590000000
+5,2062,R1,gasCCGT,2030,1.01590000000
+5,2063,R1,gasCCGT,2030,1.01590000000
+5,2064,R1,gasCCGT,2030,1.01590000000
+5,2065,R1,gasCCGT,2030,1.01590000000
+5,2066,R1,gasCCGT,2030,1.01590000000
+6,2038,R1,solarPV,2020,4.17990000000
+6,2040,R1,solarPV,2020,4.17990000000
+6,2045,R1,solarPV,2020,4.17990000000
+6,2046,R1,solarPV,2020,4.17990000000
+7,2038,R1,solarPV,2032,2.28590000000
+7,2040,R1,solarPV,2032,2.28590000000
+7,2045,R1,solarPV,2032,2.28590000000
+7,2046,R1,solarPV,2032,2.28590000000
+7,2047,R1,solarPV,2032,2.28590000000
+7,2048,R1,solarPV,2032,2.28590000000
+7,2049,R1,solarPV,2032,2.28590000000
+7,2050,R1,solarPV,2032,2.28590000000
+7,2058,R1,solarPV,2032,2.28590000000
+8,2038,R1,solarPV,2034,4.61130000000
+8,2040,R1,solarPV,2034,4.61130000000
+8,2045,R1,solarPV,2034,4.61130000000
+8,2046,R1,solarPV,2034,4.61130000000
+8,2047,R1,solarPV,2034,4.61130000000
+8,2048,R1,solarPV,2034,4.61130000000
+8,2049,R1,solarPV,2034,4.61130000000
+8,2050,R1,solarPV,2034,4.61130000000
+8,2058,R1,solarPV,2034,4.61130000000
+8,2059,R1,solarPV,2034,4.61130000000
+8,2060,R1,solarPV,2034,4.61130000000
+9,2038,R1,solarPV,2036,2.28590000000
+9,2040,R1,solarPV,2036,2.28590000000
+9,2045,R1,solarPV,2036,2.28590000000
+9,2046,R1,solarPV,2036,2.28590000000
+9,2047,R1,solarPV,2036,2.28590000000
+9,2048,R1,solarPV,2036,2.28590000000
+9,2049,R1,solarPV,2036,2.28590000000
+9,2050,R1,solarPV,2036,2.28590000000
+9,2058,R1,solarPV,2036,2.28590000000
+9,2059,R1,solarPV,2036,2.28590000000
+9,2060,R1,solarPV,2036,2.28590000000
+9,2061,R1,solarPV,2036,2.28590000000
+9,2062,R1,solarPV,2036,2.28590000000
+10,2040,R1,solarPV,2038,2.28590000000
+10,2045,R1,solarPV,2038,2.28590000000
+10,2046,R1,solarPV,2038,2.28590000000
+10,2047,R1,solarPV,2038,2.28590000000
+10,2048,R1,solarPV,2038,2.28590000000
+10,2049,R1,solarPV,2038,2.28590000000
+10,2050,R1,solarPV,2038,2.28590000000
+10,2058,R1,solarPV,2038,2.28590000000
+10,2059,R1,solarPV,2038,2.28590000000
+10,2060,R1,solarPV,2038,2.28590000000
+10,2061,R1,solarPV,2038,2.28590000000
+10,2062,R1,solarPV,2038,2.28590000000
+10,2063,R1,solarPV,2038,2.28590000000
+10,2064,R1,solarPV,2038,2.28590000000
+11,2038,R1,windturbine,2020,8.00000000000
+11,2040,R1,windturbine,2020,8.00000000000
+11,2045,R1,windturbine,2020,8.00000000000
+11,2046,R1,windturbine,2020,8.00000000000
+12,2038,R1,windturbine,2022,0.48590000000
+12,2040,R1,windturbine,2022,0.48590000000
+12,2045,R1,windturbine,2022,0.48590000000
+12,2046,R1,windturbine,2022,0.48590000000
+12,2047,R1,windturbine,2022,0.48590000000
+12,2048,R1,windturbine,2022,0.48590000000
+14,2038,R2,gasCCGT,2022,0.80000000000
+14,2040,R2,gasCCGT,2022,0.80000000000
+14,2045,R2,gasCCGT,2022,0.80000000000
+14,2046,R2,gasCCGT,2022,0.80000000000
+14,2047,R2,gasCCGT,2022,0.80000000000
+14,2048,R2,gasCCGT,2022,0.80000000000
+14,2049,R2,gasCCGT,2022,0.80000000000
+14,2050,R2,gasCCGT,2022,0.80000000000
+14,2058,R2,gasCCGT,2022,0.80000000000
+15,2038,R2,gasCCGT,2024,3.20460000000
+15,2040,R2,gasCCGT,2024,3.20460000000
+15,2045,R2,gasCCGT,2024,3.20460000000
+15,2046,R2,gasCCGT,2024,3.20460000000
+15,2047,R2,gasCCGT,2024,3.20460000000
+15,2048,R2,gasCCGT,2024,3.20460000000
+15,2049,R2,gasCCGT,2024,3.20460000000
+15,2050,R2,gasCCGT,2024,3.20460000000
+15,2058,R2,gasCCGT,2024,3.20460000000
+15,2059,R2,gasCCGT,2024,3.20460000000
+15,2060,R2,gasCCGT,2024,3.20460000000
+16,2038,R2,gasCCGT,2026,1.01590000000
+16,2040,R2,gasCCGT,2026,1.01590000000
+16,2045,R2,gasCCGT,2026,1.01590000000
+16,2046,R2,gasCCGT,2026,1.01590000000
+16,2047,R2,gasCCGT,2026,1.01590000000
+16,2048,R2,gasCCGT,2026,1.01590000000
+16,2049,R2,gasCCGT,2026,1.01590000000
+16,2050,R2,gasCCGT,2026,1.01590000000
+16,2058,R2,gasCCGT,2026,1.01590000000
+16,2059,R2,gasCCGT,2026,1.01590000000
+16,2060,R2,gasCCGT,2026,1.01590000000
+16,2061,R2,gasCCGT,2026,1.01590000000
+16,2062,R2,gasCCGT,2026,1.01590000000
+17,2038,R2,gasCCGT,2028,1.01590000000
+17,2040,R2,gasCCGT,2028,1.01590000000
+17,2045,R2,gasCCGT,2028,1.01590000000
+17,2046,R2,gasCCGT,2028,1.01590000000
+17,2047,R2,gasCCGT,2028,1.01590000000
+17,2048,R2,gasCCGT,2028,1.01590000000
+17,2049,R2,gasCCGT,2028,1.01590000000
+17,2050,R2,gasCCGT,2028,1.01590000000
+17,2058,R2,gasCCGT,2028,1.01590000000
+17,2059,R2,gasCCGT,2028,1.01590000000
+17,2060,R2,gasCCGT,2028,1.01590000000
+17,2061,R2,gasCCGT,2028,1.01590000000
+17,2062,R2,gasCCGT,2028,1.01590000000
+17,2063,R2,gasCCGT,2028,1.01590000000
+17,2064,R2,gasCCGT,2028,1.01590000000
+18,2038,R2,gasCCGT,2030,1.01590000000
+18,2040,R2,gasCCGT,2030,1.01590000000
+18,2045,R2,gasCCGT,2030,1.01590000000
+18,2046,R2,gasCCGT,2030,1.01590000000
+18,2047,R2,gasCCGT,2030,1.01590000000
+18,2048,R2,gasCCGT,2030,1.01590000000
+18,2049,R2,gasCCGT,2030,1.01590000000
+18,2050,R2,gasCCGT,2030,1.01590000000
+18,2058,R2,gasCCGT,2030,1.01590000000
+18,2059,R2,gasCCGT,2030,1.01590000000
+18,2060,R2,gasCCGT,2030,1.01590000000
+18,2061,R2,gasCCGT,2030,1.01590000000
+18,2062,R2,gasCCGT,2030,1.01590000000
+18,2063,R2,gasCCGT,2030,1.01590000000
+18,2064,R2,gasCCGT,2030,1.01590000000
+18,2065,R2,gasCCGT,2030,1.01590000000
+18,2066,R2,gasCCGT,2030,1.01590000000
+19,2038,R2,solarPV,2032,2.28590000000
+19,2040,R2,solarPV,2032,2.28590000000
+19,2045,R2,solarPV,2032,2.28590000000
+19,2046,R2,solarPV,2032,2.28590000000
+19,2047,R2,solarPV,2032,2.28590000000
+19,2048,R2,solarPV,2032,2.28590000000
+19,2049,R2,solarPV,2032,2.28590000000
+19,2050,R2,solarPV,2032,2.28590000000
+19,2058,R2,solarPV,2032,2.28590000000
+20,2038,R2,solarPV,2034,1.82870000000
+20,2040,R2,solarPV,2034,1.82870000000
+20,2045,R2,solarPV,2034,1.82870000000
+20,2046,R2,solarPV,2034,1.82870000000
+20,2047,R2,solarPV,2034,1.82870000000
+20,2048,R2,solarPV,2034,1.82870000000
+20,2049,R2,solarPV,2034,1.82870000000
+20,2050,R2,solarPV,2034,1.82870000000
+20,2058,R2,solarPV,2034,1.82870000000
+20,2059,R2,solarPV,2034,1.82870000000
+20,2060,R2,solarPV,2034,1.82870000000
+21,2038,R2,solarPV,2036,2.28590000000
+21,2040,R2,solarPV,2036,2.28590000000
+21,2045,R2,solarPV,2036,2.28590000000
+21,2046,R2,solarPV,2036,2.28590000000
+21,2047,R2,solarPV,2036,2.28590000000
+21,2048,R2,solarPV,2036,2.28590000000
+21,2049,R2,solarPV,2036,2.28590000000
+21,2050,R2,solarPV,2036,2.28590000000
+21,2058,R2,solarPV,2036,2.28590000000
+21,2059,R2,solarPV,2036,2.28590000000
+21,2060,R2,solarPV,2036,2.28590000000
+21,2061,R2,solarPV,2036,2.28590000000
+21,2062,R2,solarPV,2036,2.28590000000
+22,2040,R2,solarPV,2038,2.28590000000
+22,2045,R2,solarPV,2038,2.28590000000
+22,2046,R2,solarPV,2038,2.28590000000
+22,2047,R2,solarPV,2038,2.28590000000
+22,2048,R2,solarPV,2038,2.28590000000
+22,2049,R2,solarPV,2038,2.28590000000
+22,2050,R2,solarPV,2038,2.28590000000
+22,2058,R2,solarPV,2038,2.28590000000
+22,2059,R2,solarPV,2038,2.28590000000
+22,2060,R2,solarPV,2038,2.28590000000
+22,2061,R2,solarPV,2038,2.28590000000
+22,2062,R2,solarPV,2038,2.28590000000
+22,2063,R2,solarPV,2038,2.28590000000
+22,2064,R2,solarPV,2038,2.28590000000
+23,2038,R2,windturbine,2020,12.17990000000
+23,2040,R2,windturbine,2020,12.17990000000
+23,2045,R2,windturbine,2020,12.17990000000
+23,2046,R2,windturbine,2020,12.17990000000
+24,2038,R2,windturbine,2022,0.48590000000
+24,2040,R2,windturbine,2022,0.48590000000
+24,2045,R2,windturbine,2022,0.48590000000
+24,2046,R2,windturbine,2022,0.48590000000
+24,2047,R2,windturbine,2022,0.48590000000
+24,2048,R2,windturbine,2022,0.48590000000
+25,2038,R2,windturbine,2034,2.78270000000
+25,2040,R2,windturbine,2034,2.78270000000
+25,2045,R2,windturbine,2034,2.78270000000
+25,2046,R2,windturbine,2034,2.78270000000
+25,2047,R2,windturbine,2034,2.78270000000
+25,2048,R2,windturbine,2034,2.78270000000
+25,2049,R2,windturbine,2034,2.78270000000
+25,2050,R2,windturbine,2034,2.78270000000
+25,2058,R2,windturbine,2034,2.78270000000
+25,2059,R2,windturbine,2034,2.78270000000
+25,2060,R2,windturbine,2034,2.78270000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2040.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2040.csv
index 0ee948aec..78e6801e6 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Power/Capacity/2040.csv
@@ -1,294 +1,294 @@
-asset,year,region,installed,technology,capacity
-1,2040,R1,2020,solarPV,4.17990000000
-1,2042,R1,2020,solarPV,4.17990000000
-1,2045,R1,2020,solarPV,4.17990000000
-1,2046,R1,2020,solarPV,4.17990000000
-2,2040,R1,2020,windturbine,8.00000000000
-2,2042,R1,2020,windturbine,8.00000000000
-2,2045,R1,2020,windturbine,8.00000000000
-2,2046,R1,2020,windturbine,8.00000000000
-3,2040,R1,2022,gasCCGT,0.80000000000
-3,2042,R1,2022,gasCCGT,0.80000000000
-3,2045,R1,2022,gasCCGT,0.80000000000
-3,2046,R1,2022,gasCCGT,0.80000000000
-3,2047,R1,2022,gasCCGT,0.80000000000
-3,2048,R1,2022,gasCCGT,0.80000000000
-3,2049,R1,2022,gasCCGT,0.80000000000
-3,2050,R1,2022,gasCCGT,0.80000000000
-3,2058,R1,2022,gasCCGT,0.80000000000
-4,2040,R1,2022,windturbine,0.48590000000
-4,2042,R1,2022,windturbine,0.48590000000
-4,2045,R1,2022,windturbine,0.48590000000
-4,2046,R1,2022,windturbine,0.48590000000
-4,2047,R1,2022,windturbine,0.48590000000
-4,2048,R1,2022,windturbine,0.48590000000
-5,2040,R1,2024,gasCCGT,3.20460000000
-5,2042,R1,2024,gasCCGT,3.20460000000
-5,2045,R1,2024,gasCCGT,3.20460000000
-5,2046,R1,2024,gasCCGT,3.20460000000
-5,2047,R1,2024,gasCCGT,3.20460000000
-5,2048,R1,2024,gasCCGT,3.20460000000
-5,2049,R1,2024,gasCCGT,3.20460000000
-5,2050,R1,2024,gasCCGT,3.20460000000
-5,2058,R1,2024,gasCCGT,3.20460000000
-5,2059,R1,2024,gasCCGT,3.20460000000
-5,2060,R1,2024,gasCCGT,3.20460000000
-6,2040,R1,2026,gasCCGT,1.01590000000
-6,2042,R1,2026,gasCCGT,1.01590000000
-6,2045,R1,2026,gasCCGT,1.01590000000
-6,2046,R1,2026,gasCCGT,1.01590000000
-6,2047,R1,2026,gasCCGT,1.01590000000
-6,2048,R1,2026,gasCCGT,1.01590000000
-6,2049,R1,2026,gasCCGT,1.01590000000
-6,2050,R1,2026,gasCCGT,1.01590000000
-6,2058,R1,2026,gasCCGT,1.01590000000
-6,2059,R1,2026,gasCCGT,1.01590000000
-6,2060,R1,2026,gasCCGT,1.01590000000
-6,2061,R1,2026,gasCCGT,1.01590000000
-6,2062,R1,2026,gasCCGT,1.01590000000
-7,2040,R1,2028,gasCCGT,1.01590000000
-7,2042,R1,2028,gasCCGT,1.01590000000
-7,2045,R1,2028,gasCCGT,1.01590000000
-7,2046,R1,2028,gasCCGT,1.01590000000
-7,2047,R1,2028,gasCCGT,1.01590000000
-7,2048,R1,2028,gasCCGT,1.01590000000
-7,2049,R1,2028,gasCCGT,1.01590000000
-7,2050,R1,2028,gasCCGT,1.01590000000
-7,2058,R1,2028,gasCCGT,1.01590000000
-7,2059,R1,2028,gasCCGT,1.01590000000
-7,2060,R1,2028,gasCCGT,1.01590000000
-7,2061,R1,2028,gasCCGT,1.01590000000
-7,2062,R1,2028,gasCCGT,1.01590000000
-7,2063,R1,2028,gasCCGT,1.01590000000
-7,2064,R1,2028,gasCCGT,1.01590000000
-8,2040,R1,2030,gasCCGT,1.01590000000
-8,2042,R1,2030,gasCCGT,1.01590000000
-8,2045,R1,2030,gasCCGT,1.01590000000
-8,2046,R1,2030,gasCCGT,1.01590000000
-8,2047,R1,2030,gasCCGT,1.01590000000
-8,2048,R1,2030,gasCCGT,1.01590000000
-8,2049,R1,2030,gasCCGT,1.01590000000
-8,2050,R1,2030,gasCCGT,1.01590000000
-8,2058,R1,2030,gasCCGT,1.01590000000
-8,2059,R1,2030,gasCCGT,1.01590000000
-8,2060,R1,2030,gasCCGT,1.01590000000
-8,2061,R1,2030,gasCCGT,1.01590000000
-8,2062,R1,2030,gasCCGT,1.01590000000
-8,2063,R1,2030,gasCCGT,1.01590000000
-8,2064,R1,2030,gasCCGT,1.01590000000
-8,2065,R1,2030,gasCCGT,1.01590000000
-8,2066,R1,2030,gasCCGT,1.01590000000
-9,2040,R1,2032,solarPV,2.28590000000
-9,2042,R1,2032,solarPV,2.28590000000
-9,2045,R1,2032,solarPV,2.28590000000
-9,2046,R1,2032,solarPV,2.28590000000
-9,2047,R1,2032,solarPV,2.28590000000
-9,2048,R1,2032,solarPV,2.28590000000
-9,2049,R1,2032,solarPV,2.28590000000
-9,2050,R1,2032,solarPV,2.28590000000
-9,2058,R1,2032,solarPV,2.28590000000
-10,2040,R1,2034,solarPV,4.61130000000
-10,2042,R1,2034,solarPV,4.61130000000
-10,2045,R1,2034,solarPV,4.61130000000
-10,2046,R1,2034,solarPV,4.61130000000
-10,2047,R1,2034,solarPV,4.61130000000
-10,2048,R1,2034,solarPV,4.61130000000
-10,2049,R1,2034,solarPV,4.61130000000
-10,2050,R1,2034,solarPV,4.61130000000
-10,2058,R1,2034,solarPV,4.61130000000
-10,2059,R1,2034,solarPV,4.61130000000
-10,2060,R1,2034,solarPV,4.61130000000
-11,2040,R1,2036,solarPV,2.28590000000
-11,2042,R1,2036,solarPV,2.28590000000
-11,2045,R1,2036,solarPV,2.28590000000
-11,2046,R1,2036,solarPV,2.28590000000
-11,2047,R1,2036,solarPV,2.28590000000
-11,2048,R1,2036,solarPV,2.28590000000
-11,2049,R1,2036,solarPV,2.28590000000
-11,2050,R1,2036,solarPV,2.28590000000
-11,2058,R1,2036,solarPV,2.28590000000
-11,2059,R1,2036,solarPV,2.28590000000
-11,2060,R1,2036,solarPV,2.28590000000
-11,2061,R1,2036,solarPV,2.28590000000
-11,2062,R1,2036,solarPV,2.28590000000
-12,2040,R1,2038,solarPV,2.28590000000
-12,2042,R1,2038,solarPV,2.28590000000
-12,2045,R1,2038,solarPV,2.28590000000
-12,2046,R1,2038,solarPV,2.28590000000
-12,2047,R1,2038,solarPV,2.28590000000
-12,2048,R1,2038,solarPV,2.28590000000
-12,2049,R1,2038,solarPV,2.28590000000
-12,2050,R1,2038,solarPV,2.28590000000
-12,2058,R1,2038,solarPV,2.28590000000
-12,2059,R1,2038,solarPV,2.28590000000
-12,2060,R1,2038,solarPV,2.28590000000
-12,2061,R1,2038,solarPV,2.28590000000
-12,2062,R1,2038,solarPV,2.28590000000
-12,2063,R1,2038,solarPV,2.28590000000
-12,2064,R1,2038,solarPV,2.28590000000
-13,2042,R1,2040,solarPV,2.28590000000
-13,2045,R1,2040,solarPV,2.28590000000
-13,2046,R1,2040,solarPV,2.28590000000
-13,2047,R1,2040,solarPV,2.28590000000
-13,2048,R1,2040,solarPV,2.28590000000
-13,2049,R1,2040,solarPV,2.28590000000
-13,2050,R1,2040,solarPV,2.28590000000
-13,2058,R1,2040,solarPV,2.28590000000
-13,2059,R1,2040,solarPV,2.28590000000
-13,2060,R1,2040,solarPV,2.28590000000
-13,2061,R1,2040,solarPV,2.28590000000
-13,2062,R1,2040,solarPV,2.28590000000
-13,2063,R1,2040,solarPV,2.28590000000
-13,2064,R1,2040,solarPV,2.28590000000
-13,2065,R1,2040,solarPV,2.28590000000
-13,2066,R1,2040,solarPV,2.28590000000
-15,2040,R2,2020,windturbine,12.17990000000
-15,2042,R2,2020,windturbine,12.17990000000
-15,2045,R2,2020,windturbine,12.17990000000
-15,2046,R2,2020,windturbine,12.17990000000
-16,2040,R2,2022,gasCCGT,0.80000000000
-16,2042,R2,2022,gasCCGT,0.80000000000
-16,2045,R2,2022,gasCCGT,0.80000000000
-16,2046,R2,2022,gasCCGT,0.80000000000
-16,2047,R2,2022,gasCCGT,0.80000000000
-16,2048,R2,2022,gasCCGT,0.80000000000
-16,2049,R2,2022,gasCCGT,0.80000000000
-16,2050,R2,2022,gasCCGT,0.80000000000
-16,2058,R2,2022,gasCCGT,0.80000000000
-17,2040,R2,2022,windturbine,0.48590000000
-17,2042,R2,2022,windturbine,0.48590000000
-17,2045,R2,2022,windturbine,0.48590000000
-17,2046,R2,2022,windturbine,0.48590000000
-17,2047,R2,2022,windturbine,0.48590000000
-17,2048,R2,2022,windturbine,0.48590000000
-18,2040,R2,2024,gasCCGT,3.20460000000
-18,2042,R2,2024,gasCCGT,3.20460000000
-18,2045,R2,2024,gasCCGT,3.20460000000
-18,2046,R2,2024,gasCCGT,3.20460000000
-18,2047,R2,2024,gasCCGT,3.20460000000
-18,2048,R2,2024,gasCCGT,3.20460000000
-18,2049,R2,2024,gasCCGT,3.20460000000
-18,2050,R2,2024,gasCCGT,3.20460000000
-18,2058,R2,2024,gasCCGT,3.20460000000
-18,2059,R2,2024,gasCCGT,3.20460000000
-18,2060,R2,2024,gasCCGT,3.20460000000
-19,2040,R2,2026,gasCCGT,1.01590000000
-19,2042,R2,2026,gasCCGT,1.01590000000
-19,2045,R2,2026,gasCCGT,1.01590000000
-19,2046,R2,2026,gasCCGT,1.01590000000
-19,2047,R2,2026,gasCCGT,1.01590000000
-19,2048,R2,2026,gasCCGT,1.01590000000
-19,2049,R2,2026,gasCCGT,1.01590000000
-19,2050,R2,2026,gasCCGT,1.01590000000
-19,2058,R2,2026,gasCCGT,1.01590000000
-19,2059,R2,2026,gasCCGT,1.01590000000
-19,2060,R2,2026,gasCCGT,1.01590000000
-19,2061,R2,2026,gasCCGT,1.01590000000
-19,2062,R2,2026,gasCCGT,1.01590000000
-20,2040,R2,2028,gasCCGT,1.01590000000
-20,2042,R2,2028,gasCCGT,1.01590000000
-20,2045,R2,2028,gasCCGT,1.01590000000
-20,2046,R2,2028,gasCCGT,1.01590000000
-20,2047,R2,2028,gasCCGT,1.01590000000
-20,2048,R2,2028,gasCCGT,1.01590000000
-20,2049,R2,2028,gasCCGT,1.01590000000
-20,2050,R2,2028,gasCCGT,1.01590000000
-20,2058,R2,2028,gasCCGT,1.01590000000
-20,2059,R2,2028,gasCCGT,1.01590000000
-20,2060,R2,2028,gasCCGT,1.01590000000
-20,2061,R2,2028,gasCCGT,1.01590000000
-20,2062,R2,2028,gasCCGT,1.01590000000
-20,2063,R2,2028,gasCCGT,1.01590000000
-20,2064,R2,2028,gasCCGT,1.01590000000
-21,2040,R2,2030,gasCCGT,1.01590000000
-21,2042,R2,2030,gasCCGT,1.01590000000
-21,2045,R2,2030,gasCCGT,1.01590000000
-21,2046,R2,2030,gasCCGT,1.01590000000
-21,2047,R2,2030,gasCCGT,1.01590000000
-21,2048,R2,2030,gasCCGT,1.01590000000
-21,2049,R2,2030,gasCCGT,1.01590000000
-21,2050,R2,2030,gasCCGT,1.01590000000
-21,2058,R2,2030,gasCCGT,1.01590000000
-21,2059,R2,2030,gasCCGT,1.01590000000
-21,2060,R2,2030,gasCCGT,1.01590000000
-21,2061,R2,2030,gasCCGT,1.01590000000
-21,2062,R2,2030,gasCCGT,1.01590000000
-21,2063,R2,2030,gasCCGT,1.01590000000
-21,2064,R2,2030,gasCCGT,1.01590000000
-21,2065,R2,2030,gasCCGT,1.01590000000
-21,2066,R2,2030,gasCCGT,1.01590000000
-22,2040,R2,2032,solarPV,2.28590000000
-22,2042,R2,2032,solarPV,2.28590000000
-22,2045,R2,2032,solarPV,2.28590000000
-22,2046,R2,2032,solarPV,2.28590000000
-22,2047,R2,2032,solarPV,2.28590000000
-22,2048,R2,2032,solarPV,2.28590000000
-22,2049,R2,2032,solarPV,2.28590000000
-22,2050,R2,2032,solarPV,2.28590000000
-22,2058,R2,2032,solarPV,2.28590000000
-23,2040,R2,2034,solarPV,1.82870000000
-23,2042,R2,2034,solarPV,1.82870000000
-23,2045,R2,2034,solarPV,1.82870000000
-23,2046,R2,2034,solarPV,1.82870000000
-23,2047,R2,2034,solarPV,1.82870000000
-23,2048,R2,2034,solarPV,1.82870000000
-23,2049,R2,2034,solarPV,1.82870000000
-23,2050,R2,2034,solarPV,1.82870000000
-23,2058,R2,2034,solarPV,1.82870000000
-23,2059,R2,2034,solarPV,1.82870000000
-23,2060,R2,2034,solarPV,1.82870000000
-24,2040,R2,2034,windturbine,2.78270000000
-24,2042,R2,2034,windturbine,2.78270000000
-24,2045,R2,2034,windturbine,2.78270000000
-24,2046,R2,2034,windturbine,2.78270000000
-24,2047,R2,2034,windturbine,2.78270000000
-24,2048,R2,2034,windturbine,2.78270000000
-24,2049,R2,2034,windturbine,2.78270000000
-24,2050,R2,2034,windturbine,2.78270000000
-24,2058,R2,2034,windturbine,2.78270000000
-24,2059,R2,2034,windturbine,2.78270000000
-24,2060,R2,2034,windturbine,2.78270000000
-25,2040,R2,2036,solarPV,2.28590000000
-25,2042,R2,2036,solarPV,2.28590000000
-25,2045,R2,2036,solarPV,2.28590000000
-25,2046,R2,2036,solarPV,2.28590000000
-25,2047,R2,2036,solarPV,2.28590000000
-25,2048,R2,2036,solarPV,2.28590000000
-25,2049,R2,2036,solarPV,2.28590000000
-25,2050,R2,2036,solarPV,2.28590000000
-25,2058,R2,2036,solarPV,2.28590000000
-25,2059,R2,2036,solarPV,2.28590000000
-25,2060,R2,2036,solarPV,2.28590000000
-25,2061,R2,2036,solarPV,2.28590000000
-25,2062,R2,2036,solarPV,2.28590000000
-26,2040,R2,2038,solarPV,2.28590000000
-26,2042,R2,2038,solarPV,2.28590000000
-26,2045,R2,2038,solarPV,2.28590000000
-26,2046,R2,2038,solarPV,2.28590000000
-26,2047,R2,2038,solarPV,2.28590000000
-26,2048,R2,2038,solarPV,2.28590000000
-26,2049,R2,2038,solarPV,2.28590000000
-26,2050,R2,2038,solarPV,2.28590000000
-26,2058,R2,2038,solarPV,2.28590000000
-26,2059,R2,2038,solarPV,2.28590000000
-26,2060,R2,2038,solarPV,2.28590000000
-26,2061,R2,2038,solarPV,2.28590000000
-26,2062,R2,2038,solarPV,2.28590000000
-26,2063,R2,2038,solarPV,2.28590000000
-26,2064,R2,2038,solarPV,2.28590000000
-27,2042,R2,2040,solarPV,2.28590000000
-27,2045,R2,2040,solarPV,2.28590000000
-27,2046,R2,2040,solarPV,2.28590000000
-27,2047,R2,2040,solarPV,2.28590000000
-27,2048,R2,2040,solarPV,2.28590000000
-27,2049,R2,2040,solarPV,2.28590000000
-27,2050,R2,2040,solarPV,2.28590000000
-27,2058,R2,2040,solarPV,2.28590000000
-27,2059,R2,2040,solarPV,2.28590000000
-27,2060,R2,2040,solarPV,2.28590000000
-27,2061,R2,2040,solarPV,2.28590000000
-27,2062,R2,2040,solarPV,2.28590000000
-27,2063,R2,2040,solarPV,2.28590000000
-27,2064,R2,2040,solarPV,2.28590000000
-27,2065,R2,2040,solarPV,2.28590000000
-27,2066,R2,2040,solarPV,2.28590000000
+asset,year,region,technology,installed,capacity
+1,2040,R1,gasCCGT,2022,0.80000000000
+1,2042,R1,gasCCGT,2022,0.80000000000
+1,2045,R1,gasCCGT,2022,0.80000000000
+1,2046,R1,gasCCGT,2022,0.80000000000
+1,2047,R1,gasCCGT,2022,0.80000000000
+1,2048,R1,gasCCGT,2022,0.80000000000
+1,2049,R1,gasCCGT,2022,0.80000000000
+1,2050,R1,gasCCGT,2022,0.80000000000
+1,2058,R1,gasCCGT,2022,0.80000000000
+2,2040,R1,gasCCGT,2024,3.20460000000
+2,2042,R1,gasCCGT,2024,3.20460000000
+2,2045,R1,gasCCGT,2024,3.20460000000
+2,2046,R1,gasCCGT,2024,3.20460000000
+2,2047,R1,gasCCGT,2024,3.20460000000
+2,2048,R1,gasCCGT,2024,3.20460000000
+2,2049,R1,gasCCGT,2024,3.20460000000
+2,2050,R1,gasCCGT,2024,3.20460000000
+2,2058,R1,gasCCGT,2024,3.20460000000
+2,2059,R1,gasCCGT,2024,3.20460000000
+2,2060,R1,gasCCGT,2024,3.20460000000
+3,2040,R1,gasCCGT,2026,1.01590000000
+3,2042,R1,gasCCGT,2026,1.01590000000
+3,2045,R1,gasCCGT,2026,1.01590000000
+3,2046,R1,gasCCGT,2026,1.01590000000
+3,2047,R1,gasCCGT,2026,1.01590000000
+3,2048,R1,gasCCGT,2026,1.01590000000
+3,2049,R1,gasCCGT,2026,1.01590000000
+3,2050,R1,gasCCGT,2026,1.01590000000
+3,2058,R1,gasCCGT,2026,1.01590000000
+3,2059,R1,gasCCGT,2026,1.01590000000
+3,2060,R1,gasCCGT,2026,1.01590000000
+3,2061,R1,gasCCGT,2026,1.01590000000
+3,2062,R1,gasCCGT,2026,1.01590000000
+4,2040,R1,gasCCGT,2028,1.01590000000
+4,2042,R1,gasCCGT,2028,1.01590000000
+4,2045,R1,gasCCGT,2028,1.01590000000
+4,2046,R1,gasCCGT,2028,1.01590000000
+4,2047,R1,gasCCGT,2028,1.01590000000
+4,2048,R1,gasCCGT,2028,1.01590000000
+4,2049,R1,gasCCGT,2028,1.01590000000
+4,2050,R1,gasCCGT,2028,1.01590000000
+4,2058,R1,gasCCGT,2028,1.01590000000
+4,2059,R1,gasCCGT,2028,1.01590000000
+4,2060,R1,gasCCGT,2028,1.01590000000
+4,2061,R1,gasCCGT,2028,1.01590000000
+4,2062,R1,gasCCGT,2028,1.01590000000
+4,2063,R1,gasCCGT,2028,1.01590000000
+4,2064,R1,gasCCGT,2028,1.01590000000
+5,2040,R1,gasCCGT,2030,1.01590000000
+5,2042,R1,gasCCGT,2030,1.01590000000
+5,2045,R1,gasCCGT,2030,1.01590000000
+5,2046,R1,gasCCGT,2030,1.01590000000
+5,2047,R1,gasCCGT,2030,1.01590000000
+5,2048,R1,gasCCGT,2030,1.01590000000
+5,2049,R1,gasCCGT,2030,1.01590000000
+5,2050,R1,gasCCGT,2030,1.01590000000
+5,2058,R1,gasCCGT,2030,1.01590000000
+5,2059,R1,gasCCGT,2030,1.01590000000
+5,2060,R1,gasCCGT,2030,1.01590000000
+5,2061,R1,gasCCGT,2030,1.01590000000
+5,2062,R1,gasCCGT,2030,1.01590000000
+5,2063,R1,gasCCGT,2030,1.01590000000
+5,2064,R1,gasCCGT,2030,1.01590000000
+5,2065,R1,gasCCGT,2030,1.01590000000
+5,2066,R1,gasCCGT,2030,1.01590000000
+6,2040,R1,solarPV,2020,4.17990000000
+6,2042,R1,solarPV,2020,4.17990000000
+6,2045,R1,solarPV,2020,4.17990000000
+6,2046,R1,solarPV,2020,4.17990000000
+7,2040,R1,solarPV,2032,2.28590000000
+7,2042,R1,solarPV,2032,2.28590000000
+7,2045,R1,solarPV,2032,2.28590000000
+7,2046,R1,solarPV,2032,2.28590000000
+7,2047,R1,solarPV,2032,2.28590000000
+7,2048,R1,solarPV,2032,2.28590000000
+7,2049,R1,solarPV,2032,2.28590000000
+7,2050,R1,solarPV,2032,2.28590000000
+7,2058,R1,solarPV,2032,2.28590000000
+8,2040,R1,solarPV,2034,4.61130000000
+8,2042,R1,solarPV,2034,4.61130000000
+8,2045,R1,solarPV,2034,4.61130000000
+8,2046,R1,solarPV,2034,4.61130000000
+8,2047,R1,solarPV,2034,4.61130000000
+8,2048,R1,solarPV,2034,4.61130000000
+8,2049,R1,solarPV,2034,4.61130000000
+8,2050,R1,solarPV,2034,4.61130000000
+8,2058,R1,solarPV,2034,4.61130000000
+8,2059,R1,solarPV,2034,4.61130000000
+8,2060,R1,solarPV,2034,4.61130000000
+9,2040,R1,solarPV,2036,2.28590000000
+9,2042,R1,solarPV,2036,2.28590000000
+9,2045,R1,solarPV,2036,2.28590000000
+9,2046,R1,solarPV,2036,2.28590000000
+9,2047,R1,solarPV,2036,2.28590000000
+9,2048,R1,solarPV,2036,2.28590000000
+9,2049,R1,solarPV,2036,2.28590000000
+9,2050,R1,solarPV,2036,2.28590000000
+9,2058,R1,solarPV,2036,2.28590000000
+9,2059,R1,solarPV,2036,2.28590000000
+9,2060,R1,solarPV,2036,2.28590000000
+9,2061,R1,solarPV,2036,2.28590000000
+9,2062,R1,solarPV,2036,2.28590000000
+10,2040,R1,solarPV,2038,2.28590000000
+10,2042,R1,solarPV,2038,2.28590000000
+10,2045,R1,solarPV,2038,2.28590000000
+10,2046,R1,solarPV,2038,2.28590000000
+10,2047,R1,solarPV,2038,2.28590000000
+10,2048,R1,solarPV,2038,2.28590000000
+10,2049,R1,solarPV,2038,2.28590000000
+10,2050,R1,solarPV,2038,2.28590000000
+10,2058,R1,solarPV,2038,2.28590000000
+10,2059,R1,solarPV,2038,2.28590000000
+10,2060,R1,solarPV,2038,2.28590000000
+10,2061,R1,solarPV,2038,2.28590000000
+10,2062,R1,solarPV,2038,2.28590000000
+10,2063,R1,solarPV,2038,2.28590000000
+10,2064,R1,solarPV,2038,2.28590000000
+11,2042,R1,solarPV,2040,2.28590000000
+11,2045,R1,solarPV,2040,2.28590000000
+11,2046,R1,solarPV,2040,2.28590000000
+11,2047,R1,solarPV,2040,2.28590000000
+11,2048,R1,solarPV,2040,2.28590000000
+11,2049,R1,solarPV,2040,2.28590000000
+11,2050,R1,solarPV,2040,2.28590000000
+11,2058,R1,solarPV,2040,2.28590000000
+11,2059,R1,solarPV,2040,2.28590000000
+11,2060,R1,solarPV,2040,2.28590000000
+11,2061,R1,solarPV,2040,2.28590000000
+11,2062,R1,solarPV,2040,2.28590000000
+11,2063,R1,solarPV,2040,2.28590000000
+11,2064,R1,solarPV,2040,2.28590000000
+11,2065,R1,solarPV,2040,2.28590000000
+11,2066,R1,solarPV,2040,2.28590000000
+12,2040,R1,windturbine,2020,8.00000000000
+12,2042,R1,windturbine,2020,8.00000000000
+12,2045,R1,windturbine,2020,8.00000000000
+12,2046,R1,windturbine,2020,8.00000000000
+13,2040,R1,windturbine,2022,0.48590000000
+13,2042,R1,windturbine,2022,0.48590000000
+13,2045,R1,windturbine,2022,0.48590000000
+13,2046,R1,windturbine,2022,0.48590000000
+13,2047,R1,windturbine,2022,0.48590000000
+13,2048,R1,windturbine,2022,0.48590000000
+15,2040,R2,gasCCGT,2022,0.80000000000
+15,2042,R2,gasCCGT,2022,0.80000000000
+15,2045,R2,gasCCGT,2022,0.80000000000
+15,2046,R2,gasCCGT,2022,0.80000000000
+15,2047,R2,gasCCGT,2022,0.80000000000
+15,2048,R2,gasCCGT,2022,0.80000000000
+15,2049,R2,gasCCGT,2022,0.80000000000
+15,2050,R2,gasCCGT,2022,0.80000000000
+15,2058,R2,gasCCGT,2022,0.80000000000
+16,2040,R2,gasCCGT,2024,3.20460000000
+16,2042,R2,gasCCGT,2024,3.20460000000
+16,2045,R2,gasCCGT,2024,3.20460000000
+16,2046,R2,gasCCGT,2024,3.20460000000
+16,2047,R2,gasCCGT,2024,3.20460000000
+16,2048,R2,gasCCGT,2024,3.20460000000
+16,2049,R2,gasCCGT,2024,3.20460000000
+16,2050,R2,gasCCGT,2024,3.20460000000
+16,2058,R2,gasCCGT,2024,3.20460000000
+16,2059,R2,gasCCGT,2024,3.20460000000
+16,2060,R2,gasCCGT,2024,3.20460000000
+17,2040,R2,gasCCGT,2026,1.01590000000
+17,2042,R2,gasCCGT,2026,1.01590000000
+17,2045,R2,gasCCGT,2026,1.01590000000
+17,2046,R2,gasCCGT,2026,1.01590000000
+17,2047,R2,gasCCGT,2026,1.01590000000
+17,2048,R2,gasCCGT,2026,1.01590000000
+17,2049,R2,gasCCGT,2026,1.01590000000
+17,2050,R2,gasCCGT,2026,1.01590000000
+17,2058,R2,gasCCGT,2026,1.01590000000
+17,2059,R2,gasCCGT,2026,1.01590000000
+17,2060,R2,gasCCGT,2026,1.01590000000
+17,2061,R2,gasCCGT,2026,1.01590000000
+17,2062,R2,gasCCGT,2026,1.01590000000
+18,2040,R2,gasCCGT,2028,1.01590000000
+18,2042,R2,gasCCGT,2028,1.01590000000
+18,2045,R2,gasCCGT,2028,1.01590000000
+18,2046,R2,gasCCGT,2028,1.01590000000
+18,2047,R2,gasCCGT,2028,1.01590000000
+18,2048,R2,gasCCGT,2028,1.01590000000
+18,2049,R2,gasCCGT,2028,1.01590000000
+18,2050,R2,gasCCGT,2028,1.01590000000
+18,2058,R2,gasCCGT,2028,1.01590000000
+18,2059,R2,gasCCGT,2028,1.01590000000
+18,2060,R2,gasCCGT,2028,1.01590000000
+18,2061,R2,gasCCGT,2028,1.01590000000
+18,2062,R2,gasCCGT,2028,1.01590000000
+18,2063,R2,gasCCGT,2028,1.01590000000
+18,2064,R2,gasCCGT,2028,1.01590000000
+19,2040,R2,gasCCGT,2030,1.01590000000
+19,2042,R2,gasCCGT,2030,1.01590000000
+19,2045,R2,gasCCGT,2030,1.01590000000
+19,2046,R2,gasCCGT,2030,1.01590000000
+19,2047,R2,gasCCGT,2030,1.01590000000
+19,2048,R2,gasCCGT,2030,1.01590000000
+19,2049,R2,gasCCGT,2030,1.01590000000
+19,2050,R2,gasCCGT,2030,1.01590000000
+19,2058,R2,gasCCGT,2030,1.01590000000
+19,2059,R2,gasCCGT,2030,1.01590000000
+19,2060,R2,gasCCGT,2030,1.01590000000
+19,2061,R2,gasCCGT,2030,1.01590000000
+19,2062,R2,gasCCGT,2030,1.01590000000
+19,2063,R2,gasCCGT,2030,1.01590000000
+19,2064,R2,gasCCGT,2030,1.01590000000
+19,2065,R2,gasCCGT,2030,1.01590000000
+19,2066,R2,gasCCGT,2030,1.01590000000
+20,2040,R2,solarPV,2032,2.28590000000
+20,2042,R2,solarPV,2032,2.28590000000
+20,2045,R2,solarPV,2032,2.28590000000
+20,2046,R2,solarPV,2032,2.28590000000
+20,2047,R2,solarPV,2032,2.28590000000
+20,2048,R2,solarPV,2032,2.28590000000
+20,2049,R2,solarPV,2032,2.28590000000
+20,2050,R2,solarPV,2032,2.28590000000
+20,2058,R2,solarPV,2032,2.28590000000
+21,2040,R2,solarPV,2034,1.82870000000
+21,2042,R2,solarPV,2034,1.82870000000
+21,2045,R2,solarPV,2034,1.82870000000
+21,2046,R2,solarPV,2034,1.82870000000
+21,2047,R2,solarPV,2034,1.82870000000
+21,2048,R2,solarPV,2034,1.82870000000
+21,2049,R2,solarPV,2034,1.82870000000
+21,2050,R2,solarPV,2034,1.82870000000
+21,2058,R2,solarPV,2034,1.82870000000
+21,2059,R2,solarPV,2034,1.82870000000
+21,2060,R2,solarPV,2034,1.82870000000
+22,2040,R2,solarPV,2036,2.28590000000
+22,2042,R2,solarPV,2036,2.28590000000
+22,2045,R2,solarPV,2036,2.28590000000
+22,2046,R2,solarPV,2036,2.28590000000
+22,2047,R2,solarPV,2036,2.28590000000
+22,2048,R2,solarPV,2036,2.28590000000
+22,2049,R2,solarPV,2036,2.28590000000
+22,2050,R2,solarPV,2036,2.28590000000
+22,2058,R2,solarPV,2036,2.28590000000
+22,2059,R2,solarPV,2036,2.28590000000
+22,2060,R2,solarPV,2036,2.28590000000
+22,2061,R2,solarPV,2036,2.28590000000
+22,2062,R2,solarPV,2036,2.28590000000
+23,2040,R2,solarPV,2038,2.28590000000
+23,2042,R2,solarPV,2038,2.28590000000
+23,2045,R2,solarPV,2038,2.28590000000
+23,2046,R2,solarPV,2038,2.28590000000
+23,2047,R2,solarPV,2038,2.28590000000
+23,2048,R2,solarPV,2038,2.28590000000
+23,2049,R2,solarPV,2038,2.28590000000
+23,2050,R2,solarPV,2038,2.28590000000
+23,2058,R2,solarPV,2038,2.28590000000
+23,2059,R2,solarPV,2038,2.28590000000
+23,2060,R2,solarPV,2038,2.28590000000
+23,2061,R2,solarPV,2038,2.28590000000
+23,2062,R2,solarPV,2038,2.28590000000
+23,2063,R2,solarPV,2038,2.28590000000
+23,2064,R2,solarPV,2038,2.28590000000
+24,2042,R2,solarPV,2040,2.28590000000
+24,2045,R2,solarPV,2040,2.28590000000
+24,2046,R2,solarPV,2040,2.28590000000
+24,2047,R2,solarPV,2040,2.28590000000
+24,2048,R2,solarPV,2040,2.28590000000
+24,2049,R2,solarPV,2040,2.28590000000
+24,2050,R2,solarPV,2040,2.28590000000
+24,2058,R2,solarPV,2040,2.28590000000
+24,2059,R2,solarPV,2040,2.28590000000
+24,2060,R2,solarPV,2040,2.28590000000
+24,2061,R2,solarPV,2040,2.28590000000
+24,2062,R2,solarPV,2040,2.28590000000
+24,2063,R2,solarPV,2040,2.28590000000
+24,2064,R2,solarPV,2040,2.28590000000
+24,2065,R2,solarPV,2040,2.28590000000
+24,2066,R2,solarPV,2040,2.28590000000
+25,2040,R2,windturbine,2020,12.17990000000
+25,2042,R2,windturbine,2020,12.17990000000
+25,2045,R2,windturbine,2020,12.17990000000
+25,2046,R2,windturbine,2020,12.17990000000
+26,2040,R2,windturbine,2022,0.48590000000
+26,2042,R2,windturbine,2022,0.48590000000
+26,2045,R2,windturbine,2022,0.48590000000
+26,2046,R2,windturbine,2022,0.48590000000
+26,2047,R2,windturbine,2022,0.48590000000
+26,2048,R2,windturbine,2022,0.48590000000
+27,2040,R2,windturbine,2034,2.78270000000
+27,2042,R2,windturbine,2034,2.78270000000
+27,2045,R2,windturbine,2034,2.78270000000
+27,2046,R2,windturbine,2034,2.78270000000
+27,2047,R2,windturbine,2034,2.78270000000
+27,2048,R2,windturbine,2034,2.78270000000
+27,2049,R2,windturbine,2034,2.78270000000
+27,2050,R2,windturbine,2034,2.78270000000
+27,2058,R2,windturbine,2034,2.78270000000
+27,2059,R2,windturbine,2034,2.78270000000
+27,2060,R2,windturbine,2034,2.78270000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2022.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2022.csv
index aa3089b36..9983e72da 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2022.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2022.csv
@@ -1,29 +1,29 @@
-asset,year,region,installed,technology,capacity
-0,2022,R1,2020,gasboiler,5.00000000000
-0,2024,R1,2020,gasboiler,5.00000000000
-0,2025,R1,2020,gasboiler,5.00000000000
-1,2022,R1,2020,heatpump,14.42990000000
-1,2024,R1,2020,heatpump,14.42990000000
-1,2025,R1,2020,heatpump,14.42990000000
-1,2030,R1,2020,heatpump,14.42990000000
-1,2031,R1,2020,heatpump,14.42990000000
-2,2024,R1,2022,heatpump,2.28590000000
-2,2025,R1,2022,heatpump,2.28590000000
-2,2030,R1,2022,heatpump,2.28590000000
-2,2031,R1,2022,heatpump,2.28590000000
-2,2032,R1,2022,heatpump,2.28590000000
-2,2033,R1,2022,heatpump,2.28590000000
-3,2022,R2,2020,gasboiler,5.00000000000
-3,2024,R2,2020,gasboiler,5.00000000000
-3,2025,R2,2020,gasboiler,5.00000000000
-4,2022,R2,2020,heatpump,14.42990000000
-4,2024,R2,2020,heatpump,14.42990000000
-4,2025,R2,2020,heatpump,14.42990000000
-4,2030,R2,2020,heatpump,14.42990000000
-4,2031,R2,2020,heatpump,14.42990000000
-5,2024,R2,2022,heatpump,2.28590000000
-5,2025,R2,2022,heatpump,2.28590000000
-5,2030,R2,2022,heatpump,2.28590000000
-5,2031,R2,2022,heatpump,2.28590000000
-5,2032,R2,2022,heatpump,2.28590000000
-5,2033,R2,2022,heatpump,2.28590000000
+asset,year,region,technology,installed,capacity
+0,2022,R1,gasboiler,2020,5.00000000000
+0,2024,R1,gasboiler,2020,5.00000000000
+0,2025,R1,gasboiler,2020,5.00000000000
+1,2022,R1,heatpump,2020,14.42990000000
+1,2024,R1,heatpump,2020,14.42990000000
+1,2025,R1,heatpump,2020,14.42990000000
+1,2030,R1,heatpump,2020,14.42990000000
+1,2031,R1,heatpump,2020,14.42990000000
+2,2024,R1,heatpump,2022,2.28590000000
+2,2025,R1,heatpump,2022,2.28590000000
+2,2030,R1,heatpump,2022,2.28590000000
+2,2031,R1,heatpump,2022,2.28590000000
+2,2032,R1,heatpump,2022,2.28590000000
+2,2033,R1,heatpump,2022,2.28590000000
+3,2022,R2,gasboiler,2020,5.00000000000
+3,2024,R2,gasboiler,2020,5.00000000000
+3,2025,R2,gasboiler,2020,5.00000000000
+4,2022,R2,heatpump,2020,14.42990000000
+4,2024,R2,heatpump,2020,14.42990000000
+4,2025,R2,heatpump,2020,14.42990000000
+4,2030,R2,heatpump,2020,14.42990000000
+4,2031,R2,heatpump,2020,14.42990000000
+5,2024,R2,heatpump,2022,2.28590000000
+5,2025,R2,heatpump,2022,2.28590000000
+5,2030,R2,heatpump,2022,2.28590000000
+5,2031,R2,heatpump,2022,2.28590000000
+5,2032,R2,heatpump,2022,2.28590000000
+5,2033,R2,heatpump,2022,2.28590000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2026.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2026.csv
index b3b9d8fd7..e2b801b47 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2026.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2026.csv
@@ -1,71 +1,71 @@
-asset,year,region,installed,technology,capacity
-1,2026,R1,2020,heatpump,14.42990000000
-1,2028,R1,2020,heatpump,14.42990000000
-1,2030,R1,2020,heatpump,14.42990000000
-1,2031,R1,2020,heatpump,14.42990000000
-2,2026,R1,2022,heatpump,2.28590000000
-2,2028,R1,2022,heatpump,2.28590000000
-2,2030,R1,2022,heatpump,2.28590000000
-2,2031,R1,2022,heatpump,2.28590000000
-2,2032,R1,2022,heatpump,2.28590000000
-2,2033,R1,2022,heatpump,2.28590000000
-3,2026,R1,2024,gasboiler,2.32550000000
-3,2028,R1,2024,gasboiler,2.32550000000
-3,2030,R1,2024,gasboiler,2.32550000000
-3,2031,R1,2024,gasboiler,2.32550000000
-3,2032,R1,2024,gasboiler,2.32550000000
-3,2033,R1,2024,gasboiler,2.32550000000
-3,2034,R1,2024,gasboiler,2.32550000000
-3,2035,R1,2024,gasboiler,2.32550000000
-4,2026,R1,2024,heatpump,4.96040000000
-4,2028,R1,2024,heatpump,4.96040000000
-4,2030,R1,2024,heatpump,4.96040000000
-4,2031,R1,2024,heatpump,4.96040000000
-4,2032,R1,2024,heatpump,4.96040000000
-4,2033,R1,2024,heatpump,4.96040000000
-4,2034,R1,2024,heatpump,4.96040000000
-4,2035,R1,2024,heatpump,4.96040000000
-5,2028,R1,2026,heatpump,2.28590000000
-5,2030,R1,2026,heatpump,2.28590000000
-5,2031,R1,2026,heatpump,2.28590000000
-5,2032,R1,2026,heatpump,2.28590000000
-5,2033,R1,2026,heatpump,2.28590000000
-5,2034,R1,2026,heatpump,2.28590000000
-5,2035,R1,2026,heatpump,2.28590000000
-5,2036,R1,2026,heatpump,2.28590000000
-5,2037,R1,2026,heatpump,2.28590000000
-7,2026,R2,2020,heatpump,14.42990000000
-7,2028,R2,2020,heatpump,14.42990000000
-7,2030,R2,2020,heatpump,14.42990000000
-7,2031,R2,2020,heatpump,14.42990000000
-8,2026,R2,2022,heatpump,2.28590000000
-8,2028,R2,2022,heatpump,2.28590000000
-8,2030,R2,2022,heatpump,2.28590000000
-8,2031,R2,2022,heatpump,2.28590000000
-8,2032,R2,2022,heatpump,2.28590000000
-8,2033,R2,2022,heatpump,2.28590000000
-9,2026,R2,2024,gasboiler,2.32550000000
-9,2028,R2,2024,gasboiler,2.32550000000
-9,2030,R2,2024,gasboiler,2.32550000000
-9,2031,R2,2024,gasboiler,2.32550000000
-9,2032,R2,2024,gasboiler,2.32550000000
-9,2033,R2,2024,gasboiler,2.32550000000
-9,2034,R2,2024,gasboiler,2.32550000000
-9,2035,R2,2024,gasboiler,2.32550000000
-10,2026,R2,2024,heatpump,4.96040000000
-10,2028,R2,2024,heatpump,4.96040000000
-10,2030,R2,2024,heatpump,4.96040000000
-10,2031,R2,2024,heatpump,4.96040000000
-10,2032,R2,2024,heatpump,4.96040000000
-10,2033,R2,2024,heatpump,4.96040000000
-10,2034,R2,2024,heatpump,4.96040000000
-10,2035,R2,2024,heatpump,4.96040000000
-11,2028,R2,2026,heatpump,2.28590000000
-11,2030,R2,2026,heatpump,2.28590000000
-11,2031,R2,2026,heatpump,2.28590000000
-11,2032,R2,2026,heatpump,2.28590000000
-11,2033,R2,2026,heatpump,2.28590000000
-11,2034,R2,2026,heatpump,2.28590000000
-11,2035,R2,2026,heatpump,2.28590000000
-11,2036,R2,2026,heatpump,2.28590000000
-11,2037,R2,2026,heatpump,2.28590000000
+asset,year,region,technology,installed,capacity
+1,2026,R1,gasboiler,2024,2.32550000000
+1,2028,R1,gasboiler,2024,2.32550000000
+1,2030,R1,gasboiler,2024,2.32550000000
+1,2031,R1,gasboiler,2024,2.32550000000
+1,2032,R1,gasboiler,2024,2.32550000000
+1,2033,R1,gasboiler,2024,2.32550000000
+1,2034,R1,gasboiler,2024,2.32550000000
+1,2035,R1,gasboiler,2024,2.32550000000
+2,2026,R1,heatpump,2020,14.42990000000
+2,2028,R1,heatpump,2020,14.42990000000
+2,2030,R1,heatpump,2020,14.42990000000
+2,2031,R1,heatpump,2020,14.42990000000
+3,2026,R1,heatpump,2022,2.28590000000
+3,2028,R1,heatpump,2022,2.28590000000
+3,2030,R1,heatpump,2022,2.28590000000
+3,2031,R1,heatpump,2022,2.28590000000
+3,2032,R1,heatpump,2022,2.28590000000
+3,2033,R1,heatpump,2022,2.28590000000
+4,2026,R1,heatpump,2024,4.96040000000
+4,2028,R1,heatpump,2024,4.96040000000
+4,2030,R1,heatpump,2024,4.96040000000
+4,2031,R1,heatpump,2024,4.96040000000
+4,2032,R1,heatpump,2024,4.96040000000
+4,2033,R1,heatpump,2024,4.96040000000
+4,2034,R1,heatpump,2024,4.96040000000
+4,2035,R1,heatpump,2024,4.96040000000
+5,2028,R1,heatpump,2026,2.28590000000
+5,2030,R1,heatpump,2026,2.28590000000
+5,2031,R1,heatpump,2026,2.28590000000
+5,2032,R1,heatpump,2026,2.28590000000
+5,2033,R1,heatpump,2026,2.28590000000
+5,2034,R1,heatpump,2026,2.28590000000
+5,2035,R1,heatpump,2026,2.28590000000
+5,2036,R1,heatpump,2026,2.28590000000
+5,2037,R1,heatpump,2026,2.28590000000
+7,2026,R2,gasboiler,2024,2.32550000000
+7,2028,R2,gasboiler,2024,2.32550000000
+7,2030,R2,gasboiler,2024,2.32550000000
+7,2031,R2,gasboiler,2024,2.32550000000
+7,2032,R2,gasboiler,2024,2.32550000000
+7,2033,R2,gasboiler,2024,2.32550000000
+7,2034,R2,gasboiler,2024,2.32550000000
+7,2035,R2,gasboiler,2024,2.32550000000
+8,2026,R2,heatpump,2020,14.42990000000
+8,2028,R2,heatpump,2020,14.42990000000
+8,2030,R2,heatpump,2020,14.42990000000
+8,2031,R2,heatpump,2020,14.42990000000
+9,2026,R2,heatpump,2022,2.28590000000
+9,2028,R2,heatpump,2022,2.28590000000
+9,2030,R2,heatpump,2022,2.28590000000
+9,2031,R2,heatpump,2022,2.28590000000
+9,2032,R2,heatpump,2022,2.28590000000
+9,2033,R2,heatpump,2022,2.28590000000
+10,2026,R2,heatpump,2024,4.96040000000
+10,2028,R2,heatpump,2024,4.96040000000
+10,2030,R2,heatpump,2024,4.96040000000
+10,2031,R2,heatpump,2024,4.96040000000
+10,2032,R2,heatpump,2024,4.96040000000
+10,2033,R2,heatpump,2024,4.96040000000
+10,2034,R2,heatpump,2024,4.96040000000
+10,2035,R2,heatpump,2024,4.96040000000
+11,2028,R2,heatpump,2026,2.28590000000
+11,2030,R2,heatpump,2026,2.28590000000
+11,2031,R2,heatpump,2026,2.28590000000
+11,2032,R2,heatpump,2026,2.28590000000
+11,2033,R2,heatpump,2026,2.28590000000
+11,2034,R2,heatpump,2026,2.28590000000
+11,2035,R2,heatpump,2026,2.28590000000
+11,2036,R2,heatpump,2026,2.28590000000
+11,2037,R2,heatpump,2026,2.28590000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2028.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2028.csv
index d49c6f240..2c783aae9 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2028.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Capacity/2028.csv
@@ -1,83 +1,83 @@
-asset,year,region,installed,technology,capacity
-1,2028,R1,2020,heatpump,14.42990000000
-1,2030,R1,2020,heatpump,14.42990000000
-1,2031,R1,2020,heatpump,14.42990000000
-2,2028,R1,2022,heatpump,2.28590000000
-2,2030,R1,2022,heatpump,2.28590000000
-2,2031,R1,2022,heatpump,2.28590000000
-2,2032,R1,2022,heatpump,2.28590000000
-2,2033,R1,2022,heatpump,2.28590000000
-3,2028,R1,2024,gasboiler,2.32550000000
-3,2030,R1,2024,gasboiler,2.32550000000
-3,2031,R1,2024,gasboiler,2.32550000000
-3,2032,R1,2024,gasboiler,2.32550000000
-3,2033,R1,2024,gasboiler,2.32550000000
-3,2034,R1,2024,gasboiler,2.32550000000
-3,2035,R1,2024,gasboiler,2.32550000000
-4,2028,R1,2024,heatpump,4.96040000000
-4,2030,R1,2024,heatpump,4.96040000000
-4,2031,R1,2024,heatpump,4.96040000000
-4,2032,R1,2024,heatpump,4.96040000000
-4,2033,R1,2024,heatpump,4.96040000000
-4,2034,R1,2024,heatpump,4.96040000000
-4,2035,R1,2024,heatpump,4.96040000000
-5,2028,R1,2026,heatpump,2.28590000000
-5,2030,R1,2026,heatpump,2.28590000000
-5,2031,R1,2026,heatpump,2.28590000000
-5,2032,R1,2026,heatpump,2.28590000000
-5,2033,R1,2026,heatpump,2.28590000000
-5,2034,R1,2026,heatpump,2.28590000000
-5,2035,R1,2026,heatpump,2.28590000000
-5,2036,R1,2026,heatpump,2.28590000000
-5,2037,R1,2026,heatpump,2.28590000000
-6,2030,R1,2028,heatpump,2.28590000000
-6,2031,R1,2028,heatpump,2.28590000000
-6,2032,R1,2028,heatpump,2.28590000000
-6,2033,R1,2028,heatpump,2.28590000000
-6,2034,R1,2028,heatpump,2.28590000000
-6,2035,R1,2028,heatpump,2.28590000000
-6,2036,R1,2028,heatpump,2.28590000000
-6,2037,R1,2028,heatpump,2.28590000000
-6,2038,R1,2028,heatpump,2.28590000000
-6,2039,R1,2028,heatpump,2.28590000000
-8,2028,R2,2020,heatpump,14.42990000000
-8,2030,R2,2020,heatpump,14.42990000000
-8,2031,R2,2020,heatpump,14.42990000000
-9,2028,R2,2022,heatpump,2.28590000000
-9,2030,R2,2022,heatpump,2.28590000000
-9,2031,R2,2022,heatpump,2.28590000000
-9,2032,R2,2022,heatpump,2.28590000000
-9,2033,R2,2022,heatpump,2.28590000000
-10,2028,R2,2024,gasboiler,2.32550000000
-10,2030,R2,2024,gasboiler,2.32550000000
-10,2031,R2,2024,gasboiler,2.32550000000
-10,2032,R2,2024,gasboiler,2.32550000000
-10,2033,R2,2024,gasboiler,2.32550000000
-10,2034,R2,2024,gasboiler,2.32550000000
-10,2035,R2,2024,gasboiler,2.32550000000
-11,2028,R2,2024,heatpump,4.96040000000
-11,2030,R2,2024,heatpump,4.96040000000
-11,2031,R2,2024,heatpump,4.96040000000
-11,2032,R2,2024,heatpump,4.96040000000
-11,2033,R2,2024,heatpump,4.96040000000
-11,2034,R2,2024,heatpump,4.96040000000
-11,2035,R2,2024,heatpump,4.96040000000
-12,2028,R2,2026,heatpump,2.28590000000
-12,2030,R2,2026,heatpump,2.28590000000
-12,2031,R2,2026,heatpump,2.28590000000
-12,2032,R2,2026,heatpump,2.28590000000
-12,2033,R2,2026,heatpump,2.28590000000
-12,2034,R2,2026,heatpump,2.28590000000
-12,2035,R2,2026,heatpump,2.28590000000
-12,2036,R2,2026,heatpump,2.28590000000
-12,2037,R2,2026,heatpump,2.28590000000
-13,2030,R2,2028,heatpump,2.28590000000
-13,2031,R2,2028,heatpump,2.28590000000
-13,2032,R2,2028,heatpump,2.28590000000
-13,2033,R2,2028,heatpump,2.28590000000
-13,2034,R2,2028,heatpump,2.28590000000
-13,2035,R2,2028,heatpump,2.28590000000
-13,2036,R2,2028,heatpump,2.28590000000
-13,2037,R2,2028,heatpump,2.28590000000
-13,2038,R2,2028,heatpump,2.28590000000
-13,2039,R2,2028,heatpump,2.28590000000
+asset,year,region,technology,installed,capacity
+1,2028,R1,gasboiler,2024,2.32550000000
+1,2030,R1,gasboiler,2024,2.32550000000
+1,2031,R1,gasboiler,2024,2.32550000000
+1,2032,R1,gasboiler,2024,2.32550000000
+1,2033,R1,gasboiler,2024,2.32550000000
+1,2034,R1,gasboiler,2024,2.32550000000
+1,2035,R1,gasboiler,2024,2.32550000000
+2,2028,R1,heatpump,2020,14.42990000000
+2,2030,R1,heatpump,2020,14.42990000000
+2,2031,R1,heatpump,2020,14.42990000000
+3,2028,R1,heatpump,2022,2.28590000000
+3,2030,R1,heatpump,2022,2.28590000000
+3,2031,R1,heatpump,2022,2.28590000000
+3,2032,R1,heatpump,2022,2.28590000000
+3,2033,R1,heatpump,2022,2.28590000000
+4,2028,R1,heatpump,2024,4.96040000000
+4,2030,R1,heatpump,2024,4.96040000000
+4,2031,R1,heatpump,2024,4.96040000000
+4,2032,R1,heatpump,2024,4.96040000000
+4,2033,R1,heatpump,2024,4.96040000000
+4,2034,R1,heatpump,2024,4.96040000000
+4,2035,R1,heatpump,2024,4.96040000000
+5,2028,R1,heatpump,2026,2.28590000000
+5,2030,R1,heatpump,2026,2.28590000000
+5,2031,R1,heatpump,2026,2.28590000000
+5,2032,R1,heatpump,2026,2.28590000000
+5,2033,R1,heatpump,2026,2.28590000000
+5,2034,R1,heatpump,2026,2.28590000000
+5,2035,R1,heatpump,2026,2.28590000000
+5,2036,R1,heatpump,2026,2.28590000000
+5,2037,R1,heatpump,2026,2.28590000000
+6,2030,R1,heatpump,2028,2.28590000000
+6,2031,R1,heatpump,2028,2.28590000000
+6,2032,R1,heatpump,2028,2.28590000000
+6,2033,R1,heatpump,2028,2.28590000000
+6,2034,R1,heatpump,2028,2.28590000000
+6,2035,R1,heatpump,2028,2.28590000000
+6,2036,R1,heatpump,2028,2.28590000000
+6,2037,R1,heatpump,2028,2.28590000000
+6,2038,R1,heatpump,2028,2.28590000000
+6,2039,R1,heatpump,2028,2.28590000000
+8,2028,R2,gasboiler,2024,2.32550000000
+8,2030,R2,gasboiler,2024,2.32550000000
+8,2031,R2,gasboiler,2024,2.32550000000
+8,2032,R2,gasboiler,2024,2.32550000000
+8,2033,R2,gasboiler,2024,2.32550000000
+8,2034,R2,gasboiler,2024,2.32550000000
+8,2035,R2,gasboiler,2024,2.32550000000
+9,2028,R2,heatpump,2020,14.42990000000
+9,2030,R2,heatpump,2020,14.42990000000
+9,2031,R2,heatpump,2020,14.42990000000
+10,2028,R2,heatpump,2022,2.28590000000
+10,2030,R2,heatpump,2022,2.28590000000
+10,2031,R2,heatpump,2022,2.28590000000
+10,2032,R2,heatpump,2022,2.28590000000
+10,2033,R2,heatpump,2022,2.28590000000
+11,2028,R2,heatpump,2024,4.96040000000
+11,2030,R2,heatpump,2024,4.96040000000
+11,2031,R2,heatpump,2024,4.96040000000
+11,2032,R2,heatpump,2024,4.96040000000
+11,2033,R2,heatpump,2024,4.96040000000
+11,2034,R2,heatpump,2024,4.96040000000
+11,2035,R2,heatpump,2024,4.96040000000
+12,2028,R2,heatpump,2026,2.28590000000
+12,2030,R2,heatpump,2026,2.28590000000
+12,2031,R2,heatpump,2026,2.28590000000
+12,2032,R2,heatpump,2026,2.28590000000
+12,2033,R2,heatpump,2026,2.28590000000
+12,2034,R2,heatpump,2026,2.28590000000
+12,2035,R2,heatpump,2026,2.28590000000
+12,2036,R2,heatpump,2026,2.28590000000
+12,2037,R2,heatpump,2026,2.28590000000
+13,2030,R2,heatpump,2028,2.28590000000
+13,2031,R2,heatpump,2028,2.28590000000
+13,2032,R2,heatpump,2028,2.28590000000
+13,2033,R2,heatpump,2028,2.28590000000
+13,2034,R2,heatpump,2028,2.28590000000
+13,2035,R2,heatpump,2028,2.28590000000
+13,2036,R2,heatpump,2028,2.28590000000
+13,2037,R2,heatpump,2028,2.28590000000
+13,2038,R2,heatpump,2028,2.28590000000
+13,2039,R2,heatpump,2028,2.28590000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2020.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2020.csv
index 7a1997362..decbc9902 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2020.csv
@@ -1,161 +1,161 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2020,0,gasboiler,2020,all-year,all-week,night,0.35700000000
-0,heat,R1,2020,1,gasboiler,2020,all-year,all-week,night,0.35700000000
-0,heat,R1,2022,0,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R1,2022,1,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R1,2022,2,heatpump,2020,all-year,all-week,night,0.30050000000
-0,heat,R1,2022,3,heatpump,2020,all-year,all-week,night,0.30050000000
-0,heat,R2,2020,0,gasboiler,2020,all-year,all-week,night,0.35700000000
-0,heat,R2,2020,1,gasboiler,2020,all-year,all-week,night,0.35700000000
-0,heat,R2,2022,0,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R2,2022,1,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R2,2022,2,heatpump,2020,all-year,all-week,night,0.30050000000
-0,heat,R2,2022,3,heatpump,2020,all-year,all-week,night,0.30050000000
-0,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,night,23.10150000000
-0,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,night,23.10150000000
-0,CO2f,R1,2022,0,gasboiler,2020,all-year,all-week,night,6.73750000000
-0,CO2f,R1,2022,1,gasboiler,2020,all-year,all-week,night,6.73750000000
-0,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,night,23.10150000000
-0,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,night,23.10150000000
-0,CO2f,R2,2022,0,gasboiler,2020,all-year,all-week,night,6.73750000000
-0,CO2f,R2,2022,1,gasboiler,2020,all-year,all-week,night,6.73750000000
-1,heat,R1,2020,0,gasboiler,2020,all-year,all-week,morning,0.53550000000
-1,heat,R1,2020,1,gasboiler,2020,all-year,all-week,morning,0.53550000000
-1,heat,R1,2022,0,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R1,2022,1,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R1,2022,2,heatpump,2020,all-year,all-week,morning,0.45070000000
-1,heat,R1,2022,3,heatpump,2020,all-year,all-week,morning,0.45070000000
-1,heat,R2,2020,0,gasboiler,2020,all-year,all-week,morning,0.53550000000
-1,heat,R2,2020,1,gasboiler,2020,all-year,all-week,morning,0.53550000000
-1,heat,R2,2022,0,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R2,2022,1,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R2,2022,2,heatpump,2020,all-year,all-week,morning,0.45070000000
-1,heat,R2,2022,3,heatpump,2020,all-year,all-week,morning,0.45070000000
-1,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,morning,34.65220000000
-1,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,morning,34.65220000000
-1,CO2f,R1,2022,0,gasboiler,2020,all-year,all-week,morning,10.10620000000
-1,CO2f,R1,2022,1,gasboiler,2020,all-year,all-week,morning,10.10620000000
-1,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,morning,34.65220000000
-1,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,morning,34.65220000000
-1,CO2f,R2,2022,0,gasboiler,2020,all-year,all-week,morning,10.10620000000
-1,CO2f,R2,2022,1,gasboiler,2020,all-year,all-week,morning,10.10620000000
-2,heat,R1,2020,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.35700000000
-2,heat,R1,2020,1,gasboiler,2020,all-year,all-week,mid-afternoon,0.35700000000
-2,heat,R1,2022,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R1,2022,1,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R1,2022,2,heatpump,2020,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R1,2022,3,heatpump,2020,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R2,2020,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.35700000000
-2,heat,R2,2020,1,gasboiler,2020,all-year,all-week,mid-afternoon,0.35700000000
-2,heat,R2,2022,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R2,2022,1,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R2,2022,2,heatpump,2020,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R2,2022,3,heatpump,2020,all-year,all-week,mid-afternoon,0.30050000000
-2,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,mid-afternoon,23.10150000000
-2,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,mid-afternoon,23.10150000000
-2,CO2f,R1,2022,0,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R1,2022,1,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,mid-afternoon,23.10150000000
-2,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,mid-afternoon,23.10150000000
-2,CO2f,R2,2022,0,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R2,2022,1,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-3,heat,R1,2020,0,gasboiler,2020,all-year,all-week,early-peak,0.53550000000
-3,heat,R1,2020,1,gasboiler,2020,all-year,all-week,early-peak,0.53550000000
-3,heat,R1,2022,0,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R1,2022,1,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R1,2022,2,heatpump,2020,all-year,all-week,early-peak,0.45070000000
-3,heat,R1,2022,3,heatpump,2020,all-year,all-week,early-peak,0.45070000000
-3,heat,R2,2020,0,gasboiler,2020,all-year,all-week,early-peak,0.53550000000
-3,heat,R2,2020,1,gasboiler,2020,all-year,all-week,early-peak,0.53550000000
-3,heat,R2,2022,0,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R2,2022,1,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R2,2022,2,heatpump,2020,all-year,all-week,early-peak,0.45070000000
-3,heat,R2,2022,3,heatpump,2020,all-year,all-week,early-peak,0.45070000000
-3,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,early-peak,34.65220000000
-3,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,early-peak,34.65220000000
-3,CO2f,R1,2022,0,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R1,2022,1,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,early-peak,34.65220000000
-3,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,early-peak,34.65220000000
-3,CO2f,R2,2022,0,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R2,2022,1,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-4,heat,R1,2020,0,gasboiler,2020,all-year,all-week,late-peak,1.07150000000
-4,heat,R1,2020,1,gasboiler,2020,all-year,all-week,late-peak,1.07150000000
-4,heat,R1,2022,0,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R1,2022,1,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R1,2022,2,heatpump,2020,all-year,all-week,late-peak,0.90190000000
-4,heat,R1,2022,3,heatpump,2020,all-year,all-week,late-peak,0.90190000000
-4,heat,R2,2020,0,gasboiler,2020,all-year,all-week,late-peak,1.07150000000
-4,heat,R2,2020,1,gasboiler,2020,all-year,all-week,late-peak,1.07150000000
-4,heat,R2,2022,0,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R2,2022,1,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R2,2022,2,heatpump,2020,all-year,all-week,late-peak,0.90190000000
-4,heat,R2,2022,3,heatpump,2020,all-year,all-week,late-peak,0.90190000000
-4,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,late-peak,69.33680000000
-4,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,late-peak,69.33680000000
-4,CO2f,R1,2022,0,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R1,2022,1,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,late-peak,69.33680000000
-4,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,late-peak,69.33680000000
-4,CO2f,R2,2022,0,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R2,2022,1,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-5,heat,R1,2020,0,gasboiler,2020,all-year,all-week,evening,0.71450000000
-5,heat,R1,2020,1,gasboiler,2020,all-year,all-week,evening,0.71450000000
-5,heat,R1,2022,0,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R1,2022,1,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R1,2022,2,heatpump,2020,all-year,all-week,evening,0.60140000000
-5,heat,R1,2022,3,heatpump,2020,all-year,all-week,evening,0.60140000000
-5,heat,R2,2020,0,gasboiler,2020,all-year,all-week,evening,0.71450000000
-5,heat,R2,2020,1,gasboiler,2020,all-year,all-week,evening,0.71450000000
-5,heat,R2,2022,0,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R2,2022,1,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R2,2022,2,heatpump,2020,all-year,all-week,evening,0.60140000000
-5,heat,R2,2022,3,heatpump,2020,all-year,all-week,evening,0.60140000000
-5,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,evening,46.23530000000
-5,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,evening,46.23530000000
-5,CO2f,R1,2022,0,gasboiler,2020,all-year,all-week,evening,13.48440000000
-5,CO2f,R1,2022,1,gasboiler,2020,all-year,all-week,evening,13.48440000000
-5,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,evening,46.23530000000
-5,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,evening,46.23530000000
-5,CO2f,R2,2022,0,gasboiler,2020,all-year,all-week,evening,13.48440000000
-5,CO2f,R2,2022,1,gasboiler,2020,all-year,all-week,evening,13.48440000000
-6,heat,R1,2020,0,gasboiler,2020,all-year,all-week,early-morning,0.71450000000
-6,heat,R1,2020,1,gasboiler,2020,all-year,all-week,early-morning,0.71450000000
-6,heat,R1,2022,0,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R1,2022,1,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R1,2022,2,heatpump,2020,all-year,all-week,early-morning,0.60140000000
-6,heat,R1,2022,3,heatpump,2020,all-year,all-week,early-morning,0.60140000000
-6,heat,R2,2020,0,gasboiler,2020,all-year,all-week,early-morning,0.71450000000
-6,heat,R2,2020,1,gasboiler,2020,all-year,all-week,early-morning,0.71450000000
-6,heat,R2,2022,0,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R2,2022,1,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R2,2022,2,heatpump,2020,all-year,all-week,early-morning,0.60140000000
-6,heat,R2,2022,3,heatpump,2020,all-year,all-week,early-morning,0.60140000000
-6,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,early-morning,46.23530000000
-6,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,early-morning,46.23530000000
-6,CO2f,R1,2022,0,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R1,2022,1,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,early-morning,46.23530000000
-6,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,early-morning,46.23530000000
-6,CO2f,R2,2022,0,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R2,2022,1,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-7,heat,R1,2020,0,gasboiler,2020,all-year,all-week,late-afternoon,0.71450000000
-7,heat,R1,2020,1,gasboiler,2020,all-year,all-week,late-afternoon,0.71450000000
-7,heat,R1,2022,0,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R1,2022,1,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R1,2022,2,heatpump,2020,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R1,2022,3,heatpump,2020,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R2,2020,0,gasboiler,2020,all-year,all-week,late-afternoon,0.71450000000
-7,heat,R2,2020,1,gasboiler,2020,all-year,all-week,late-afternoon,0.71450000000
-7,heat,R2,2022,0,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R2,2022,1,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R2,2022,2,heatpump,2020,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R2,2022,3,heatpump,2020,all-year,all-week,late-afternoon,0.60140000000
-7,CO2f,R1,2020,0,gasboiler,2020,all-year,all-week,late-afternoon,46.23530000000
-7,CO2f,R1,2020,1,gasboiler,2020,all-year,all-week,late-afternoon,46.23530000000
-7,CO2f,R1,2022,0,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R1,2022,1,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R2,2020,0,gasboiler,2020,all-year,all-week,late-afternoon,46.23530000000
-7,CO2f,R2,2020,1,gasboiler,2020,all-year,all-week,late-afternoon,46.23530000000
-7,CO2f,R2,2022,0,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R2,2022,1,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2020,0,all-year,all-week,night,gasboiler,2020,0.35700000000
+0,heat,R1,2020,1,all-year,all-week,night,gasboiler,2020,0.35700000000
+0,heat,R1,2022,0,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R1,2022,1,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R1,2022,2,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R1,2022,3,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R2,2020,0,all-year,all-week,night,gasboiler,2020,0.35700000000
+0,heat,R2,2020,1,all-year,all-week,night,gasboiler,2020,0.35700000000
+0,heat,R2,2022,0,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R2,2022,1,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R2,2022,2,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R2,2022,3,all-year,all-week,night,heatpump,2020,0.30050000000
+0,CO2f,R1,2020,0,all-year,all-week,night,gasboiler,2020,23.10150000000
+0,CO2f,R1,2020,1,all-year,all-week,night,gasboiler,2020,23.10150000000
+0,CO2f,R1,2022,0,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R1,2022,1,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R2,2020,0,all-year,all-week,night,gasboiler,2020,23.10150000000
+0,CO2f,R2,2020,1,all-year,all-week,night,gasboiler,2020,23.10150000000
+0,CO2f,R2,2022,0,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R2,2022,1,all-year,all-week,night,gasboiler,2020,6.73750000000
+1,heat,R1,2020,0,all-year,all-week,morning,gasboiler,2020,0.53550000000
+1,heat,R1,2020,1,all-year,all-week,morning,gasboiler,2020,0.53550000000
+1,heat,R1,2022,0,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R1,2022,1,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R1,2022,2,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R1,2022,3,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R2,2020,0,all-year,all-week,morning,gasboiler,2020,0.53550000000
+1,heat,R2,2020,1,all-year,all-week,morning,gasboiler,2020,0.53550000000
+1,heat,R2,2022,0,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R2,2022,1,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R2,2022,2,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R2,2022,3,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,CO2f,R1,2020,0,all-year,all-week,morning,gasboiler,2020,34.65220000000
+1,CO2f,R1,2020,1,all-year,all-week,morning,gasboiler,2020,34.65220000000
+1,CO2f,R1,2022,0,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R1,2022,1,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R2,2020,0,all-year,all-week,morning,gasboiler,2020,34.65220000000
+1,CO2f,R2,2020,1,all-year,all-week,morning,gasboiler,2020,34.65220000000
+1,CO2f,R2,2022,0,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R2,2022,1,all-year,all-week,morning,gasboiler,2020,10.10620000000
+2,heat,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35700000000
+2,heat,R1,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.35700000000
+2,heat,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R1,2022,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R1,2022,2,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R1,2022,3,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.35700000000
+2,heat,R2,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.35700000000
+2,heat,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R2,2022,1,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R2,2022,2,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R2,2022,3,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,CO2f,R1,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,23.10150000000
+2,CO2f,R1,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,23.10150000000
+2,CO2f,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R1,2022,1,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R2,2020,0,all-year,all-week,mid-afternoon,gasboiler,2020,23.10150000000
+2,CO2f,R2,2020,1,all-year,all-week,mid-afternoon,gasboiler,2020,23.10150000000
+2,CO2f,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R2,2022,1,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+3,heat,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.53550000000
+3,heat,R1,2020,1,all-year,all-week,early-peak,gasboiler,2020,0.53550000000
+3,heat,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R1,2022,1,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R1,2022,2,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R1,2022,3,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,0.53550000000
+3,heat,R2,2020,1,all-year,all-week,early-peak,gasboiler,2020,0.53550000000
+3,heat,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R2,2022,1,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R2,2022,2,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R2,2022,3,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,CO2f,R1,2020,0,all-year,all-week,early-peak,gasboiler,2020,34.65220000000
+3,CO2f,R1,2020,1,all-year,all-week,early-peak,gasboiler,2020,34.65220000000
+3,CO2f,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R1,2022,1,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R2,2020,0,all-year,all-week,early-peak,gasboiler,2020,34.65220000000
+3,CO2f,R2,2020,1,all-year,all-week,early-peak,gasboiler,2020,34.65220000000
+3,CO2f,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R2,2022,1,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+4,heat,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.07150000000
+4,heat,R1,2020,1,all-year,all-week,late-peak,gasboiler,2020,1.07150000000
+4,heat,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R1,2022,1,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R1,2022,2,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R1,2022,3,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,1.07150000000
+4,heat,R2,2020,1,all-year,all-week,late-peak,gasboiler,2020,1.07150000000
+4,heat,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R2,2022,1,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R2,2022,2,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R2,2022,3,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,CO2f,R1,2020,0,all-year,all-week,late-peak,gasboiler,2020,69.33680000000
+4,CO2f,R1,2020,1,all-year,all-week,late-peak,gasboiler,2020,69.33680000000
+4,CO2f,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R1,2022,1,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R2,2020,0,all-year,all-week,late-peak,gasboiler,2020,69.33680000000
+4,CO2f,R2,2020,1,all-year,all-week,late-peak,gasboiler,2020,69.33680000000
+4,CO2f,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R2,2022,1,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+5,heat,R1,2020,0,all-year,all-week,evening,gasboiler,2020,0.71450000000
+5,heat,R1,2020,1,all-year,all-week,evening,gasboiler,2020,0.71450000000
+5,heat,R1,2022,0,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R1,2022,1,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R1,2022,2,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R1,2022,3,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R2,2020,0,all-year,all-week,evening,gasboiler,2020,0.71450000000
+5,heat,R2,2020,1,all-year,all-week,evening,gasboiler,2020,0.71450000000
+5,heat,R2,2022,0,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R2,2022,1,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R2,2022,2,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R2,2022,3,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,CO2f,R1,2020,0,all-year,all-week,evening,gasboiler,2020,46.23530000000
+5,CO2f,R1,2020,1,all-year,all-week,evening,gasboiler,2020,46.23530000000
+5,CO2f,R1,2022,0,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R1,2022,1,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R2,2020,0,all-year,all-week,evening,gasboiler,2020,46.23530000000
+5,CO2f,R2,2020,1,all-year,all-week,evening,gasboiler,2020,46.23530000000
+5,CO2f,R2,2022,0,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R2,2022,1,all-year,all-week,evening,gasboiler,2020,13.48440000000
+6,heat,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.71450000000
+6,heat,R1,2020,1,all-year,all-week,early-morning,gasboiler,2020,0.71450000000
+6,heat,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R1,2022,1,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R1,2022,2,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R1,2022,3,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,0.71450000000
+6,heat,R2,2020,1,all-year,all-week,early-morning,gasboiler,2020,0.71450000000
+6,heat,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R2,2022,1,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R2,2022,2,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R2,2022,3,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,CO2f,R1,2020,0,all-year,all-week,early-morning,gasboiler,2020,46.23530000000
+6,CO2f,R1,2020,1,all-year,all-week,early-morning,gasboiler,2020,46.23530000000
+6,CO2f,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R1,2022,1,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R2,2020,0,all-year,all-week,early-morning,gasboiler,2020,46.23530000000
+6,CO2f,R2,2020,1,all-year,all-week,early-morning,gasboiler,2020,46.23530000000
+6,CO2f,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R2,2022,1,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+7,heat,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.71450000000
+7,heat,R1,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,0.71450000000
+7,heat,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R1,2022,1,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R1,2022,2,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R1,2022,3,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,0.71450000000
+7,heat,R2,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,0.71450000000
+7,heat,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R2,2022,1,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R2,2022,2,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R2,2022,3,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,CO2f,R1,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,46.23530000000
+7,CO2f,R1,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,46.23530000000
+7,CO2f,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R1,2022,1,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R2,2020,0,all-year,all-week,late-afternoon,gasboiler,2020,46.23530000000
+7,CO2f,R2,2020,1,all-year,all-week,late-afternoon,gasboiler,2020,46.23530000000
+7,CO2f,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R2,2022,1,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2022.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2022.csv
index 6f6895978..105935cae 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2022.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2022.csv
@@ -1,225 +1,225 @@
-timeslice,commodity,region,year,asset,installed,technology,month,day,hour,supply
-0,heat,R1,2022,0,2020,gasboiler,all-year,all-week,night,0.10410000000
-0,heat,R1,2022,1,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R1,2022,3,2020,gasboiler,all-year,all-week,night,0.10410000000
-0,heat,R1,2022,4,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R1,2024,0,2020,gasboiler,all-year,all-week,night,0.10410000000
-0,heat,R1,2024,1,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R1,2024,2,2022,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R1,2024,3,2020,gasboiler,all-year,all-week,night,0.10410000000
-0,heat,R1,2024,4,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R1,2024,5,2022,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R2,2022,0,2020,gasboiler,all-year,all-week,night,0.10410000000
-0,heat,R2,2022,1,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R2,2022,3,2020,gasboiler,all-year,all-week,night,0.10410000000
-0,heat,R2,2022,4,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R2,2024,0,2020,gasboiler,all-year,all-week,night,0.10410000000
-0,heat,R2,2024,1,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R2,2024,2,2022,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R2,2024,3,2020,gasboiler,all-year,all-week,night,0.10410000000
-0,heat,R2,2024,4,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R2,2024,5,2022,heatpump,all-year,all-week,night,0.04760000000
-0,CO2f,R1,2022,0,2020,gasboiler,all-year,all-week,night,6.73750000000
-0,CO2f,R1,2022,3,2020,gasboiler,all-year,all-week,night,6.73750000000
-0,CO2f,R1,2024,0,2020,gasboiler,all-year,all-week,night,6.73750000000
-0,CO2f,R1,2024,3,2020,gasboiler,all-year,all-week,night,6.73750000000
-0,CO2f,R2,2022,0,2020,gasboiler,all-year,all-week,night,6.73750000000
-0,CO2f,R2,2022,3,2020,gasboiler,all-year,all-week,night,6.73750000000
-0,CO2f,R2,2024,0,2020,gasboiler,all-year,all-week,night,6.73750000000
-0,CO2f,R2,2024,3,2020,gasboiler,all-year,all-week,night,6.73750000000
-1,heat,R1,2022,0,2020,gasboiler,all-year,all-week,morning,0.15620000000
-1,heat,R1,2022,1,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R1,2022,3,2020,gasboiler,all-year,all-week,morning,0.15620000000
-1,heat,R1,2022,4,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R1,2024,0,2020,gasboiler,all-year,all-week,morning,0.15620000000
-1,heat,R1,2024,1,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R1,2024,2,2022,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R1,2024,3,2020,gasboiler,all-year,all-week,morning,0.15620000000
-1,heat,R1,2024,4,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R1,2024,5,2022,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R2,2022,0,2020,gasboiler,all-year,all-week,morning,0.15620000000
-1,heat,R2,2022,1,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R2,2022,3,2020,gasboiler,all-year,all-week,morning,0.15620000000
-1,heat,R2,2022,4,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R2,2024,0,2020,gasboiler,all-year,all-week,morning,0.15620000000
-1,heat,R2,2024,1,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R2,2024,2,2022,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R2,2024,3,2020,gasboiler,all-year,all-week,morning,0.15620000000
-1,heat,R2,2024,4,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R2,2024,5,2022,heatpump,all-year,all-week,morning,0.07140000000
-1,CO2f,R1,2022,0,2020,gasboiler,all-year,all-week,morning,10.10620000000
-1,CO2f,R1,2022,3,2020,gasboiler,all-year,all-week,morning,10.10620000000
-1,CO2f,R1,2024,0,2020,gasboiler,all-year,all-week,morning,10.10620000000
-1,CO2f,R1,2024,3,2020,gasboiler,all-year,all-week,morning,10.10620000000
-1,CO2f,R2,2022,0,2020,gasboiler,all-year,all-week,morning,10.10620000000
-1,CO2f,R2,2022,3,2020,gasboiler,all-year,all-week,morning,10.10620000000
-1,CO2f,R2,2024,0,2020,gasboiler,all-year,all-week,morning,10.10620000000
-1,CO2f,R2,2024,3,2020,gasboiler,all-year,all-week,morning,10.10620000000
-2,heat,R1,2022,0,2020,gasboiler,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R1,2022,1,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R1,2022,3,2020,gasboiler,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R1,2022,4,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R1,2024,0,2020,gasboiler,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R1,2024,1,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R1,2024,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2024,3,2020,gasboiler,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R1,2024,4,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R1,2024,5,2022,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2022,0,2020,gasboiler,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R2,2022,1,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R2,2022,3,2020,gasboiler,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R2,2022,4,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R2,2024,0,2020,gasboiler,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R2,2024,1,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R2,2024,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2024,3,2020,gasboiler,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R2,2024,4,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R2,2024,5,2022,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,CO2f,R1,2022,0,2020,gasboiler,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R1,2022,3,2020,gasboiler,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R1,2024,0,2020,gasboiler,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R1,2024,3,2020,gasboiler,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R2,2022,0,2020,gasboiler,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R2,2022,3,2020,gasboiler,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R2,2024,0,2020,gasboiler,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R2,2024,3,2020,gasboiler,all-year,all-week,mid-afternoon,6.73750000000
-3,heat,R1,2022,0,2020,gasboiler,all-year,all-week,early-peak,0.15620000000
-3,heat,R1,2022,1,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R1,2022,3,2020,gasboiler,all-year,all-week,early-peak,0.15620000000
-3,heat,R1,2022,4,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R1,2024,0,2020,gasboiler,all-year,all-week,early-peak,0.15620000000
-3,heat,R1,2024,1,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R1,2024,2,2022,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2024,3,2020,gasboiler,all-year,all-week,early-peak,0.15620000000
-3,heat,R1,2024,4,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R1,2024,5,2022,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2022,0,2020,gasboiler,all-year,all-week,early-peak,0.15620000000
-3,heat,R2,2022,1,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R2,2022,3,2020,gasboiler,all-year,all-week,early-peak,0.15620000000
-3,heat,R2,2022,4,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R2,2024,0,2020,gasboiler,all-year,all-week,early-peak,0.15620000000
-3,heat,R2,2024,1,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R2,2024,2,2022,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2024,3,2020,gasboiler,all-year,all-week,early-peak,0.15620000000
-3,heat,R2,2024,4,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R2,2024,5,2022,heatpump,all-year,all-week,early-peak,0.07140000000
-3,CO2f,R1,2022,0,2020,gasboiler,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R1,2022,3,2020,gasboiler,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R1,2024,0,2020,gasboiler,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R1,2024,3,2020,gasboiler,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R2,2022,0,2020,gasboiler,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R2,2022,3,2020,gasboiler,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R2,2024,0,2020,gasboiler,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R2,2024,3,2020,gasboiler,all-year,all-week,early-peak,10.10620000000
-4,heat,R1,2022,0,2020,gasboiler,all-year,all-week,late-peak,0.31250000000
-4,heat,R1,2022,1,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R1,2022,3,2020,gasboiler,all-year,all-week,late-peak,0.31250000000
-4,heat,R1,2022,4,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R1,2024,0,2020,gasboiler,all-year,all-week,late-peak,0.31250000000
-4,heat,R1,2024,1,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R1,2024,2,2022,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2024,3,2020,gasboiler,all-year,all-week,late-peak,0.31250000000
-4,heat,R1,2024,4,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R1,2024,5,2022,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2022,0,2020,gasboiler,all-year,all-week,late-peak,0.31250000000
-4,heat,R2,2022,1,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R2,2022,3,2020,gasboiler,all-year,all-week,late-peak,0.31250000000
-4,heat,R2,2022,4,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R2,2024,0,2020,gasboiler,all-year,all-week,late-peak,0.31250000000
-4,heat,R2,2024,1,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R2,2024,2,2022,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2024,3,2020,gasboiler,all-year,all-week,late-peak,0.31250000000
-4,heat,R2,2024,4,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R2,2024,5,2022,heatpump,all-year,all-week,late-peak,0.14290000000
-4,CO2f,R1,2022,0,2020,gasboiler,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R1,2022,3,2020,gasboiler,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R1,2024,0,2020,gasboiler,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R1,2024,3,2020,gasboiler,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R2,2022,0,2020,gasboiler,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R2,2022,3,2020,gasboiler,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R2,2024,0,2020,gasboiler,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R2,2024,3,2020,gasboiler,all-year,all-week,late-peak,20.22190000000
-5,heat,R1,2022,0,2020,gasboiler,all-year,all-week,evening,0.20840000000
-5,heat,R1,2022,1,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R1,2022,3,2020,gasboiler,all-year,all-week,evening,0.20840000000
-5,heat,R1,2022,4,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R1,2024,0,2020,gasboiler,all-year,all-week,evening,0.20840000000
-5,heat,R1,2024,1,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R1,2024,2,2022,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R1,2024,3,2020,gasboiler,all-year,all-week,evening,0.20840000000
-5,heat,R1,2024,4,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R1,2024,5,2022,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R2,2022,0,2020,gasboiler,all-year,all-week,evening,0.20840000000
-5,heat,R2,2022,1,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R2,2022,3,2020,gasboiler,all-year,all-week,evening,0.20840000000
-5,heat,R2,2022,4,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R2,2024,0,2020,gasboiler,all-year,all-week,evening,0.20840000000
-5,heat,R2,2024,1,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R2,2024,2,2022,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R2,2024,3,2020,gasboiler,all-year,all-week,evening,0.20840000000
-5,heat,R2,2024,4,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R2,2024,5,2022,heatpump,all-year,all-week,evening,0.09530000000
-5,CO2f,R1,2022,0,2020,gasboiler,all-year,all-week,evening,13.48440000000
-5,CO2f,R1,2022,3,2020,gasboiler,all-year,all-week,evening,13.48440000000
-5,CO2f,R1,2024,0,2020,gasboiler,all-year,all-week,evening,13.48440000000
-5,CO2f,R1,2024,3,2020,gasboiler,all-year,all-week,evening,13.48440000000
-5,CO2f,R2,2022,0,2020,gasboiler,all-year,all-week,evening,13.48440000000
-5,CO2f,R2,2022,3,2020,gasboiler,all-year,all-week,evening,13.48440000000
-5,CO2f,R2,2024,0,2020,gasboiler,all-year,all-week,evening,13.48440000000
-5,CO2f,R2,2024,3,2020,gasboiler,all-year,all-week,evening,13.48440000000
-6,heat,R1,2022,0,2020,gasboiler,all-year,all-week,early-morning,0.20840000000
-6,heat,R1,2022,1,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R1,2022,3,2020,gasboiler,all-year,all-week,early-morning,0.20840000000
-6,heat,R1,2022,4,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R1,2024,0,2020,gasboiler,all-year,all-week,early-morning,0.20840000000
-6,heat,R1,2024,1,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R1,2024,2,2022,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2024,3,2020,gasboiler,all-year,all-week,early-morning,0.20840000000
-6,heat,R1,2024,4,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R1,2024,5,2022,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2022,0,2020,gasboiler,all-year,all-week,early-morning,0.20840000000
-6,heat,R2,2022,1,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R2,2022,3,2020,gasboiler,all-year,all-week,early-morning,0.20840000000
-6,heat,R2,2022,4,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R2,2024,0,2020,gasboiler,all-year,all-week,early-morning,0.20840000000
-6,heat,R2,2024,1,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R2,2024,2,2022,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2024,3,2020,gasboiler,all-year,all-week,early-morning,0.20840000000
-6,heat,R2,2024,4,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R2,2024,5,2022,heatpump,all-year,all-week,early-morning,0.09530000000
-6,CO2f,R1,2022,0,2020,gasboiler,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R1,2022,3,2020,gasboiler,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R1,2024,0,2020,gasboiler,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R1,2024,3,2020,gasboiler,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R2,2022,0,2020,gasboiler,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R2,2022,3,2020,gasboiler,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R2,2024,0,2020,gasboiler,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R2,2024,3,2020,gasboiler,all-year,all-week,early-morning,13.48440000000
-7,heat,R1,2022,0,2020,gasboiler,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R1,2022,1,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R1,2022,3,2020,gasboiler,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R1,2022,4,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R1,2024,0,2020,gasboiler,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R1,2024,1,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R1,2024,2,2022,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2024,3,2020,gasboiler,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R1,2024,4,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R1,2024,5,2022,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2022,0,2020,gasboiler,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R2,2022,1,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R2,2022,3,2020,gasboiler,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R2,2022,4,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R2,2024,0,2020,gasboiler,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R2,2024,1,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R2,2024,2,2022,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2024,3,2020,gasboiler,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R2,2024,4,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R2,2024,5,2022,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,CO2f,R1,2022,0,2020,gasboiler,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R1,2022,3,2020,gasboiler,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R1,2024,0,2020,gasboiler,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R1,2024,3,2020,gasboiler,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R2,2022,0,2020,gasboiler,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R2,2022,3,2020,gasboiler,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R2,2024,0,2020,gasboiler,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R2,2024,3,2020,gasboiler,all-year,all-week,late-afternoon,13.48440000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2022,0,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R1,2022,1,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R1,2022,3,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R1,2022,4,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R1,2024,0,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R1,2024,1,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R1,2024,2,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R1,2024,3,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R1,2024,4,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R1,2024,5,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R2,2022,0,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R2,2022,1,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R2,2022,3,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R2,2022,4,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R2,2024,0,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R2,2024,1,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R2,2024,2,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R2,2024,3,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R2,2024,4,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R2,2024,5,all-year,all-week,night,heatpump,2022,0.04760000000
+0,CO2f,R1,2022,0,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R1,2022,3,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R1,2024,0,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R1,2024,3,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R2,2022,0,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R2,2022,3,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R2,2024,0,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R2,2024,3,all-year,all-week,night,gasboiler,2020,6.73750000000
+1,heat,R1,2022,0,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R1,2022,1,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R1,2022,3,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R1,2022,4,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R1,2024,0,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R1,2024,1,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R1,2024,2,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R1,2024,3,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R1,2024,4,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R1,2024,5,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R2,2022,0,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R2,2022,1,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R2,2022,3,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R2,2022,4,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R2,2024,0,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R2,2024,1,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R2,2024,2,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R2,2024,3,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R2,2024,4,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R2,2024,5,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,CO2f,R1,2022,0,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R1,2022,3,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R1,2024,0,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R1,2024,3,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R2,2022,0,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R2,2022,3,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R2,2024,0,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R2,2024,3,all-year,all-week,morning,gasboiler,2020,10.10620000000
+2,heat,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R1,2022,1,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R1,2022,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R1,2022,4,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R1,2024,1,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R1,2024,2,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R1,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R1,2024,4,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R1,2024,5,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R2,2022,1,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R2,2022,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R2,2022,4,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R2,2024,1,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R2,2024,2,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R2,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R2,2024,4,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R2,2024,5,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,CO2f,R1,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R1,2022,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R1,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R2,2022,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R2,2022,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R2,2024,3,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+3,heat,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R1,2022,1,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R1,2022,3,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R1,2022,4,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R1,2024,1,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R1,2024,2,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R1,2024,3,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R1,2024,4,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R1,2024,5,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R2,2022,1,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R2,2022,3,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R2,2022,4,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R2,2024,1,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R2,2024,2,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R2,2024,3,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R2,2024,4,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R2,2024,5,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,CO2f,R1,2022,0,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R1,2022,3,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R1,2024,3,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R2,2022,0,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R2,2022,3,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R2,2024,3,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+4,heat,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R1,2022,1,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R1,2022,3,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R1,2022,4,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R1,2024,0,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R1,2024,1,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R1,2024,2,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R1,2024,3,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R1,2024,4,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R1,2024,5,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R2,2022,1,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R2,2022,3,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R2,2022,4,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R2,2024,0,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R2,2024,1,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R2,2024,2,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R2,2024,3,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R2,2024,4,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R2,2024,5,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,CO2f,R1,2022,0,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R1,2022,3,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R1,2024,0,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R1,2024,3,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R2,2022,0,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R2,2022,3,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R2,2024,0,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R2,2024,3,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+5,heat,R1,2022,0,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R1,2022,1,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R1,2022,3,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R1,2022,4,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R1,2024,0,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R1,2024,1,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R1,2024,2,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R1,2024,3,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R1,2024,4,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R1,2024,5,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R2,2022,0,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R2,2022,1,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R2,2022,3,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R2,2022,4,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R2,2024,0,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R2,2024,1,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R2,2024,2,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R2,2024,3,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R2,2024,4,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R2,2024,5,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,CO2f,R1,2022,0,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R1,2022,3,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R1,2024,0,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R1,2024,3,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R2,2022,0,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R2,2022,3,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R2,2024,0,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R2,2024,3,all-year,all-week,evening,gasboiler,2020,13.48440000000
+6,heat,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R1,2022,1,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R1,2022,3,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R1,2022,4,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R1,2024,1,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R1,2024,2,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R1,2024,3,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R1,2024,4,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R1,2024,5,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R2,2022,1,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R2,2022,3,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R2,2022,4,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R2,2024,1,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R2,2024,2,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R2,2024,3,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R2,2024,4,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R2,2024,5,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,CO2f,R1,2022,0,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R1,2022,3,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R1,2024,3,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R2,2022,0,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R2,2022,3,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R2,2024,3,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+7,heat,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R1,2022,1,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R1,2022,3,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R1,2022,4,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R1,2024,1,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R1,2024,2,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R1,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R1,2024,4,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R1,2024,5,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R2,2022,1,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R2,2022,3,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R2,2022,4,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R2,2024,1,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R2,2024,2,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R2,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R2,2024,4,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R2,2024,5,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,CO2f,R1,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R1,2022,3,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R1,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R2,2022,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R2,2022,3,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R2,2024,3,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2024.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2024.csv
index 5b8d3bd30..e3bd2ae30 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2024.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2024.csv
@@ -1,289 +1,289 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2024,0,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R1,2024,2,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R1,2024,4,heatpump,2020,all-year,all-week,night,0.30050000000
-0,heat,R1,2024,5,heatpump,2022,all-year,all-week,night,0.04760000000
-0,heat,R1,2024,7,heatpump,2020,all-year,all-week,night,0.30050000000
-0,heat,R1,2024,8,heatpump,2022,all-year,all-week,night,0.04760000000
-0,heat,R1,2026,1,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R1,2026,3,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R1,2026,4,heatpump,2020,all-year,all-week,night,0.30050000000
-0,heat,R1,2026,5,heatpump,2022,all-year,all-week,night,0.04760000000
-0,heat,R1,2026,6,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R1,2026,7,heatpump,2020,all-year,all-week,night,0.30050000000
-0,heat,R1,2026,8,heatpump,2022,all-year,all-week,night,0.04760000000
-0,heat,R1,2026,9,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R2,2024,0,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R2,2024,2,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R2,2024,4,heatpump,2020,all-year,all-week,night,0.30050000000
-0,heat,R2,2024,5,heatpump,2022,all-year,all-week,night,0.04760000000
-0,heat,R2,2024,7,heatpump,2020,all-year,all-week,night,0.30050000000
-0,heat,R2,2024,8,heatpump,2022,all-year,all-week,night,0.04760000000
-0,heat,R2,2026,1,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R2,2026,3,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R2,2026,4,heatpump,2020,all-year,all-week,night,0.30050000000
-0,heat,R2,2026,5,heatpump,2022,all-year,all-week,night,0.04760000000
-0,heat,R2,2026,6,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R2,2026,7,heatpump,2020,all-year,all-week,night,0.30050000000
-0,heat,R2,2026,8,heatpump,2022,all-year,all-week,night,0.04760000000
-0,heat,R2,2026,9,heatpump,2024,all-year,all-week,night,0.10330000000
-0,CO2f,R1,2024,0,gasboiler,2020,all-year,all-week,night,6.73750000000
-0,CO2f,R1,2024,2,gasboiler,2020,all-year,all-week,night,6.73750000000
-0,CO2f,R1,2026,1,gasboiler,2024,all-year,all-week,night,3.13360000000
-0,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,night,3.13360000000
-0,CO2f,R2,2024,0,gasboiler,2020,all-year,all-week,night,6.73750000000
-0,CO2f,R2,2024,2,gasboiler,2020,all-year,all-week,night,6.73750000000
-0,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,night,3.13360000000
-0,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,night,3.13360000000
-1,heat,R1,2024,0,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R1,2024,2,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R1,2024,4,heatpump,2020,all-year,all-week,morning,0.45070000000
-1,heat,R1,2024,5,heatpump,2022,all-year,all-week,morning,0.07140000000
-1,heat,R1,2024,7,heatpump,2020,all-year,all-week,morning,0.45070000000
-1,heat,R1,2024,8,heatpump,2022,all-year,all-week,morning,0.07140000000
-1,heat,R1,2026,1,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R1,2026,3,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R1,2026,4,heatpump,2020,all-year,all-week,morning,0.45070000000
-1,heat,R1,2026,5,heatpump,2022,all-year,all-week,morning,0.07140000000
-1,heat,R1,2026,6,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R1,2026,7,heatpump,2020,all-year,all-week,morning,0.45070000000
-1,heat,R1,2026,8,heatpump,2022,all-year,all-week,morning,0.07140000000
-1,heat,R1,2026,9,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R2,2024,0,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R2,2024,2,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R2,2024,4,heatpump,2020,all-year,all-week,morning,0.45070000000
-1,heat,R2,2024,5,heatpump,2022,all-year,all-week,morning,0.07140000000
-1,heat,R2,2024,7,heatpump,2020,all-year,all-week,morning,0.45070000000
-1,heat,R2,2024,8,heatpump,2022,all-year,all-week,morning,0.07140000000
-1,heat,R2,2026,1,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R2,2026,3,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R2,2026,4,heatpump,2020,all-year,all-week,morning,0.45070000000
-1,heat,R2,2026,5,heatpump,2022,all-year,all-week,morning,0.07140000000
-1,heat,R2,2026,6,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R2,2026,7,heatpump,2020,all-year,all-week,morning,0.45070000000
-1,heat,R2,2026,8,heatpump,2022,all-year,all-week,morning,0.07140000000
-1,heat,R2,2026,9,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,CO2f,R1,2024,0,gasboiler,2020,all-year,all-week,morning,10.10620000000
-1,CO2f,R1,2024,2,gasboiler,2020,all-year,all-week,morning,10.10620000000
-1,CO2f,R1,2026,1,gasboiler,2024,all-year,all-week,morning,4.70040000000
-1,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,morning,4.70040000000
-1,CO2f,R2,2024,0,gasboiler,2020,all-year,all-week,morning,10.10620000000
-1,CO2f,R2,2024,2,gasboiler,2020,all-year,all-week,morning,10.10620000000
-1,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,morning,4.70040000000
-1,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,morning,4.70040000000
-2,heat,R1,2024,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R1,2024,2,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R1,2024,4,heatpump,2020,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R1,2024,5,heatpump,2022,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2024,7,heatpump,2020,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R1,2024,8,heatpump,2022,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2026,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R1,2026,3,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R1,2026,4,heatpump,2020,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R1,2026,5,heatpump,2022,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2026,6,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R1,2026,7,heatpump,2020,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R1,2026,8,heatpump,2022,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2026,9,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R2,2024,0,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R2,2024,2,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R2,2024,4,heatpump,2020,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R2,2024,5,heatpump,2022,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2024,7,heatpump,2020,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R2,2024,8,heatpump,2022,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2026,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R2,2026,3,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R2,2026,4,heatpump,2020,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R2,2026,5,heatpump,2022,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2026,6,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R2,2026,7,heatpump,2020,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R2,2026,8,heatpump,2022,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2026,9,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,CO2f,R1,2024,0,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R1,2024,2,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R1,2026,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R2,2024,0,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R2,2024,2,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-3,heat,R1,2024,0,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R1,2024,2,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R1,2024,4,heatpump,2020,all-year,all-week,early-peak,0.45070000000
-3,heat,R1,2024,5,heatpump,2022,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2024,7,heatpump,2020,all-year,all-week,early-peak,0.45070000000
-3,heat,R1,2024,8,heatpump,2022,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2026,1,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R1,2026,3,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R1,2026,4,heatpump,2020,all-year,all-week,early-peak,0.45070000000
-3,heat,R1,2026,5,heatpump,2022,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2026,6,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R1,2026,7,heatpump,2020,all-year,all-week,early-peak,0.45070000000
-3,heat,R1,2026,8,heatpump,2022,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2026,9,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R2,2024,0,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R2,2024,2,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R2,2024,4,heatpump,2020,all-year,all-week,early-peak,0.45070000000
-3,heat,R2,2024,5,heatpump,2022,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2024,7,heatpump,2020,all-year,all-week,early-peak,0.45070000000
-3,heat,R2,2024,8,heatpump,2022,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2026,1,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R2,2026,3,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R2,2026,4,heatpump,2020,all-year,all-week,early-peak,0.45070000000
-3,heat,R2,2026,5,heatpump,2022,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2026,6,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R2,2026,7,heatpump,2020,all-year,all-week,early-peak,0.45070000000
-3,heat,R2,2026,8,heatpump,2022,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2026,9,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,CO2f,R1,2024,0,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R1,2024,2,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R1,2026,1,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R2,2024,0,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R2,2024,2,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-4,heat,R1,2024,0,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R1,2024,2,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R1,2024,4,heatpump,2020,all-year,all-week,late-peak,0.90190000000
-4,heat,R1,2024,5,heatpump,2022,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2024,7,heatpump,2020,all-year,all-week,late-peak,0.90190000000
-4,heat,R1,2024,8,heatpump,2022,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2026,1,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R1,2026,3,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R1,2026,4,heatpump,2020,all-year,all-week,late-peak,0.90190000000
-4,heat,R1,2026,5,heatpump,2022,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2026,6,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R1,2026,7,heatpump,2020,all-year,all-week,late-peak,0.90190000000
-4,heat,R1,2026,8,heatpump,2022,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2026,9,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R2,2024,0,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R2,2024,2,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R2,2024,4,heatpump,2020,all-year,all-week,late-peak,0.90190000000
-4,heat,R2,2024,5,heatpump,2022,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2024,7,heatpump,2020,all-year,all-week,late-peak,0.90190000000
-4,heat,R2,2024,8,heatpump,2022,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2026,1,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R2,2026,3,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R2,2026,4,heatpump,2020,all-year,all-week,late-peak,0.90190000000
-4,heat,R2,2026,5,heatpump,2022,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2026,6,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R2,2026,7,heatpump,2020,all-year,all-week,late-peak,0.90190000000
-4,heat,R2,2026,8,heatpump,2022,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2026,9,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,CO2f,R1,2024,0,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R1,2024,2,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R1,2026,1,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R2,2024,0,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R2,2024,2,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-5,heat,R1,2024,0,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R1,2024,2,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R1,2024,4,heatpump,2020,all-year,all-week,evening,0.60140000000
-5,heat,R1,2024,5,heatpump,2022,all-year,all-week,evening,0.09530000000
-5,heat,R1,2024,7,heatpump,2020,all-year,all-week,evening,0.60140000000
-5,heat,R1,2024,8,heatpump,2022,all-year,all-week,evening,0.09530000000
-5,heat,R1,2026,1,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R1,2026,3,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R1,2026,4,heatpump,2020,all-year,all-week,evening,0.60140000000
-5,heat,R1,2026,5,heatpump,2022,all-year,all-week,evening,0.09530000000
-5,heat,R1,2026,6,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R1,2026,7,heatpump,2020,all-year,all-week,evening,0.60140000000
-5,heat,R1,2026,8,heatpump,2022,all-year,all-week,evening,0.09530000000
-5,heat,R1,2026,9,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R2,2024,0,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R2,2024,2,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R2,2024,4,heatpump,2020,all-year,all-week,evening,0.60140000000
-5,heat,R2,2024,5,heatpump,2022,all-year,all-week,evening,0.09530000000
-5,heat,R2,2024,7,heatpump,2020,all-year,all-week,evening,0.60140000000
-5,heat,R2,2024,8,heatpump,2022,all-year,all-week,evening,0.09530000000
-5,heat,R2,2026,1,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R2,2026,3,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R2,2026,4,heatpump,2020,all-year,all-week,evening,0.60140000000
-5,heat,R2,2026,5,heatpump,2022,all-year,all-week,evening,0.09530000000
-5,heat,R2,2026,6,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R2,2026,7,heatpump,2020,all-year,all-week,evening,0.60140000000
-5,heat,R2,2026,8,heatpump,2022,all-year,all-week,evening,0.09530000000
-5,heat,R2,2026,9,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,CO2f,R1,2024,0,gasboiler,2020,all-year,all-week,evening,13.48440000000
-5,CO2f,R1,2024,2,gasboiler,2020,all-year,all-week,evening,13.48440000000
-5,CO2f,R1,2026,1,gasboiler,2024,all-year,all-week,evening,6.27150000000
-5,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,evening,6.27150000000
-5,CO2f,R2,2024,0,gasboiler,2020,all-year,all-week,evening,13.48440000000
-5,CO2f,R2,2024,2,gasboiler,2020,all-year,all-week,evening,13.48440000000
-5,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,evening,6.27150000000
-5,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,evening,6.27150000000
-6,heat,R1,2024,0,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R1,2024,2,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R1,2024,4,heatpump,2020,all-year,all-week,early-morning,0.60140000000
-6,heat,R1,2024,5,heatpump,2022,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2024,7,heatpump,2020,all-year,all-week,early-morning,0.60140000000
-6,heat,R1,2024,8,heatpump,2022,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2026,1,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R1,2026,3,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R1,2026,4,heatpump,2020,all-year,all-week,early-morning,0.60140000000
-6,heat,R1,2026,5,heatpump,2022,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2026,6,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R1,2026,7,heatpump,2020,all-year,all-week,early-morning,0.60140000000
-6,heat,R1,2026,8,heatpump,2022,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2026,9,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R2,2024,0,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R2,2024,2,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R2,2024,4,heatpump,2020,all-year,all-week,early-morning,0.60140000000
-6,heat,R2,2024,5,heatpump,2022,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2024,7,heatpump,2020,all-year,all-week,early-morning,0.60140000000
-6,heat,R2,2024,8,heatpump,2022,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2026,1,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R2,2026,3,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R2,2026,4,heatpump,2020,all-year,all-week,early-morning,0.60140000000
-6,heat,R2,2026,5,heatpump,2022,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2026,6,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R2,2026,7,heatpump,2020,all-year,all-week,early-morning,0.60140000000
-6,heat,R2,2026,8,heatpump,2022,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2026,9,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,CO2f,R1,2024,0,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R1,2024,2,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R1,2026,1,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R2,2024,0,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R2,2024,2,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-7,heat,R1,2024,0,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R1,2024,2,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R1,2024,4,heatpump,2020,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R1,2024,5,heatpump,2022,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2024,7,heatpump,2020,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R1,2024,8,heatpump,2022,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2026,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R1,2026,3,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R1,2026,4,heatpump,2020,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R1,2026,5,heatpump,2022,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2026,6,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R1,2026,7,heatpump,2020,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R1,2026,8,heatpump,2022,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2026,9,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R2,2024,0,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R2,2024,2,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R2,2024,4,heatpump,2020,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R2,2024,5,heatpump,2022,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2024,7,heatpump,2020,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R2,2024,8,heatpump,2022,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2026,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R2,2026,3,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R2,2026,4,heatpump,2020,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R2,2026,5,heatpump,2022,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2026,6,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R2,2026,7,heatpump,2020,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R2,2026,8,heatpump,2022,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2026,9,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,CO2f,R1,2024,0,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R1,2024,2,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R1,2026,1,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R1,2026,3,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R2,2024,0,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R2,2024,2,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R2,2026,1,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R2,2026,3,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2024,0,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R1,2024,2,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R1,2024,4,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R1,2024,5,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R1,2024,7,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R1,2024,8,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R1,2026,1,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R1,2026,3,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R1,2026,4,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R1,2026,5,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R1,2026,6,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R1,2026,7,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R1,2026,8,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R1,2026,9,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R2,2024,0,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R2,2024,2,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R2,2024,4,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R2,2024,5,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R2,2024,7,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R2,2024,8,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R2,2026,1,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R2,2026,3,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R2,2026,4,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R2,2026,5,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R2,2026,6,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R2,2026,7,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R2,2026,8,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R2,2026,9,all-year,all-week,night,heatpump,2024,0.10330000000
+0,CO2f,R1,2024,0,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R1,2024,2,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R1,2026,1,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R1,2026,3,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R2,2024,0,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R2,2024,2,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R2,2026,1,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R2,2026,3,all-year,all-week,night,gasboiler,2024,3.13360000000
+1,heat,R1,2024,0,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R1,2024,2,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R1,2024,4,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R1,2024,5,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R1,2024,7,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R1,2024,8,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R1,2026,1,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R1,2026,3,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R1,2026,4,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R1,2026,5,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R1,2026,6,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R1,2026,7,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R1,2026,8,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R1,2026,9,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R2,2024,0,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R2,2024,2,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R2,2024,4,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R2,2024,5,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R2,2024,7,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R2,2024,8,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R2,2026,1,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R2,2026,3,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R2,2026,4,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R2,2026,5,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R2,2026,6,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R2,2026,7,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R2,2026,8,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R2,2026,9,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,CO2f,R1,2024,0,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R1,2024,2,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R1,2026,1,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R1,2026,3,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R2,2024,0,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R2,2024,2,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R2,2026,1,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R2,2026,3,all-year,all-week,morning,gasboiler,2024,4.70040000000
+2,heat,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R1,2024,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R1,2024,4,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R1,2024,5,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R1,2024,7,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R1,2024,8,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R1,2026,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R1,2026,3,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R1,2026,4,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R1,2026,5,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R1,2026,6,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R1,2026,7,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R1,2026,8,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R1,2026,9,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R2,2024,2,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R2,2024,4,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R2,2024,5,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R2,2024,7,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R2,2024,8,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R2,2026,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R2,2026,3,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R2,2026,4,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R2,2026,5,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R2,2026,6,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R2,2026,7,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R2,2026,8,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R2,2026,9,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,CO2f,R1,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R1,2024,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R1,2026,1,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R1,2026,3,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R2,2024,0,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R2,2024,2,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R2,2026,1,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R2,2026,3,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+3,heat,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R1,2024,2,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R1,2024,4,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R1,2024,5,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R1,2024,7,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R1,2024,8,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R1,2026,1,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R1,2026,3,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R1,2026,4,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R1,2026,5,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R1,2026,6,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R1,2026,7,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R1,2026,8,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R1,2026,9,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R2,2024,2,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R2,2024,4,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R2,2024,5,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R2,2024,7,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R2,2024,8,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R2,2026,1,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R2,2026,3,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R2,2026,4,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R2,2026,5,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R2,2026,6,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R2,2026,7,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R2,2026,8,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R2,2026,9,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,CO2f,R1,2024,0,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R1,2024,2,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R1,2026,1,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R1,2026,3,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R2,2024,0,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R2,2024,2,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R2,2026,1,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R2,2026,3,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+4,heat,R1,2024,0,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R1,2024,2,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R1,2024,4,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R1,2024,5,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R1,2024,7,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R1,2024,8,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R1,2026,1,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R1,2026,3,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R1,2026,4,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R1,2026,5,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R1,2026,6,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R1,2026,7,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R1,2026,8,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R1,2026,9,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R2,2024,0,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R2,2024,2,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R2,2024,4,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R2,2024,5,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R2,2024,7,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R2,2024,8,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R2,2026,1,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R2,2026,3,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R2,2026,4,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R2,2026,5,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R2,2026,6,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R2,2026,7,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R2,2026,8,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R2,2026,9,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,CO2f,R1,2024,0,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R1,2024,2,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R1,2026,1,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R1,2026,3,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R2,2024,0,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R2,2024,2,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R2,2026,1,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R2,2026,3,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+5,heat,R1,2024,0,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R1,2024,2,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R1,2024,4,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R1,2024,5,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R1,2024,7,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R1,2024,8,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R1,2026,1,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R1,2026,3,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R1,2026,4,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R1,2026,5,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R1,2026,6,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R1,2026,7,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R1,2026,8,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R1,2026,9,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R2,2024,0,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R2,2024,2,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R2,2024,4,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R2,2024,5,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R2,2024,7,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R2,2024,8,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R2,2026,1,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R2,2026,3,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R2,2026,4,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R2,2026,5,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R2,2026,6,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R2,2026,7,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R2,2026,8,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R2,2026,9,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,CO2f,R1,2024,0,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R1,2024,2,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R1,2026,1,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R1,2026,3,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R2,2024,0,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R2,2024,2,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R2,2026,1,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R2,2026,3,all-year,all-week,evening,gasboiler,2024,6.27150000000
+6,heat,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R1,2024,2,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R1,2024,4,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R1,2024,5,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R1,2024,7,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R1,2024,8,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R1,2026,1,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R1,2026,3,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R1,2026,4,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R1,2026,5,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R1,2026,6,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R1,2026,7,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R1,2026,8,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R1,2026,9,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R2,2024,2,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R2,2024,4,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R2,2024,5,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R2,2024,7,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R2,2024,8,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R2,2026,1,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R2,2026,3,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R2,2026,4,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R2,2026,5,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R2,2026,6,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R2,2026,7,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R2,2026,8,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R2,2026,9,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,CO2f,R1,2024,0,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R1,2024,2,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R1,2026,1,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R1,2026,3,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R2,2024,0,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R2,2024,2,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R2,2026,1,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R2,2026,3,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+7,heat,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R1,2024,2,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R1,2024,4,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R1,2024,5,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R1,2024,7,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R1,2024,8,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R1,2026,1,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R1,2026,3,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R1,2026,4,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R1,2026,5,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R1,2026,6,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R1,2026,7,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R1,2026,8,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R1,2026,9,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R2,2024,2,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R2,2024,4,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R2,2024,5,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R2,2024,7,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R2,2024,8,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R2,2026,1,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R2,2026,3,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R2,2026,4,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R2,2026,5,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R2,2026,6,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R2,2026,7,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R2,2026,8,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R2,2026,9,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,CO2f,R1,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R1,2024,2,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R1,2026,1,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R1,2026,3,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R2,2024,0,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R2,2024,2,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R2,2026,1,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R2,2026,3,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2026.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2026.csv
index ee0bdf3d1..970f2b581 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2026.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2026.csv
@@ -1,353 +1,353 @@
-timeslice,commodity,region,year,asset,installed,technology,month,day,hour,supply
-0,heat,R1,2026,1,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R1,2026,2,2022,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R1,2026,3,2024,gasboiler,all-year,all-week,night,0.04840000000
-0,heat,R1,2026,4,2024,heatpump,all-year,all-week,night,0.10330000000
-0,heat,R1,2026,7,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R1,2026,8,2022,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R1,2026,9,2024,gasboiler,all-year,all-week,night,0.04840000000
-0,heat,R1,2026,10,2024,heatpump,all-year,all-week,night,0.10330000000
-0,heat,R1,2028,1,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R1,2028,2,2022,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R1,2028,3,2024,gasboiler,all-year,all-week,night,0.04840000000
-0,heat,R1,2028,4,2024,heatpump,all-year,all-week,night,0.10330000000
-0,heat,R1,2028,5,2026,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R1,2028,7,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R1,2028,8,2022,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R1,2028,9,2024,gasboiler,all-year,all-week,night,0.04840000000
-0,heat,R1,2028,10,2024,heatpump,all-year,all-week,night,0.10330000000
-0,heat,R1,2028,11,2026,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R2,2026,1,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R2,2026,2,2022,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R2,2026,3,2024,gasboiler,all-year,all-week,night,0.04840000000
-0,heat,R2,2026,4,2024,heatpump,all-year,all-week,night,0.10330000000
-0,heat,R2,2026,7,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R2,2026,8,2022,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R2,2026,9,2024,gasboiler,all-year,all-week,night,0.04840000000
-0,heat,R2,2026,10,2024,heatpump,all-year,all-week,night,0.10330000000
-0,heat,R2,2028,1,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R2,2028,2,2022,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R2,2028,3,2024,gasboiler,all-year,all-week,night,0.04840000000
-0,heat,R2,2028,4,2024,heatpump,all-year,all-week,night,0.10330000000
-0,heat,R2,2028,5,2026,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R2,2028,7,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R2,2028,8,2022,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R2,2028,9,2024,gasboiler,all-year,all-week,night,0.04840000000
-0,heat,R2,2028,10,2024,heatpump,all-year,all-week,night,0.10330000000
-0,heat,R2,2028,11,2026,heatpump,all-year,all-week,night,0.04760000000
-0,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,night,3.13360000000
-0,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,night,3.13360000000
-0,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,night,3.13360000000
-0,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,night,3.13360000000
-0,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,night,3.13360000000
-0,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,night,3.13360000000
-0,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,night,3.13360000000
-0,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,night,3.13360000000
-1,heat,R1,2026,1,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R1,2026,2,2022,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R1,2026,3,2024,gasboiler,all-year,all-week,morning,0.07260000000
-1,heat,R1,2026,4,2024,heatpump,all-year,all-week,morning,0.15490000000
-1,heat,R1,2026,7,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R1,2026,8,2022,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R1,2026,9,2024,gasboiler,all-year,all-week,morning,0.07260000000
-1,heat,R1,2026,10,2024,heatpump,all-year,all-week,morning,0.15490000000
-1,heat,R1,2028,1,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R1,2028,2,2022,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R1,2028,3,2024,gasboiler,all-year,all-week,morning,0.07260000000
-1,heat,R1,2028,4,2024,heatpump,all-year,all-week,morning,0.15490000000
-1,heat,R1,2028,5,2026,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R1,2028,7,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R1,2028,8,2022,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R1,2028,9,2024,gasboiler,all-year,all-week,morning,0.07260000000
-1,heat,R1,2028,10,2024,heatpump,all-year,all-week,morning,0.15490000000
-1,heat,R1,2028,11,2026,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R2,2026,1,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R2,2026,2,2022,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R2,2026,3,2024,gasboiler,all-year,all-week,morning,0.07260000000
-1,heat,R2,2026,4,2024,heatpump,all-year,all-week,morning,0.15490000000
-1,heat,R2,2026,7,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R2,2026,8,2022,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R2,2026,9,2024,gasboiler,all-year,all-week,morning,0.07260000000
-1,heat,R2,2026,10,2024,heatpump,all-year,all-week,morning,0.15490000000
-1,heat,R2,2028,1,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R2,2028,2,2022,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R2,2028,3,2024,gasboiler,all-year,all-week,morning,0.07260000000
-1,heat,R2,2028,4,2024,heatpump,all-year,all-week,morning,0.15490000000
-1,heat,R2,2028,5,2026,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R2,2028,7,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R2,2028,8,2022,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R2,2028,9,2024,gasboiler,all-year,all-week,morning,0.07260000000
-1,heat,R2,2028,10,2024,heatpump,all-year,all-week,morning,0.15490000000
-1,heat,R2,2028,11,2026,heatpump,all-year,all-week,morning,0.07140000000
-1,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,morning,4.70040000000
-1,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,morning,4.70040000000
-1,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,morning,4.70040000000
-1,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,morning,4.70040000000
-1,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,morning,4.70040000000
-1,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,morning,4.70040000000
-1,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,morning,4.70040000000
-1,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,morning,4.70040000000
-2,heat,R1,2026,1,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R1,2026,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2026,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R1,2026,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R1,2026,7,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R1,2026,8,2022,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2026,9,2024,gasboiler,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R1,2026,10,2024,heatpump,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R1,2028,1,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R1,2028,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R1,2028,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R1,2028,5,2026,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2028,7,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R1,2028,8,2022,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2028,9,2024,gasboiler,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R1,2028,10,2024,heatpump,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R1,2028,11,2026,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2026,1,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R2,2026,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2026,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R2,2026,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R2,2026,7,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R2,2026,8,2022,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2026,9,2024,gasboiler,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R2,2026,10,2024,heatpump,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R2,2028,1,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R2,2028,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R2,2028,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R2,2028,5,2026,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2028,7,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R2,2028,8,2022,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2028,9,2024,gasboiler,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R2,2028,10,2024,heatpump,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R2,2028,11,2026,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,mid-afternoon,3.13360000000
-3,heat,R1,2026,1,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R1,2026,2,2022,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2026,3,2024,gasboiler,all-year,all-week,early-peak,0.07260000000
-3,heat,R1,2026,4,2024,heatpump,all-year,all-week,early-peak,0.15490000000
-3,heat,R1,2026,7,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R1,2026,8,2022,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2026,9,2024,gasboiler,all-year,all-week,early-peak,0.07260000000
-3,heat,R1,2026,10,2024,heatpump,all-year,all-week,early-peak,0.15490000000
-3,heat,R1,2028,1,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R1,2028,2,2022,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2028,3,2024,gasboiler,all-year,all-week,early-peak,0.07260000000
-3,heat,R1,2028,4,2024,heatpump,all-year,all-week,early-peak,0.15490000000
-3,heat,R1,2028,5,2026,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2028,7,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R1,2028,8,2022,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2028,9,2024,gasboiler,all-year,all-week,early-peak,0.07260000000
-3,heat,R1,2028,10,2024,heatpump,all-year,all-week,early-peak,0.15490000000
-3,heat,R1,2028,11,2026,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2026,1,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R2,2026,2,2022,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2026,3,2024,gasboiler,all-year,all-week,early-peak,0.07260000000
-3,heat,R2,2026,4,2024,heatpump,all-year,all-week,early-peak,0.15490000000
-3,heat,R2,2026,7,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R2,2026,8,2022,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2026,9,2024,gasboiler,all-year,all-week,early-peak,0.07260000000
-3,heat,R2,2026,10,2024,heatpump,all-year,all-week,early-peak,0.15490000000
-3,heat,R2,2028,1,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R2,2028,2,2022,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2028,3,2024,gasboiler,all-year,all-week,early-peak,0.07260000000
-3,heat,R2,2028,4,2024,heatpump,all-year,all-week,early-peak,0.15490000000
-3,heat,R2,2028,5,2026,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2028,7,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R2,2028,8,2022,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2028,9,2024,gasboiler,all-year,all-week,early-peak,0.07260000000
-3,heat,R2,2028,10,2024,heatpump,all-year,all-week,early-peak,0.15490000000
-3,heat,R2,2028,11,2026,heatpump,all-year,all-week,early-peak,0.07140000000
-3,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,early-peak,4.70040000000
-4,heat,R1,2026,1,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R1,2026,2,2022,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2026,3,2024,gasboiler,all-year,all-week,late-peak,0.14530000000
-4,heat,R1,2026,4,2024,heatpump,all-year,all-week,late-peak,0.31000000000
-4,heat,R1,2026,7,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R1,2026,8,2022,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2026,9,2024,gasboiler,all-year,all-week,late-peak,0.14530000000
-4,heat,R1,2026,10,2024,heatpump,all-year,all-week,late-peak,0.31000000000
-4,heat,R1,2028,1,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R1,2028,2,2022,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2028,3,2024,gasboiler,all-year,all-week,late-peak,0.14530000000
-4,heat,R1,2028,4,2024,heatpump,all-year,all-week,late-peak,0.31000000000
-4,heat,R1,2028,5,2026,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2028,7,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R1,2028,8,2022,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2028,9,2024,gasboiler,all-year,all-week,late-peak,0.14530000000
-4,heat,R1,2028,10,2024,heatpump,all-year,all-week,late-peak,0.31000000000
-4,heat,R1,2028,11,2026,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2026,1,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R2,2026,2,2022,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2026,3,2024,gasboiler,all-year,all-week,late-peak,0.14530000000
-4,heat,R2,2026,4,2024,heatpump,all-year,all-week,late-peak,0.31000000000
-4,heat,R2,2026,7,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R2,2026,8,2022,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2026,9,2024,gasboiler,all-year,all-week,late-peak,0.14530000000
-4,heat,R2,2026,10,2024,heatpump,all-year,all-week,late-peak,0.31000000000
-4,heat,R2,2028,1,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R2,2028,2,2022,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2028,3,2024,gasboiler,all-year,all-week,late-peak,0.14530000000
-4,heat,R2,2028,4,2024,heatpump,all-year,all-week,late-peak,0.31000000000
-4,heat,R2,2028,5,2026,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2028,7,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R2,2028,8,2022,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2028,9,2024,gasboiler,all-year,all-week,late-peak,0.14530000000
-4,heat,R2,2028,10,2024,heatpump,all-year,all-week,late-peak,0.31000000000
-4,heat,R2,2028,11,2026,heatpump,all-year,all-week,late-peak,0.14290000000
-4,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,late-peak,9.40510000000
-5,heat,R1,2026,1,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R1,2026,2,2022,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R1,2026,3,2024,gasboiler,all-year,all-week,evening,0.09690000000
-5,heat,R1,2026,4,2024,heatpump,all-year,all-week,evening,0.20670000000
-5,heat,R1,2026,7,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R1,2026,8,2022,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R1,2026,9,2024,gasboiler,all-year,all-week,evening,0.09690000000
-5,heat,R1,2026,10,2024,heatpump,all-year,all-week,evening,0.20670000000
-5,heat,R1,2028,1,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R1,2028,2,2022,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R1,2028,3,2024,gasboiler,all-year,all-week,evening,0.09690000000
-5,heat,R1,2028,4,2024,heatpump,all-year,all-week,evening,0.20670000000
-5,heat,R1,2028,5,2026,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R1,2028,7,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R1,2028,8,2022,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R1,2028,9,2024,gasboiler,all-year,all-week,evening,0.09690000000
-5,heat,R1,2028,10,2024,heatpump,all-year,all-week,evening,0.20670000000
-5,heat,R1,2028,11,2026,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R2,2026,1,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R2,2026,2,2022,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R2,2026,3,2024,gasboiler,all-year,all-week,evening,0.09690000000
-5,heat,R2,2026,4,2024,heatpump,all-year,all-week,evening,0.20670000000
-5,heat,R2,2026,7,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R2,2026,8,2022,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R2,2026,9,2024,gasboiler,all-year,all-week,evening,0.09690000000
-5,heat,R2,2026,10,2024,heatpump,all-year,all-week,evening,0.20670000000
-5,heat,R2,2028,1,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R2,2028,2,2022,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R2,2028,3,2024,gasboiler,all-year,all-week,evening,0.09690000000
-5,heat,R2,2028,4,2024,heatpump,all-year,all-week,evening,0.20670000000
-5,heat,R2,2028,5,2026,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R2,2028,7,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R2,2028,8,2022,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R2,2028,9,2024,gasboiler,all-year,all-week,evening,0.09690000000
-5,heat,R2,2028,10,2024,heatpump,all-year,all-week,evening,0.20670000000
-5,heat,R2,2028,11,2026,heatpump,all-year,all-week,evening,0.09530000000
-5,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,evening,6.27150000000
-5,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,evening,6.27150000000
-5,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,evening,6.27150000000
-5,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,evening,6.27150000000
-5,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,evening,6.27150000000
-5,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,evening,6.27150000000
-5,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,evening,6.27150000000
-5,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,evening,6.27150000000
-6,heat,R1,2026,1,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R1,2026,2,2022,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2026,3,2024,gasboiler,all-year,all-week,early-morning,0.09690000000
-6,heat,R1,2026,4,2024,heatpump,all-year,all-week,early-morning,0.20670000000
-6,heat,R1,2026,7,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R1,2026,8,2022,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2026,9,2024,gasboiler,all-year,all-week,early-morning,0.09690000000
-6,heat,R1,2026,10,2024,heatpump,all-year,all-week,early-morning,0.20670000000
-6,heat,R1,2028,1,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R1,2028,2,2022,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2028,3,2024,gasboiler,all-year,all-week,early-morning,0.09690000000
-6,heat,R1,2028,4,2024,heatpump,all-year,all-week,early-morning,0.20670000000
-6,heat,R1,2028,5,2026,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2028,7,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R1,2028,8,2022,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2028,9,2024,gasboiler,all-year,all-week,early-morning,0.09690000000
-6,heat,R1,2028,10,2024,heatpump,all-year,all-week,early-morning,0.20670000000
-6,heat,R1,2028,11,2026,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2026,1,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R2,2026,2,2022,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2026,3,2024,gasboiler,all-year,all-week,early-morning,0.09690000000
-6,heat,R2,2026,4,2024,heatpump,all-year,all-week,early-morning,0.20670000000
-6,heat,R2,2026,7,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R2,2026,8,2022,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2026,9,2024,gasboiler,all-year,all-week,early-morning,0.09690000000
-6,heat,R2,2026,10,2024,heatpump,all-year,all-week,early-morning,0.20670000000
-6,heat,R2,2028,1,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R2,2028,2,2022,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2028,3,2024,gasboiler,all-year,all-week,early-morning,0.09690000000
-6,heat,R2,2028,4,2024,heatpump,all-year,all-week,early-morning,0.20670000000
-6,heat,R2,2028,5,2026,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2028,7,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R2,2028,8,2022,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2028,9,2024,gasboiler,all-year,all-week,early-morning,0.09690000000
-6,heat,R2,2028,10,2024,heatpump,all-year,all-week,early-morning,0.20670000000
-6,heat,R2,2028,11,2026,heatpump,all-year,all-week,early-morning,0.09530000000
-6,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,early-morning,6.27150000000
-7,heat,R1,2026,1,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R1,2026,2,2022,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2026,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R1,2026,4,2024,heatpump,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R1,2026,7,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R1,2026,8,2022,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2026,9,2024,gasboiler,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R1,2026,10,2024,heatpump,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R1,2028,1,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R1,2028,2,2022,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R1,2028,4,2024,heatpump,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R1,2028,5,2026,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2028,7,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R1,2028,8,2022,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2028,9,2024,gasboiler,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R1,2028,10,2024,heatpump,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R1,2028,11,2026,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2026,1,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R2,2026,2,2022,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2026,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R2,2026,4,2024,heatpump,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R2,2026,7,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R2,2026,8,2022,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2026,9,2024,gasboiler,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R2,2026,10,2024,heatpump,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R2,2028,1,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R2,2028,2,2022,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R2,2028,4,2024,heatpump,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R2,2028,5,2026,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2028,7,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R2,2028,8,2022,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2028,9,2024,gasboiler,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R2,2028,10,2024,heatpump,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R2,2028,11,2026,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,CO2f,R1,2026,3,2024,gasboiler,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R1,2026,9,2024,gasboiler,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R1,2028,9,2024,gasboiler,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R2,2026,3,2024,gasboiler,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R2,2026,9,2024,gasboiler,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R2,2028,9,2024,gasboiler,all-year,all-week,late-afternoon,6.27150000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2026,1,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R1,2026,2,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R1,2026,3,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R1,2026,4,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R1,2026,7,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R1,2026,8,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R1,2026,9,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R1,2026,10,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R1,2028,1,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R1,2028,2,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R1,2028,3,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R1,2028,4,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R1,2028,5,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R1,2028,7,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R1,2028,8,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R1,2028,9,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R1,2028,10,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R1,2028,11,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R2,2026,1,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R2,2026,2,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R2,2026,3,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R2,2026,4,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R2,2026,7,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R2,2026,8,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R2,2026,9,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R2,2026,10,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R2,2028,1,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R2,2028,2,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R2,2028,3,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R2,2028,4,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R2,2028,5,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R2,2028,7,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R2,2028,8,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R2,2028,9,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R2,2028,10,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R2,2028,11,all-year,all-week,night,heatpump,2026,0.04760000000
+0,CO2f,R1,2026,1,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R1,2026,7,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R1,2028,1,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R1,2028,7,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R2,2026,1,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R2,2026,7,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R2,2028,1,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R2,2028,7,all-year,all-week,night,gasboiler,2024,3.13360000000
+1,heat,R1,2026,1,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R1,2026,2,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R1,2026,3,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R1,2026,4,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R1,2026,7,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R1,2026,8,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R1,2026,9,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R1,2026,10,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R1,2028,1,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R1,2028,2,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R1,2028,3,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R1,2028,4,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R1,2028,5,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R1,2028,7,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R1,2028,8,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R1,2028,9,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R1,2028,10,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R1,2028,11,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R2,2026,1,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R2,2026,2,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R2,2026,3,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R2,2026,4,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R2,2026,7,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R2,2026,8,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R2,2026,9,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R2,2026,10,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R2,2028,1,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R2,2028,2,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R2,2028,3,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R2,2028,4,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R2,2028,5,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R2,2028,7,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R2,2028,8,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R2,2028,9,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R2,2028,10,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R2,2028,11,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,CO2f,R1,2026,1,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R1,2026,7,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R1,2028,1,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R1,2028,7,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R2,2026,1,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R2,2026,7,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R2,2028,1,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R2,2028,7,all-year,all-week,morning,gasboiler,2024,4.70040000000
+2,heat,R1,2026,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R1,2026,2,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R1,2026,3,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R1,2026,4,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R1,2026,7,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R1,2026,8,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R1,2026,9,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R1,2026,10,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R1,2028,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R1,2028,2,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R1,2028,3,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R1,2028,4,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R1,2028,5,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R1,2028,7,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R1,2028,8,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R1,2028,9,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R1,2028,10,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R1,2028,11,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R2,2026,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R2,2026,2,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R2,2026,3,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R2,2026,4,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R2,2026,7,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R2,2026,8,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R2,2026,9,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R2,2026,10,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R2,2028,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R2,2028,2,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R2,2028,3,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R2,2028,4,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R2,2028,5,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R2,2028,7,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R2,2028,8,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R2,2028,9,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R2,2028,10,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R2,2028,11,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,CO2f,R1,2026,1,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R1,2026,7,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R1,2028,1,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R1,2028,7,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R2,2026,1,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R2,2026,7,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R2,2028,1,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R2,2028,7,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+3,heat,R1,2026,1,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R1,2026,2,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R1,2026,3,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R1,2026,4,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R1,2026,7,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R1,2026,8,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R1,2026,9,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R1,2026,10,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R1,2028,1,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R1,2028,2,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R1,2028,3,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R1,2028,4,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R1,2028,5,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R1,2028,7,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R1,2028,8,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R1,2028,9,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R1,2028,10,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R1,2028,11,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R2,2026,1,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R2,2026,2,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R2,2026,3,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R2,2026,4,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R2,2026,7,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R2,2026,8,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R2,2026,9,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R2,2026,10,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R2,2028,1,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R2,2028,2,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R2,2028,3,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R2,2028,4,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R2,2028,5,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R2,2028,7,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R2,2028,8,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R2,2028,9,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R2,2028,10,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R2,2028,11,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,CO2f,R1,2026,1,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R1,2026,7,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R1,2028,1,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R1,2028,7,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R2,2026,1,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R2,2026,7,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R2,2028,1,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R2,2028,7,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+4,heat,R1,2026,1,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R1,2026,2,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R1,2026,3,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R1,2026,4,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R1,2026,7,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R1,2026,8,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R1,2026,9,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R1,2026,10,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R1,2028,1,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R1,2028,2,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R1,2028,3,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R1,2028,4,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R1,2028,5,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R1,2028,7,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R1,2028,8,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R1,2028,9,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R1,2028,10,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R1,2028,11,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R2,2026,1,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R2,2026,2,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R2,2026,3,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R2,2026,4,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R2,2026,7,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R2,2026,8,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R2,2026,9,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R2,2026,10,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R2,2028,1,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R2,2028,2,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R2,2028,3,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R2,2028,4,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R2,2028,5,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R2,2028,7,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R2,2028,8,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R2,2028,9,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R2,2028,10,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R2,2028,11,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,CO2f,R1,2026,1,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R1,2026,7,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R1,2028,1,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R1,2028,7,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R2,2026,1,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R2,2026,7,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R2,2028,1,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R2,2028,7,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+5,heat,R1,2026,1,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R1,2026,2,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R1,2026,3,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R1,2026,4,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R1,2026,7,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R1,2026,8,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R1,2026,9,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R1,2026,10,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R1,2028,1,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R1,2028,2,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R1,2028,3,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R1,2028,4,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R1,2028,5,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R1,2028,7,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R1,2028,8,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R1,2028,9,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R1,2028,10,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R1,2028,11,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R2,2026,1,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R2,2026,2,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R2,2026,3,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R2,2026,4,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R2,2026,7,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R2,2026,8,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R2,2026,9,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R2,2026,10,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R2,2028,1,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R2,2028,2,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R2,2028,3,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R2,2028,4,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R2,2028,5,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R2,2028,7,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R2,2028,8,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R2,2028,9,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R2,2028,10,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R2,2028,11,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,CO2f,R1,2026,1,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R1,2026,7,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R1,2028,1,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R1,2028,7,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R2,2026,1,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R2,2026,7,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R2,2028,1,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R2,2028,7,all-year,all-week,evening,gasboiler,2024,6.27150000000
+6,heat,R1,2026,1,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R1,2026,2,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R1,2026,3,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R1,2026,4,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R1,2026,7,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R1,2026,8,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R1,2026,9,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R1,2026,10,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R1,2028,1,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R1,2028,2,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R1,2028,3,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R1,2028,4,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R1,2028,5,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R1,2028,7,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R1,2028,8,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R1,2028,9,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R1,2028,10,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R1,2028,11,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R2,2026,1,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R2,2026,2,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R2,2026,3,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R2,2026,4,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R2,2026,7,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R2,2026,8,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R2,2026,9,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R2,2026,10,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R2,2028,1,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R2,2028,2,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R2,2028,3,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R2,2028,4,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R2,2028,5,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R2,2028,7,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R2,2028,8,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R2,2028,9,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R2,2028,10,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R2,2028,11,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,CO2f,R1,2026,1,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R1,2026,7,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R1,2028,1,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R1,2028,7,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R2,2026,1,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R2,2026,7,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R2,2028,1,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R2,2028,7,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+7,heat,R1,2026,1,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R1,2026,2,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R1,2026,3,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R1,2026,4,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R1,2026,7,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R1,2026,8,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R1,2026,9,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R1,2026,10,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R1,2028,1,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R1,2028,2,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R1,2028,3,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R1,2028,4,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R1,2028,5,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R1,2028,7,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R1,2028,8,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R1,2028,9,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R1,2028,10,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R1,2028,11,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R2,2026,1,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R2,2026,2,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R2,2026,3,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R2,2026,4,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R2,2026,7,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R2,2026,8,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R2,2026,9,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R2,2026,10,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R2,2028,1,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R2,2028,2,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R2,2028,3,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R2,2028,4,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R2,2028,5,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R2,2028,7,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R2,2028,8,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R2,2028,9,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R2,2028,10,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R2,2028,11,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,CO2f,R1,2026,1,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R1,2026,7,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R1,2028,1,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R1,2028,7,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R2,2026,1,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R2,2026,7,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R2,2028,1,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R2,2028,7,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2028.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2028.csv
index 5e12685c3..925b57fdc 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2028.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2028.csv
@@ -1,417 +1,417 @@
-timeslice,commodity,region,year,asset,installed,technology,month,day,hour,supply
-0,heat,R1,2028,1,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R1,2028,2,2022,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R1,2028,3,2024,gasboiler,all-year,all-week,night,0.04840000000
-0,heat,R1,2028,4,2024,heatpump,all-year,all-week,night,0.10330000000
-0,heat,R1,2028,5,2026,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R1,2028,8,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R1,2028,9,2022,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R1,2028,10,2024,gasboiler,all-year,all-week,night,0.04840000000
-0,heat,R1,2028,11,2024,heatpump,all-year,all-week,night,0.10330000000
-0,heat,R1,2028,12,2026,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R1,2030,1,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R1,2030,2,2022,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R1,2030,3,2024,gasboiler,all-year,all-week,night,0.04840000000
-0,heat,R1,2030,4,2024,heatpump,all-year,all-week,night,0.10330000000
-0,heat,R1,2030,5,2026,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R1,2030,6,2028,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R1,2030,8,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R1,2030,9,2022,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R1,2030,10,2024,gasboiler,all-year,all-week,night,0.04840000000
-0,heat,R1,2030,11,2024,heatpump,all-year,all-week,night,0.10330000000
-0,heat,R1,2030,12,2026,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R1,2030,13,2028,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R2,2028,1,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R2,2028,2,2022,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R2,2028,3,2024,gasboiler,all-year,all-week,night,0.04840000000
-0,heat,R2,2028,4,2024,heatpump,all-year,all-week,night,0.10330000000
-0,heat,R2,2028,5,2026,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R2,2028,8,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R2,2028,9,2022,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R2,2028,10,2024,gasboiler,all-year,all-week,night,0.04840000000
-0,heat,R2,2028,11,2024,heatpump,all-year,all-week,night,0.10330000000
-0,heat,R2,2028,12,2026,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R2,2030,1,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R2,2030,2,2022,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R2,2030,3,2024,gasboiler,all-year,all-week,night,0.04840000000
-0,heat,R2,2030,4,2024,heatpump,all-year,all-week,night,0.10330000000
-0,heat,R2,2030,5,2026,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R2,2030,6,2028,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R2,2030,8,2020,heatpump,all-year,all-week,night,0.30050000000
-0,heat,R2,2030,9,2022,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R2,2030,10,2024,gasboiler,all-year,all-week,night,0.04840000000
-0,heat,R2,2030,11,2024,heatpump,all-year,all-week,night,0.10330000000
-0,heat,R2,2030,12,2026,heatpump,all-year,all-week,night,0.04760000000
-0,heat,R2,2030,13,2028,heatpump,all-year,all-week,night,0.04760000000
-0,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,night,3.13360000000
-0,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,night,3.13360000000
-0,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,night,3.13360000000
-0,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,night,3.13360000000
-0,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,night,3.13360000000
-0,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,night,3.13360000000
-0,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,night,3.13360000000
-0,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,night,3.13360000000
-1,heat,R1,2028,1,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R1,2028,2,2022,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R1,2028,3,2024,gasboiler,all-year,all-week,morning,0.07260000000
-1,heat,R1,2028,4,2024,heatpump,all-year,all-week,morning,0.15490000000
-1,heat,R1,2028,5,2026,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R1,2028,8,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R1,2028,9,2022,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R1,2028,10,2024,gasboiler,all-year,all-week,morning,0.07260000000
-1,heat,R1,2028,11,2024,heatpump,all-year,all-week,morning,0.15490000000
-1,heat,R1,2028,12,2026,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R1,2030,1,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R1,2030,2,2022,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R1,2030,3,2024,gasboiler,all-year,all-week,morning,0.07260000000
-1,heat,R1,2030,4,2024,heatpump,all-year,all-week,morning,0.15490000000
-1,heat,R1,2030,5,2026,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R1,2030,6,2028,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R1,2030,8,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R1,2030,9,2022,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R1,2030,10,2024,gasboiler,all-year,all-week,morning,0.07260000000
-1,heat,R1,2030,11,2024,heatpump,all-year,all-week,morning,0.15490000000
-1,heat,R1,2030,12,2026,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R1,2030,13,2028,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R2,2028,1,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R2,2028,2,2022,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R2,2028,3,2024,gasboiler,all-year,all-week,morning,0.07260000000
-1,heat,R2,2028,4,2024,heatpump,all-year,all-week,morning,0.15490000000
-1,heat,R2,2028,5,2026,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R2,2028,8,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R2,2028,9,2022,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R2,2028,10,2024,gasboiler,all-year,all-week,morning,0.07260000000
-1,heat,R2,2028,11,2024,heatpump,all-year,all-week,morning,0.15490000000
-1,heat,R2,2028,12,2026,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R2,2030,1,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R2,2030,2,2022,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R2,2030,3,2024,gasboiler,all-year,all-week,morning,0.07260000000
-1,heat,R2,2030,4,2024,heatpump,all-year,all-week,morning,0.15490000000
-1,heat,R2,2030,5,2026,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R2,2030,6,2028,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R2,2030,8,2020,heatpump,all-year,all-week,morning,0.45070000000
-1,heat,R2,2030,9,2022,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R2,2030,10,2024,gasboiler,all-year,all-week,morning,0.07260000000
-1,heat,R2,2030,11,2024,heatpump,all-year,all-week,morning,0.15490000000
-1,heat,R2,2030,12,2026,heatpump,all-year,all-week,morning,0.07140000000
-1,heat,R2,2030,13,2028,heatpump,all-year,all-week,morning,0.07140000000
-1,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,morning,4.70040000000
-1,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,morning,4.70040000000
-1,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,morning,4.70040000000
-1,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,morning,4.70040000000
-1,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,morning,4.70040000000
-1,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,morning,4.70040000000
-1,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,morning,4.70040000000
-1,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,morning,4.70040000000
-2,heat,R1,2028,1,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R1,2028,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R1,2028,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R1,2028,5,2026,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2028,8,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R1,2028,9,2022,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2028,10,2024,gasboiler,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R1,2028,11,2024,heatpump,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R1,2028,12,2026,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2030,1,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R1,2030,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2030,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R1,2030,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R1,2030,5,2026,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2030,6,2028,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2030,8,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R1,2030,9,2022,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2030,10,2024,gasboiler,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R1,2030,11,2024,heatpump,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R1,2030,12,2026,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2030,13,2028,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2028,1,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R2,2028,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R2,2028,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R2,2028,5,2026,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2028,8,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R2,2028,9,2022,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2028,10,2024,gasboiler,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R2,2028,11,2024,heatpump,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R2,2028,12,2026,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2030,1,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R2,2030,2,2022,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2030,3,2024,gasboiler,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R2,2030,4,2024,heatpump,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R2,2030,5,2026,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2030,6,2028,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2030,8,2020,heatpump,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R2,2030,9,2022,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2030,10,2024,gasboiler,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R2,2030,11,2024,heatpump,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R2,2030,12,2026,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2030,13,2028,heatpump,all-year,all-week,mid-afternoon,0.04760000000
-2,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,mid-afternoon,3.13360000000
-3,heat,R1,2028,1,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R1,2028,2,2022,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2028,3,2024,gasboiler,all-year,all-week,early-peak,0.07260000000
-3,heat,R1,2028,4,2024,heatpump,all-year,all-week,early-peak,0.15490000000
-3,heat,R1,2028,5,2026,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2028,8,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R1,2028,9,2022,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2028,10,2024,gasboiler,all-year,all-week,early-peak,0.07260000000
-3,heat,R1,2028,11,2024,heatpump,all-year,all-week,early-peak,0.15490000000
-3,heat,R1,2028,12,2026,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2030,1,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R1,2030,2,2022,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2030,3,2024,gasboiler,all-year,all-week,early-peak,0.07260000000
-3,heat,R1,2030,4,2024,heatpump,all-year,all-week,early-peak,0.15490000000
-3,heat,R1,2030,5,2026,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2030,6,2028,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2030,8,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R1,2030,9,2022,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2030,10,2024,gasboiler,all-year,all-week,early-peak,0.07260000000
-3,heat,R1,2030,11,2024,heatpump,all-year,all-week,early-peak,0.15490000000
-3,heat,R1,2030,12,2026,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2030,13,2028,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2028,1,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R2,2028,2,2022,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2028,3,2024,gasboiler,all-year,all-week,early-peak,0.07260000000
-3,heat,R2,2028,4,2024,heatpump,all-year,all-week,early-peak,0.15490000000
-3,heat,R2,2028,5,2026,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2028,8,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R2,2028,9,2022,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2028,10,2024,gasboiler,all-year,all-week,early-peak,0.07260000000
-3,heat,R2,2028,11,2024,heatpump,all-year,all-week,early-peak,0.15490000000
-3,heat,R2,2028,12,2026,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2030,1,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R2,2030,2,2022,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2030,3,2024,gasboiler,all-year,all-week,early-peak,0.07260000000
-3,heat,R2,2030,4,2024,heatpump,all-year,all-week,early-peak,0.15490000000
-3,heat,R2,2030,5,2026,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2030,6,2028,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2030,8,2020,heatpump,all-year,all-week,early-peak,0.45070000000
-3,heat,R2,2030,9,2022,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2030,10,2024,gasboiler,all-year,all-week,early-peak,0.07260000000
-3,heat,R2,2030,11,2024,heatpump,all-year,all-week,early-peak,0.15490000000
-3,heat,R2,2030,12,2026,heatpump,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2030,13,2028,heatpump,all-year,all-week,early-peak,0.07140000000
-3,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,early-peak,4.70040000000
-4,heat,R1,2028,1,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R1,2028,2,2022,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2028,3,2024,gasboiler,all-year,all-week,late-peak,0.14530000000
-4,heat,R1,2028,4,2024,heatpump,all-year,all-week,late-peak,0.31000000000
-4,heat,R1,2028,5,2026,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2028,8,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R1,2028,9,2022,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2028,10,2024,gasboiler,all-year,all-week,late-peak,0.14530000000
-4,heat,R1,2028,11,2024,heatpump,all-year,all-week,late-peak,0.31000000000
-4,heat,R1,2028,12,2026,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2030,1,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R1,2030,2,2022,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2030,3,2024,gasboiler,all-year,all-week,late-peak,0.14530000000
-4,heat,R1,2030,4,2024,heatpump,all-year,all-week,late-peak,0.31000000000
-4,heat,R1,2030,5,2026,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2030,6,2028,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2030,8,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R1,2030,9,2022,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2030,10,2024,gasboiler,all-year,all-week,late-peak,0.14530000000
-4,heat,R1,2030,11,2024,heatpump,all-year,all-week,late-peak,0.31000000000
-4,heat,R1,2030,12,2026,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2030,13,2028,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2028,1,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R2,2028,2,2022,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2028,3,2024,gasboiler,all-year,all-week,late-peak,0.14530000000
-4,heat,R2,2028,4,2024,heatpump,all-year,all-week,late-peak,0.31000000000
-4,heat,R2,2028,5,2026,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2028,8,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R2,2028,9,2022,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2028,10,2024,gasboiler,all-year,all-week,late-peak,0.14530000000
-4,heat,R2,2028,11,2024,heatpump,all-year,all-week,late-peak,0.31000000000
-4,heat,R2,2028,12,2026,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2030,1,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R2,2030,2,2022,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2030,3,2024,gasboiler,all-year,all-week,late-peak,0.14530000000
-4,heat,R2,2030,4,2024,heatpump,all-year,all-week,late-peak,0.31000000000
-4,heat,R2,2030,5,2026,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2030,6,2028,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2030,8,2020,heatpump,all-year,all-week,late-peak,0.90190000000
-4,heat,R2,2030,9,2022,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2030,10,2024,gasboiler,all-year,all-week,late-peak,0.14530000000
-4,heat,R2,2030,11,2024,heatpump,all-year,all-week,late-peak,0.31000000000
-4,heat,R2,2030,12,2026,heatpump,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2030,13,2028,heatpump,all-year,all-week,late-peak,0.14290000000
-4,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,late-peak,9.40510000000
-5,heat,R1,2028,1,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R1,2028,2,2022,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R1,2028,3,2024,gasboiler,all-year,all-week,evening,0.09690000000
-5,heat,R1,2028,4,2024,heatpump,all-year,all-week,evening,0.20670000000
-5,heat,R1,2028,5,2026,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R1,2028,8,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R1,2028,9,2022,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R1,2028,10,2024,gasboiler,all-year,all-week,evening,0.09690000000
-5,heat,R1,2028,11,2024,heatpump,all-year,all-week,evening,0.20670000000
-5,heat,R1,2028,12,2026,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R1,2030,1,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R1,2030,2,2022,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R1,2030,3,2024,gasboiler,all-year,all-week,evening,0.09690000000
-5,heat,R1,2030,4,2024,heatpump,all-year,all-week,evening,0.20670000000
-5,heat,R1,2030,5,2026,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R1,2030,6,2028,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R1,2030,8,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R1,2030,9,2022,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R1,2030,10,2024,gasboiler,all-year,all-week,evening,0.09690000000
-5,heat,R1,2030,11,2024,heatpump,all-year,all-week,evening,0.20670000000
-5,heat,R1,2030,12,2026,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R1,2030,13,2028,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R2,2028,1,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R2,2028,2,2022,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R2,2028,3,2024,gasboiler,all-year,all-week,evening,0.09690000000
-5,heat,R2,2028,4,2024,heatpump,all-year,all-week,evening,0.20670000000
-5,heat,R2,2028,5,2026,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R2,2028,8,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R2,2028,9,2022,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R2,2028,10,2024,gasboiler,all-year,all-week,evening,0.09690000000
-5,heat,R2,2028,11,2024,heatpump,all-year,all-week,evening,0.20670000000
-5,heat,R2,2028,12,2026,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R2,2030,1,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R2,2030,2,2022,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R2,2030,3,2024,gasboiler,all-year,all-week,evening,0.09690000000
-5,heat,R2,2030,4,2024,heatpump,all-year,all-week,evening,0.20670000000
-5,heat,R2,2030,5,2026,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R2,2030,6,2028,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R2,2030,8,2020,heatpump,all-year,all-week,evening,0.60140000000
-5,heat,R2,2030,9,2022,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R2,2030,10,2024,gasboiler,all-year,all-week,evening,0.09690000000
-5,heat,R2,2030,11,2024,heatpump,all-year,all-week,evening,0.20670000000
-5,heat,R2,2030,12,2026,heatpump,all-year,all-week,evening,0.09530000000
-5,heat,R2,2030,13,2028,heatpump,all-year,all-week,evening,0.09530000000
-5,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,evening,6.27150000000
-5,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,evening,6.27150000000
-5,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,evening,6.27150000000
-5,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,evening,6.27150000000
-5,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,evening,6.27150000000
-5,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,evening,6.27150000000
-5,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,evening,6.27150000000
-5,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,evening,6.27150000000
-6,heat,R1,2028,1,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R1,2028,2,2022,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2028,3,2024,gasboiler,all-year,all-week,early-morning,0.09690000000
-6,heat,R1,2028,4,2024,heatpump,all-year,all-week,early-morning,0.20670000000
-6,heat,R1,2028,5,2026,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2028,8,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R1,2028,9,2022,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2028,10,2024,gasboiler,all-year,all-week,early-morning,0.09690000000
-6,heat,R1,2028,11,2024,heatpump,all-year,all-week,early-morning,0.20670000000
-6,heat,R1,2028,12,2026,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2030,1,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R1,2030,2,2022,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2030,3,2024,gasboiler,all-year,all-week,early-morning,0.09690000000
-6,heat,R1,2030,4,2024,heatpump,all-year,all-week,early-morning,0.20670000000
-6,heat,R1,2030,5,2026,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2030,6,2028,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2030,8,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R1,2030,9,2022,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2030,10,2024,gasboiler,all-year,all-week,early-morning,0.09690000000
-6,heat,R1,2030,11,2024,heatpump,all-year,all-week,early-morning,0.20670000000
-6,heat,R1,2030,12,2026,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2030,13,2028,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2028,1,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R2,2028,2,2022,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2028,3,2024,gasboiler,all-year,all-week,early-morning,0.09690000000
-6,heat,R2,2028,4,2024,heatpump,all-year,all-week,early-morning,0.20670000000
-6,heat,R2,2028,5,2026,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2028,8,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R2,2028,9,2022,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2028,10,2024,gasboiler,all-year,all-week,early-morning,0.09690000000
-6,heat,R2,2028,11,2024,heatpump,all-year,all-week,early-morning,0.20670000000
-6,heat,R2,2028,12,2026,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2030,1,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R2,2030,2,2022,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2030,3,2024,gasboiler,all-year,all-week,early-morning,0.09690000000
-6,heat,R2,2030,4,2024,heatpump,all-year,all-week,early-morning,0.20670000000
-6,heat,R2,2030,5,2026,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2030,6,2028,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2030,8,2020,heatpump,all-year,all-week,early-morning,0.60140000000
-6,heat,R2,2030,9,2022,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2030,10,2024,gasboiler,all-year,all-week,early-morning,0.09690000000
-6,heat,R2,2030,11,2024,heatpump,all-year,all-week,early-morning,0.20670000000
-6,heat,R2,2030,12,2026,heatpump,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2030,13,2028,heatpump,all-year,all-week,early-morning,0.09530000000
-6,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,early-morning,6.27150000000
-7,heat,R1,2028,1,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R1,2028,2,2022,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R1,2028,4,2024,heatpump,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R1,2028,5,2026,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2028,8,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R1,2028,9,2022,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2028,10,2024,gasboiler,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R1,2028,11,2024,heatpump,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R1,2028,12,2026,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2030,1,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R1,2030,2,2022,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2030,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R1,2030,4,2024,heatpump,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R1,2030,5,2026,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2030,6,2028,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2030,8,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R1,2030,9,2022,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2030,10,2024,gasboiler,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R1,2030,11,2024,heatpump,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R1,2030,12,2026,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2030,13,2028,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2028,1,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R2,2028,2,2022,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R2,2028,4,2024,heatpump,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R2,2028,5,2026,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2028,8,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R2,2028,9,2022,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2028,10,2024,gasboiler,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R2,2028,11,2024,heatpump,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R2,2028,12,2026,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2030,1,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R2,2030,2,2022,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2030,3,2024,gasboiler,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R2,2030,4,2024,heatpump,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R2,2030,5,2026,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2030,6,2028,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2030,8,2020,heatpump,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R2,2030,9,2022,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2030,10,2024,gasboiler,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R2,2030,11,2024,heatpump,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R2,2030,12,2026,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2030,13,2028,heatpump,all-year,all-week,late-afternoon,0.09530000000
-7,CO2f,R1,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R1,2028,10,2024,gasboiler,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R1,2030,3,2024,gasboiler,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R1,2030,10,2024,gasboiler,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R2,2028,3,2024,gasboiler,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R2,2028,10,2024,gasboiler,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R2,2030,3,2024,gasboiler,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R2,2030,10,2024,gasboiler,all-year,all-week,late-afternoon,6.27150000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2028,1,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R1,2028,2,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R1,2028,3,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R1,2028,4,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R1,2028,5,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R1,2028,8,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R1,2028,9,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R1,2028,10,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R1,2028,11,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R1,2028,12,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R1,2030,1,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R1,2030,2,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R1,2030,3,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R1,2030,4,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R1,2030,6,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R1,2030,8,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R1,2030,9,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R1,2030,10,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R1,2030,11,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R1,2030,12,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R1,2030,13,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R2,2028,1,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R2,2028,2,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R2,2028,3,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R2,2028,4,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R2,2028,5,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R2,2028,8,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R2,2028,9,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R2,2028,10,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R2,2028,11,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R2,2028,12,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R2,2030,1,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R2,2030,2,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R2,2030,3,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R2,2030,4,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R2,2030,6,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R2,2030,8,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R2,2030,9,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R2,2030,10,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R2,2030,11,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R2,2030,12,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R2,2030,13,all-year,all-week,night,heatpump,2028,0.04760000000
+0,CO2f,R1,2028,1,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R1,2028,8,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R1,2030,1,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R1,2030,8,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R2,2028,1,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R2,2028,8,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R2,2030,1,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R2,2030,8,all-year,all-week,night,gasboiler,2024,3.13360000000
+1,heat,R1,2028,1,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R1,2028,2,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R1,2028,3,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R1,2028,4,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R1,2028,5,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R1,2028,8,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R1,2028,9,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R1,2028,10,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R1,2028,11,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R1,2028,12,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R1,2030,1,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R1,2030,3,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R1,2030,8,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R1,2030,9,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R1,2030,10,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R1,2030,11,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R1,2030,12,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R1,2030,13,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R2,2028,1,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R2,2028,2,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R2,2028,3,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R2,2028,4,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R2,2028,5,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R2,2028,8,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R2,2028,9,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R2,2028,10,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R2,2028,11,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R2,2028,12,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R2,2030,1,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R2,2030,3,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R2,2030,8,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R2,2030,9,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R2,2030,10,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R2,2030,11,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R2,2030,12,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R2,2030,13,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,CO2f,R1,2028,1,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R1,2028,8,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R1,2030,1,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R1,2030,8,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R2,2028,1,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R2,2028,8,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R2,2030,1,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R2,2030,8,all-year,all-week,morning,gasboiler,2024,4.70040000000
+2,heat,R1,2028,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R1,2028,2,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R1,2028,3,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R1,2028,4,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R1,2028,5,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R1,2028,8,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R1,2028,9,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R1,2028,10,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R1,2028,11,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R1,2028,12,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R1,2030,2,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R1,2030,3,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R1,2030,6,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R1,2030,8,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R1,2030,9,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R1,2030,10,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R1,2030,11,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R1,2030,12,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R1,2030,13,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R2,2028,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R2,2028,2,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R2,2028,3,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R2,2028,4,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R2,2028,5,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R2,2028,8,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R2,2028,9,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R2,2028,10,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R2,2028,11,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R2,2028,12,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R2,2030,2,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R2,2030,3,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R2,2030,6,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R2,2030,8,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R2,2030,9,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R2,2030,10,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R2,2030,11,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R2,2030,12,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R2,2030,13,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,CO2f,R1,2028,1,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R1,2028,8,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R1,2030,8,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R2,2028,1,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R2,2028,8,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R2,2030,8,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+3,heat,R1,2028,1,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R1,2028,2,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R1,2028,3,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R1,2028,4,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R1,2028,5,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R1,2028,8,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R1,2028,9,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R1,2028,10,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R1,2028,11,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R1,2028,12,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R1,2030,1,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R1,2030,3,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R1,2030,8,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R1,2030,9,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R1,2030,10,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R1,2030,11,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R1,2030,12,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R1,2030,13,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R2,2028,1,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R2,2028,2,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R2,2028,3,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R2,2028,4,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R2,2028,5,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R2,2028,8,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R2,2028,9,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R2,2028,10,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R2,2028,11,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R2,2028,12,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R2,2030,1,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R2,2030,3,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R2,2030,8,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R2,2030,9,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R2,2030,10,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R2,2030,11,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R2,2030,12,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R2,2030,13,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,CO2f,R1,2028,1,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R1,2028,8,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R1,2030,1,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R1,2030,8,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R2,2028,1,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R2,2028,8,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R2,2030,1,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R2,2030,8,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+4,heat,R1,2028,1,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R1,2028,2,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R1,2028,3,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R1,2028,4,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R1,2028,5,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R1,2028,8,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R1,2028,9,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R1,2028,10,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R1,2028,11,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R1,2028,12,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R1,2030,1,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R1,2030,3,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R1,2030,8,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R1,2030,9,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R1,2030,10,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R1,2030,11,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R1,2030,12,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R1,2030,13,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R2,2028,1,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R2,2028,2,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R2,2028,3,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R2,2028,4,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R2,2028,5,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R2,2028,8,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R2,2028,9,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R2,2028,10,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R2,2028,11,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R2,2028,12,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R2,2030,1,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R2,2030,3,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R2,2030,8,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R2,2030,9,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R2,2030,10,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R2,2030,11,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R2,2030,12,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R2,2030,13,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,CO2f,R1,2028,1,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R1,2028,8,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R1,2030,1,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R1,2030,8,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R2,2028,1,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R2,2028,8,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R2,2030,1,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R2,2030,8,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+5,heat,R1,2028,1,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R1,2028,2,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R1,2028,3,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R1,2028,4,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R1,2028,5,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R1,2028,8,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R1,2028,9,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R1,2028,10,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R1,2028,11,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R1,2028,12,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R1,2030,1,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R1,2030,3,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R1,2030,8,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R1,2030,9,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R1,2030,10,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R1,2030,11,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R1,2030,12,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R1,2030,13,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R2,2028,1,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R2,2028,2,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R2,2028,3,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R2,2028,4,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R2,2028,5,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R2,2028,8,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R2,2028,9,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R2,2028,10,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R2,2028,11,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R2,2028,12,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R2,2030,1,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R2,2030,3,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R2,2030,8,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R2,2030,9,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R2,2030,10,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R2,2030,11,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R2,2030,12,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R2,2030,13,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,CO2f,R1,2028,1,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R1,2028,8,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R1,2030,1,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R1,2030,8,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R2,2028,1,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R2,2028,8,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R2,2030,1,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R2,2030,8,all-year,all-week,evening,gasboiler,2024,6.27150000000
+6,heat,R1,2028,1,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R1,2028,2,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R1,2028,3,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R1,2028,4,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R1,2028,5,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R1,2028,8,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R1,2028,9,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R1,2028,10,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R1,2028,11,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R1,2028,12,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R1,2030,1,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R1,2030,2,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R1,2030,3,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R1,2030,6,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R1,2030,8,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R1,2030,9,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R1,2030,10,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R1,2030,11,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R1,2030,12,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R1,2030,13,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R2,2028,1,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R2,2028,2,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R2,2028,3,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R2,2028,4,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R2,2028,5,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R2,2028,8,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R2,2028,9,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R2,2028,10,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R2,2028,11,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R2,2028,12,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R2,2030,1,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R2,2030,2,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R2,2030,3,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R2,2030,6,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R2,2030,8,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R2,2030,9,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R2,2030,10,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R2,2030,11,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R2,2030,12,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R2,2030,13,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,CO2f,R1,2028,1,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R1,2028,8,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R1,2030,1,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R1,2030,8,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R2,2028,1,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R2,2028,8,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R2,2030,1,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R2,2030,8,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+7,heat,R1,2028,1,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R1,2028,2,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R1,2028,3,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R1,2028,4,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R1,2028,5,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R1,2028,8,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R1,2028,9,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R1,2028,10,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R1,2028,11,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R1,2028,12,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R1,2030,2,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R1,2030,3,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R1,2030,6,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R1,2030,8,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R1,2030,9,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R1,2030,10,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R1,2030,11,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R1,2030,12,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R1,2030,13,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R2,2028,1,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R2,2028,2,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R2,2028,3,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R2,2028,4,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R2,2028,5,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R2,2028,8,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R2,2028,9,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R2,2028,10,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R2,2028,11,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R2,2028,12,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R2,2030,2,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R2,2030,3,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R2,2030,6,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R2,2030,8,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R2,2030,9,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R2,2030,10,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R2,2030,11,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R2,2030,12,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R2,2030,13,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,CO2f,R1,2028,1,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R1,2028,8,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R1,2030,8,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R2,2028,1,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R2,2028,8,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R2,2030,8,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2030.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2030.csv
index eef20226b..cf3ede35b 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2030.csv
@@ -1,449 +1,449 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2030,0,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R1,2030,1,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R1,2030,2,heatpump,2020,all-year,all-week,night,0.30050000000
-0,heat,R1,2030,3,heatpump,2022,all-year,all-week,night,0.04760000000
-0,heat,R1,2030,4,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R1,2030,5,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R1,2030,6,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R1,2030,8,heatpump,2020,all-year,all-week,night,0.30050000000
-0,heat,R1,2030,9,heatpump,2022,all-year,all-week,night,0.04760000000
-0,heat,R1,2030,10,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R1,2030,11,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R1,2030,12,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R1,2032,0,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R1,2032,1,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R1,2032,3,heatpump,2022,all-year,all-week,night,0.04760000000
-0,heat,R1,2032,4,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R1,2032,5,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R1,2032,6,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R1,2032,7,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R1,2032,9,heatpump,2022,all-year,all-week,night,0.04760000000
-0,heat,R1,2032,10,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R1,2032,11,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R1,2032,12,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R1,2032,13,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R2,2030,0,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R2,2030,1,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R2,2030,2,heatpump,2020,all-year,all-week,night,0.30050000000
-0,heat,R2,2030,3,heatpump,2022,all-year,all-week,night,0.04760000000
-0,heat,R2,2030,4,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R2,2030,5,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R2,2030,6,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R2,2030,8,heatpump,2020,all-year,all-week,night,0.30050000000
-0,heat,R2,2030,9,heatpump,2022,all-year,all-week,night,0.04760000000
-0,heat,R2,2030,10,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R2,2030,11,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R2,2030,12,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R2,2032,0,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R2,2032,1,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R2,2032,3,heatpump,2022,all-year,all-week,night,0.04760000000
-0,heat,R2,2032,4,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R2,2032,5,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R2,2032,6,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R2,2032,7,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R2,2032,9,heatpump,2022,all-year,all-week,night,0.04760000000
-0,heat,R2,2032,10,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R2,2032,11,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R2,2032,12,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R2,2032,13,heatpump,2030,all-year,all-week,night,0.34810000000
-0,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,night,3.13360000000
-0,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,night,3.13360000000
-0,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,night,3.13360000000
-0,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,night,3.13360000000
-0,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,night,3.13360000000
-0,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,night,3.13360000000
-0,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,night,3.13360000000
-0,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,night,3.13360000000
-1,heat,R1,2030,0,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R1,2030,1,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R1,2030,2,heatpump,2020,all-year,all-week,morning,0.45070000000
-1,heat,R1,2030,3,heatpump,2022,all-year,all-week,morning,0.07140000000
-1,heat,R1,2030,4,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R1,2030,5,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R1,2030,6,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R1,2030,8,heatpump,2020,all-year,all-week,morning,0.45070000000
-1,heat,R1,2030,9,heatpump,2022,all-year,all-week,morning,0.07140000000
-1,heat,R1,2030,10,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R1,2030,11,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R1,2030,12,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R1,2032,0,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R1,2032,1,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R1,2032,3,heatpump,2022,all-year,all-week,morning,0.07140000000
-1,heat,R1,2032,4,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R1,2032,5,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R1,2032,6,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R1,2032,7,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R1,2032,9,heatpump,2022,all-year,all-week,morning,0.07140000000
-1,heat,R1,2032,10,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R1,2032,11,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R1,2032,12,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R1,2032,13,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R2,2030,0,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R2,2030,1,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R2,2030,2,heatpump,2020,all-year,all-week,morning,0.45070000000
-1,heat,R2,2030,3,heatpump,2022,all-year,all-week,morning,0.07140000000
-1,heat,R2,2030,4,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R2,2030,5,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R2,2030,6,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R2,2030,8,heatpump,2020,all-year,all-week,morning,0.45070000000
-1,heat,R2,2030,9,heatpump,2022,all-year,all-week,morning,0.07140000000
-1,heat,R2,2030,10,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R2,2030,11,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R2,2030,12,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R2,2032,0,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R2,2032,1,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R2,2032,3,heatpump,2022,all-year,all-week,morning,0.07140000000
-1,heat,R2,2032,4,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R2,2032,5,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R2,2032,6,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R2,2032,7,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R2,2032,9,heatpump,2022,all-year,all-week,morning,0.07140000000
-1,heat,R2,2032,10,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R2,2032,11,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R2,2032,12,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R2,2032,13,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,morning,4.70040000000
-1,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,morning,4.70040000000
-1,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,morning,4.70040000000
-1,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,morning,4.70040000000
-1,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,morning,4.70040000000
-1,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,morning,4.70040000000
-1,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,morning,4.70040000000
-1,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,morning,4.70040000000
-2,heat,R1,2030,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R1,2030,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R1,2030,2,heatpump,2020,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R1,2030,3,heatpump,2022,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2030,4,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R1,2030,5,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2030,6,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2030,8,heatpump,2020,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R1,2030,9,heatpump,2022,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2030,10,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R1,2030,11,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2030,12,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R1,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R1,2032,3,heatpump,2022,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2032,4,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R1,2032,5,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2032,6,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2032,7,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R1,2032,9,heatpump,2022,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2032,10,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R1,2032,11,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2032,12,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2032,13,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R2,2030,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R2,2030,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R2,2030,2,heatpump,2020,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R2,2030,3,heatpump,2022,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2030,4,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R2,2030,5,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2030,6,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2030,8,heatpump,2020,all-year,all-week,mid-afternoon,0.30050000000
-2,heat,R2,2030,9,heatpump,2022,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2030,10,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R2,2030,11,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2030,12,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R2,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R2,2032,3,heatpump,2022,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2032,4,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R2,2032,5,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2032,6,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2032,7,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R2,2032,9,heatpump,2022,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2032,10,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R2,2032,11,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2032,12,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2032,13,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-3,heat,R1,2030,0,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R1,2030,1,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R1,2030,2,heatpump,2020,all-year,all-week,early-peak,0.45070000000
-3,heat,R1,2030,3,heatpump,2022,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2030,4,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R1,2030,5,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2030,6,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2030,8,heatpump,2020,all-year,all-week,early-peak,0.45070000000
-3,heat,R1,2030,9,heatpump,2022,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2030,10,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R1,2030,11,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2030,12,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2032,0,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R1,2032,1,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R1,2032,3,heatpump,2022,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2032,4,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R1,2032,5,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2032,6,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2032,7,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R1,2032,9,heatpump,2022,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2032,10,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R1,2032,11,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2032,12,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2032,13,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R2,2030,0,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R2,2030,1,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R2,2030,2,heatpump,2020,all-year,all-week,early-peak,0.45070000000
-3,heat,R2,2030,3,heatpump,2022,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2030,4,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R2,2030,5,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2030,6,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2030,8,heatpump,2020,all-year,all-week,early-peak,0.45070000000
-3,heat,R2,2030,9,heatpump,2022,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2030,10,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R2,2030,11,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2030,12,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2032,0,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R2,2032,1,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R2,2032,3,heatpump,2022,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2032,4,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R2,2032,5,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2032,6,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2032,7,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R2,2032,9,heatpump,2022,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2032,10,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R2,2032,11,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2032,12,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2032,13,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-4,heat,R1,2030,0,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R1,2030,1,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R1,2030,2,heatpump,2020,all-year,all-week,late-peak,0.90190000000
-4,heat,R1,2030,3,heatpump,2022,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2030,4,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R1,2030,5,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2030,6,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2030,8,heatpump,2020,all-year,all-week,late-peak,0.90190000000
-4,heat,R1,2030,9,heatpump,2022,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2030,10,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R1,2030,11,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2030,12,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2032,0,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R1,2032,1,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R1,2032,3,heatpump,2022,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2032,4,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R1,2032,5,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2032,6,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2032,7,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R1,2032,9,heatpump,2022,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2032,10,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R1,2032,11,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2032,12,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2032,13,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R2,2030,0,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R2,2030,1,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R2,2030,2,heatpump,2020,all-year,all-week,late-peak,0.90190000000
-4,heat,R2,2030,3,heatpump,2022,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2030,4,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R2,2030,5,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2030,6,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2030,8,heatpump,2020,all-year,all-week,late-peak,0.90190000000
-4,heat,R2,2030,9,heatpump,2022,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2030,10,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R2,2030,11,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2030,12,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2032,0,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R2,2032,1,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R2,2032,3,heatpump,2022,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2032,4,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R2,2032,5,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2032,6,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2032,7,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R2,2032,9,heatpump,2022,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2032,10,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R2,2032,11,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2032,12,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2032,13,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-5,heat,R1,2030,0,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R1,2030,1,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R1,2030,2,heatpump,2020,all-year,all-week,evening,0.60140000000
-5,heat,R1,2030,3,heatpump,2022,all-year,all-week,evening,0.09530000000
-5,heat,R1,2030,4,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R1,2030,5,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R1,2030,6,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R1,2030,8,heatpump,2020,all-year,all-week,evening,0.60140000000
-5,heat,R1,2030,9,heatpump,2022,all-year,all-week,evening,0.09530000000
-5,heat,R1,2030,10,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R1,2030,11,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R1,2030,12,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R1,2032,0,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R1,2032,1,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R1,2032,3,heatpump,2022,all-year,all-week,evening,0.09530000000
-5,heat,R1,2032,4,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R1,2032,5,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R1,2032,6,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R1,2032,7,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R1,2032,9,heatpump,2022,all-year,all-week,evening,0.09530000000
-5,heat,R1,2032,10,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R1,2032,11,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R1,2032,12,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R1,2032,13,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R2,2030,0,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R2,2030,1,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R2,2030,2,heatpump,2020,all-year,all-week,evening,0.60140000000
-5,heat,R2,2030,3,heatpump,2022,all-year,all-week,evening,0.09530000000
-5,heat,R2,2030,4,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R2,2030,5,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R2,2030,6,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R2,2030,8,heatpump,2020,all-year,all-week,evening,0.60140000000
-5,heat,R2,2030,9,heatpump,2022,all-year,all-week,evening,0.09530000000
-5,heat,R2,2030,10,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R2,2030,11,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R2,2030,12,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R2,2032,0,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R2,2032,1,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R2,2032,3,heatpump,2022,all-year,all-week,evening,0.09530000000
-5,heat,R2,2032,4,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R2,2032,5,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R2,2032,6,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R2,2032,7,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R2,2032,9,heatpump,2022,all-year,all-week,evening,0.09530000000
-5,heat,R2,2032,10,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R2,2032,11,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R2,2032,12,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R2,2032,13,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,evening,6.27150000000
-5,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,evening,6.27150000000
-5,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,evening,6.27150000000
-5,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,evening,6.27150000000
-5,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,evening,6.27150000000
-5,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,evening,6.27150000000
-5,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,evening,6.27150000000
-5,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,evening,6.27150000000
-6,heat,R1,2030,0,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R1,2030,1,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R1,2030,2,heatpump,2020,all-year,all-week,early-morning,0.60140000000
-6,heat,R1,2030,3,heatpump,2022,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2030,4,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R1,2030,5,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2030,6,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2030,8,heatpump,2020,all-year,all-week,early-morning,0.60140000000
-6,heat,R1,2030,9,heatpump,2022,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2030,10,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R1,2030,11,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2030,12,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2032,0,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R1,2032,1,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R1,2032,3,heatpump,2022,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2032,4,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R1,2032,5,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2032,6,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2032,7,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R1,2032,9,heatpump,2022,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2032,10,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R1,2032,11,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2032,12,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2032,13,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R2,2030,0,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R2,2030,1,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R2,2030,2,heatpump,2020,all-year,all-week,early-morning,0.60140000000
-6,heat,R2,2030,3,heatpump,2022,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2030,4,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R2,2030,5,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2030,6,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2030,8,heatpump,2020,all-year,all-week,early-morning,0.60140000000
-6,heat,R2,2030,9,heatpump,2022,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2030,10,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R2,2030,11,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2030,12,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2032,0,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R2,2032,1,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R2,2032,3,heatpump,2022,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2032,4,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R2,2032,5,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2032,6,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2032,7,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R2,2032,9,heatpump,2022,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2032,10,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R2,2032,11,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2032,12,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2032,13,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-7,heat,R1,2030,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R1,2030,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R1,2030,2,heatpump,2020,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R1,2030,3,heatpump,2022,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2030,4,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R1,2030,5,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2030,6,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2030,8,heatpump,2020,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R1,2030,9,heatpump,2022,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2030,10,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R1,2030,11,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2030,12,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R1,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R1,2032,3,heatpump,2022,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2032,4,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R1,2032,5,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2032,6,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2032,7,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R1,2032,9,heatpump,2022,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2032,10,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R1,2032,11,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2032,12,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2032,13,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R2,2030,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R2,2030,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R2,2030,2,heatpump,2020,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R2,2030,3,heatpump,2022,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2030,4,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R2,2030,5,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2030,6,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2030,8,heatpump,2020,all-year,all-week,late-afternoon,0.60140000000
-7,heat,R2,2030,9,heatpump,2022,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2030,10,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R2,2030,11,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2030,12,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R2,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R2,2032,3,heatpump,2022,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2032,4,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R2,2032,5,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2032,6,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2032,7,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R2,2032,9,heatpump,2022,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2032,10,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R2,2032,11,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2032,12,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2032,13,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,CO2f,R1,2030,0,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R1,2030,1,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R2,2030,0,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R2,2030,1,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2030,0,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R1,2030,1,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R1,2030,2,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R1,2030,3,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R1,2030,4,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R1,2030,5,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R1,2030,6,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R1,2030,8,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R1,2030,9,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R1,2030,10,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R1,2030,11,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R1,2030,12,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R1,2032,0,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R1,2032,1,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R1,2032,3,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R1,2032,4,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R1,2032,5,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R1,2032,6,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R1,2032,7,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R1,2032,9,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R1,2032,10,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R1,2032,11,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R1,2032,12,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R1,2032,13,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R2,2030,0,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R2,2030,1,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R2,2030,2,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R2,2030,3,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R2,2030,4,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R2,2030,5,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R2,2030,6,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R2,2030,8,all-year,all-week,night,heatpump,2020,0.30050000000
+0,heat,R2,2030,9,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R2,2030,10,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R2,2030,11,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R2,2030,12,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R2,2032,0,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R2,2032,1,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R2,2032,3,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R2,2032,4,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R2,2032,5,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R2,2032,6,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R2,2032,7,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R2,2032,9,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R2,2032,10,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R2,2032,11,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R2,2032,12,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R2,2032,13,all-year,all-week,night,heatpump,2030,0.34810000000
+0,CO2f,R1,2030,0,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R1,2030,1,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R1,2032,0,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R1,2032,1,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R2,2030,0,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R2,2030,1,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R2,2032,0,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R2,2032,1,all-year,all-week,night,gasboiler,2024,3.13360000000
+1,heat,R1,2030,0,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R1,2030,1,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R1,2030,2,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R1,2030,3,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R1,2030,4,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R1,2030,5,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R1,2030,6,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R1,2030,8,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R1,2030,9,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R1,2030,10,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R1,2030,11,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R1,2030,12,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R1,2032,0,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R1,2032,1,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R1,2032,3,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R1,2032,4,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R1,2032,5,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R1,2032,6,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R1,2032,7,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R1,2032,9,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R1,2032,10,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R1,2032,11,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R1,2032,12,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R1,2032,13,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R2,2030,0,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R2,2030,1,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R2,2030,2,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R2,2030,3,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R2,2030,4,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R2,2030,5,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R2,2030,6,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R2,2030,8,all-year,all-week,morning,heatpump,2020,0.45070000000
+1,heat,R2,2030,9,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R2,2030,10,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R2,2030,11,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R2,2030,12,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R2,2032,0,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R2,2032,1,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R2,2032,3,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R2,2032,4,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R2,2032,5,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R2,2032,6,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R2,2032,7,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R2,2032,9,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R2,2032,10,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R2,2032,11,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R2,2032,12,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R2,2032,13,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,CO2f,R1,2030,0,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R1,2030,1,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R1,2032,0,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R1,2032,1,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R2,2030,0,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R2,2030,1,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R2,2032,0,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R2,2032,1,all-year,all-week,morning,gasboiler,2024,4.70040000000
+2,heat,R1,2030,0,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R1,2030,2,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R1,2030,3,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R1,2030,4,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R1,2030,5,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R1,2030,6,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R1,2030,8,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R1,2030,9,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R1,2030,10,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R1,2030,11,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R1,2030,12,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R1,2032,0,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R1,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R1,2032,3,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R1,2032,4,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R1,2032,5,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R1,2032,6,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R1,2032,7,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R1,2032,9,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R1,2032,10,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R1,2032,11,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R1,2032,12,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R1,2032,13,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R2,2030,0,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R2,2030,2,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R2,2030,3,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R2,2030,4,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R2,2030,5,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R2,2030,6,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R2,2030,8,all-year,all-week,mid-afternoon,heatpump,2020,0.30050000000
+2,heat,R2,2030,9,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R2,2030,10,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R2,2030,11,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R2,2030,12,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R2,2032,0,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R2,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R2,2032,3,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R2,2032,4,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R2,2032,5,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R2,2032,6,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R2,2032,7,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R2,2032,9,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R2,2032,10,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R2,2032,11,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R2,2032,12,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R2,2032,13,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,CO2f,R1,2030,0,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R1,2030,1,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R1,2032,0,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R1,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R2,2030,0,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R2,2030,1,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R2,2032,0,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R2,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+3,heat,R1,2030,0,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R1,2030,1,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R1,2030,2,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R1,2030,3,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R1,2030,4,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R1,2030,5,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R1,2030,6,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R1,2030,8,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R1,2030,9,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R1,2030,10,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R1,2030,11,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R1,2030,12,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R1,2032,0,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R1,2032,1,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R1,2032,3,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R1,2032,4,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R1,2032,5,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R1,2032,6,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R1,2032,7,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R1,2032,9,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R1,2032,10,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R1,2032,11,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R1,2032,12,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R1,2032,13,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R2,2030,0,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R2,2030,1,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R2,2030,2,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R2,2030,3,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R2,2030,4,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R2,2030,5,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R2,2030,6,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R2,2030,8,all-year,all-week,early-peak,heatpump,2020,0.45070000000
+3,heat,R2,2030,9,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R2,2030,10,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R2,2030,11,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R2,2030,12,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R2,2032,0,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R2,2032,1,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R2,2032,3,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R2,2032,4,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R2,2032,5,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R2,2032,6,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R2,2032,7,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R2,2032,9,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R2,2032,10,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R2,2032,11,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R2,2032,12,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R2,2032,13,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,CO2f,R1,2030,0,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R1,2030,1,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R1,2032,0,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R1,2032,1,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R2,2030,0,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R2,2030,1,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R2,2032,0,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R2,2032,1,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+4,heat,R1,2030,0,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R1,2030,1,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R1,2030,2,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R1,2030,3,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R1,2030,4,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R1,2030,5,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R1,2030,6,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R1,2030,8,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R1,2030,9,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R1,2030,10,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R1,2030,11,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R1,2030,12,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R1,2032,0,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R1,2032,1,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R1,2032,3,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R1,2032,4,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R1,2032,5,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R1,2032,6,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R1,2032,7,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R1,2032,9,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R1,2032,10,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R1,2032,11,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R1,2032,12,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R1,2032,13,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R2,2030,0,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R2,2030,1,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R2,2030,2,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R2,2030,3,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R2,2030,4,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R2,2030,5,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R2,2030,6,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R2,2030,8,all-year,all-week,late-peak,heatpump,2020,0.90190000000
+4,heat,R2,2030,9,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R2,2030,10,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R2,2030,11,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R2,2030,12,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R2,2032,0,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R2,2032,1,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R2,2032,3,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R2,2032,4,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R2,2032,5,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R2,2032,6,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R2,2032,7,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R2,2032,9,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R2,2032,10,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R2,2032,11,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R2,2032,12,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R2,2032,13,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,CO2f,R1,2030,0,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R1,2030,1,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R1,2032,0,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R1,2032,1,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R2,2030,0,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R2,2030,1,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R2,2032,0,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R2,2032,1,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+5,heat,R1,2030,0,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R1,2030,1,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R1,2030,2,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R1,2030,3,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R1,2030,4,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R1,2030,5,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R1,2030,6,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R1,2030,8,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R1,2030,9,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R1,2030,10,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R1,2030,11,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R1,2030,12,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R1,2032,0,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R1,2032,1,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R1,2032,3,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R1,2032,4,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R1,2032,5,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R1,2032,6,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R1,2032,7,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R1,2032,9,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R1,2032,10,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R1,2032,11,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R1,2032,12,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R1,2032,13,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R2,2030,0,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R2,2030,1,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R2,2030,2,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R2,2030,3,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R2,2030,4,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R2,2030,5,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R2,2030,6,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R2,2030,8,all-year,all-week,evening,heatpump,2020,0.60140000000
+5,heat,R2,2030,9,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R2,2030,10,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R2,2030,11,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R2,2030,12,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R2,2032,0,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R2,2032,1,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R2,2032,3,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R2,2032,4,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R2,2032,5,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R2,2032,6,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R2,2032,7,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R2,2032,9,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R2,2032,10,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R2,2032,11,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R2,2032,12,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R2,2032,13,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,CO2f,R1,2030,0,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R1,2030,1,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R1,2032,0,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R1,2032,1,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R2,2030,0,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R2,2030,1,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R2,2032,0,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R2,2032,1,all-year,all-week,evening,gasboiler,2024,6.27150000000
+6,heat,R1,2030,0,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R1,2030,1,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R1,2030,2,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R1,2030,3,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R1,2030,4,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R1,2030,5,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R1,2030,6,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R1,2030,8,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R1,2030,9,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R1,2030,10,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R1,2030,11,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R1,2030,12,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R1,2032,0,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R1,2032,1,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R1,2032,3,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R1,2032,4,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R1,2032,5,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R1,2032,6,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R1,2032,7,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R1,2032,9,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R1,2032,10,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R1,2032,11,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R1,2032,12,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R1,2032,13,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R2,2030,0,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R2,2030,1,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R2,2030,2,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R2,2030,3,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R2,2030,4,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R2,2030,5,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R2,2030,6,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R2,2030,8,all-year,all-week,early-morning,heatpump,2020,0.60140000000
+6,heat,R2,2030,9,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R2,2030,10,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R2,2030,11,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R2,2030,12,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R2,2032,0,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R2,2032,1,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R2,2032,3,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R2,2032,4,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R2,2032,5,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R2,2032,6,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R2,2032,7,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R2,2032,9,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R2,2032,10,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R2,2032,11,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R2,2032,12,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R2,2032,13,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,CO2f,R1,2030,0,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R1,2030,1,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R1,2032,0,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R1,2032,1,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R2,2030,0,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R2,2030,1,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R2,2032,0,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R2,2032,1,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+7,heat,R1,2030,0,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R1,2030,2,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R1,2030,3,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R1,2030,4,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R1,2030,5,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R1,2030,6,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R1,2030,8,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R1,2030,9,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R1,2030,10,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R1,2030,11,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R1,2030,12,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R1,2032,0,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R1,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R1,2032,3,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R1,2032,4,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R1,2032,5,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R1,2032,6,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R1,2032,7,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R1,2032,9,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R1,2032,10,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R1,2032,11,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R1,2032,12,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R1,2032,13,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R2,2030,0,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R2,2030,2,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R2,2030,3,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R2,2030,4,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R2,2030,5,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R2,2030,6,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R2,2030,8,all-year,all-week,late-afternoon,heatpump,2020,0.60140000000
+7,heat,R2,2030,9,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R2,2030,10,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R2,2030,11,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R2,2030,12,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R2,2032,0,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R2,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R2,2032,3,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R2,2032,4,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R2,2032,5,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R2,2032,6,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R2,2032,7,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R2,2032,9,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R2,2032,10,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R2,2032,11,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R2,2032,12,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R2,2032,13,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,CO2f,R1,2030,0,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R1,2030,1,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R1,2032,0,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R1,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R2,2030,0,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R2,2030,1,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R2,2032,0,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R2,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2032.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2032.csv
index 3aa4b2d08..6810097f8 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2032.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2032.csv
@@ -1,449 +1,449 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2032,0,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R1,2032,1,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R1,2032,2,heatpump,2022,all-year,all-week,night,0.04760000000
-0,heat,R1,2032,3,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R1,2032,4,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R1,2032,5,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R1,2032,6,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R1,2032,8,heatpump,2022,all-year,all-week,night,0.04760000000
-0,heat,R1,2032,9,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R1,2032,10,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R1,2032,11,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R1,2032,12,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R1,2034,0,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R1,2034,1,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R1,2034,3,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R1,2034,4,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R1,2034,5,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R1,2034,6,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R1,2034,7,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R1,2034,9,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R1,2034,10,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R1,2034,11,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R1,2034,12,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R1,2034,13,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R2,2032,0,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R2,2032,1,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R2,2032,2,heatpump,2022,all-year,all-week,night,0.04760000000
-0,heat,R2,2032,3,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R2,2032,4,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R2,2032,5,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R2,2032,6,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R2,2032,8,heatpump,2022,all-year,all-week,night,0.04760000000
-0,heat,R2,2032,9,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R2,2032,10,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R2,2032,11,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R2,2032,12,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R2,2034,0,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R2,2034,1,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R2,2034,3,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R2,2034,4,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R2,2034,5,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R2,2034,6,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R2,2034,7,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R2,2034,9,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R2,2034,10,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R2,2034,11,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R2,2034,12,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R2,2034,13,heatpump,2032,all-year,all-week,night,0.09520000000
-0,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,night,3.13360000000
-0,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,night,3.13360000000
-0,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,night,3.13360000000
-0,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,night,3.13360000000
-0,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,night,3.13360000000
-0,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,night,3.13360000000
-0,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,night,3.13360000000
-0,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,night,3.13360000000
-1,heat,R1,2032,0,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R1,2032,1,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R1,2032,2,heatpump,2022,all-year,all-week,morning,0.07140000000
-1,heat,R1,2032,3,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R1,2032,4,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R1,2032,5,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R1,2032,6,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R1,2032,8,heatpump,2022,all-year,all-week,morning,0.07140000000
-1,heat,R1,2032,9,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R1,2032,10,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R1,2032,11,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R1,2032,12,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R1,2034,0,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R1,2034,1,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R1,2034,3,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R1,2034,4,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R1,2034,5,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R1,2034,6,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R1,2034,7,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R1,2034,9,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R1,2034,10,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R1,2034,11,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R1,2034,12,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R1,2034,13,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R2,2032,0,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R2,2032,1,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R2,2032,2,heatpump,2022,all-year,all-week,morning,0.07140000000
-1,heat,R2,2032,3,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R2,2032,4,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R2,2032,5,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R2,2032,6,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R2,2032,8,heatpump,2022,all-year,all-week,morning,0.07140000000
-1,heat,R2,2032,9,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R2,2032,10,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R2,2032,11,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R2,2032,12,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R2,2034,0,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R2,2034,1,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R2,2034,3,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R2,2034,4,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R2,2034,5,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R2,2034,6,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R2,2034,7,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R2,2034,9,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R2,2034,10,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R2,2034,11,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R2,2034,12,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R2,2034,13,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,morning,4.70040000000
-1,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,morning,4.70040000000
-1,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,morning,4.70040000000
-1,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,morning,4.70040000000
-1,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,morning,4.70040000000
-1,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,morning,4.70040000000
-1,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,morning,4.70040000000
-1,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,morning,4.70040000000
-2,heat,R1,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R1,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R1,2032,2,heatpump,2022,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2032,3,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R1,2032,4,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2032,5,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2032,6,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R1,2032,8,heatpump,2022,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2032,9,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R1,2032,10,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2032,11,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2032,12,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R1,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R1,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R1,2034,3,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R1,2034,4,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2034,5,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2034,6,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R1,2034,7,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2034,9,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R1,2034,10,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2034,11,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2034,12,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R1,2034,13,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R2,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R2,2032,2,heatpump,2022,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2032,3,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R2,2032,4,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2032,5,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2032,6,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R2,2032,8,heatpump,2022,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2032,9,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R2,2032,10,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2032,11,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2032,12,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R2,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R2,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R2,2034,3,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R2,2034,4,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2034,5,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2034,6,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R2,2034,7,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2034,9,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R2,2034,10,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2034,11,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2034,12,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R2,2034,13,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-3,heat,R1,2032,0,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R1,2032,1,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R1,2032,2,heatpump,2022,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2032,3,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R1,2032,4,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2032,5,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2032,6,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R1,2032,8,heatpump,2022,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2032,9,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R1,2032,10,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2032,11,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2032,12,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R1,2034,0,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R1,2034,1,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R1,2034,3,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R1,2034,4,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2034,5,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2034,6,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R1,2034,7,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2034,9,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R1,2034,10,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2034,11,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2034,12,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R1,2034,13,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2032,0,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R2,2032,1,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R2,2032,2,heatpump,2022,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2032,3,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R2,2032,4,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2032,5,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2032,6,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R2,2032,8,heatpump,2022,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2032,9,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R2,2032,10,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2032,11,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2032,12,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R2,2034,0,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R2,2034,1,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R2,2034,3,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R2,2034,4,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2034,5,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2034,6,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R2,2034,7,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2034,9,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R2,2034,10,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2034,11,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2034,12,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R2,2034,13,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-4,heat,R1,2032,0,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R1,2032,1,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R1,2032,2,heatpump,2022,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2032,3,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R1,2032,4,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2032,5,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2032,6,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R1,2032,8,heatpump,2022,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2032,9,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R1,2032,10,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2032,11,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2032,12,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R1,2034,0,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R1,2034,1,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R1,2034,3,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R1,2034,4,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2034,5,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2034,6,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R1,2034,7,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2034,9,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R1,2034,10,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2034,11,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2034,12,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R1,2034,13,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2032,0,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R2,2032,1,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R2,2032,2,heatpump,2022,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2032,3,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R2,2032,4,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2032,5,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2032,6,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R2,2032,8,heatpump,2022,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2032,9,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R2,2032,10,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2032,11,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2032,12,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R2,2034,0,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R2,2034,1,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R2,2034,3,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R2,2034,4,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2034,5,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2034,6,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R2,2034,7,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2034,9,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R2,2034,10,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2034,11,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2034,12,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R2,2034,13,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-5,heat,R1,2032,0,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R1,2032,1,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R1,2032,2,heatpump,2022,all-year,all-week,evening,0.09530000000
-5,heat,R1,2032,3,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R1,2032,4,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R1,2032,5,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R1,2032,6,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R1,2032,8,heatpump,2022,all-year,all-week,evening,0.09530000000
-5,heat,R1,2032,9,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R1,2032,10,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R1,2032,11,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R1,2032,12,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R1,2034,0,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R1,2034,1,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R1,2034,3,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R1,2034,4,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R1,2034,5,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R1,2034,6,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R1,2034,7,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R1,2034,9,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R1,2034,10,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R1,2034,11,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R1,2034,12,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R1,2034,13,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R2,2032,0,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R2,2032,1,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R2,2032,2,heatpump,2022,all-year,all-week,evening,0.09530000000
-5,heat,R2,2032,3,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R2,2032,4,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R2,2032,5,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R2,2032,6,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R2,2032,8,heatpump,2022,all-year,all-week,evening,0.09530000000
-5,heat,R2,2032,9,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R2,2032,10,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R2,2032,11,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R2,2032,12,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R2,2034,0,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R2,2034,1,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R2,2034,3,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R2,2034,4,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R2,2034,5,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R2,2034,6,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R2,2034,7,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R2,2034,9,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R2,2034,10,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R2,2034,11,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R2,2034,12,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R2,2034,13,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,evening,6.27150000000
-5,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,evening,6.27150000000
-5,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,evening,6.27150000000
-5,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,evening,6.27150000000
-5,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,evening,6.27150000000
-5,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,evening,6.27150000000
-5,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,evening,6.27150000000
-5,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,evening,6.27150000000
-6,heat,R1,2032,0,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R1,2032,1,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R1,2032,2,heatpump,2022,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2032,3,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R1,2032,4,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2032,5,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2032,6,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R1,2032,8,heatpump,2022,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2032,9,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R1,2032,10,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2032,11,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2032,12,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R1,2034,0,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R1,2034,1,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R1,2034,3,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R1,2034,4,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2034,5,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2034,6,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R1,2034,7,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2034,9,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R1,2034,10,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2034,11,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2034,12,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R1,2034,13,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2032,0,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R2,2032,1,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R2,2032,2,heatpump,2022,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2032,3,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R2,2032,4,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2032,5,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2032,6,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R2,2032,8,heatpump,2022,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2032,9,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R2,2032,10,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2032,11,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2032,12,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R2,2034,0,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R2,2034,1,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R2,2034,3,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R2,2034,4,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2034,5,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2034,6,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R2,2034,7,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2034,9,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R2,2034,10,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2034,11,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2034,12,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R2,2034,13,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-7,heat,R1,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R1,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R1,2032,2,heatpump,2022,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2032,3,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R1,2032,4,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2032,5,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2032,6,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R1,2032,8,heatpump,2022,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2032,9,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R1,2032,10,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2032,11,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2032,12,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R1,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R1,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R1,2034,3,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R1,2034,4,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2034,5,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2034,6,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R1,2034,7,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2034,9,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R1,2034,10,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2034,11,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2034,12,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R1,2034,13,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R2,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R2,2032,2,heatpump,2022,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2032,3,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R2,2032,4,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2032,5,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2032,6,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R2,2032,8,heatpump,2022,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2032,9,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R2,2032,10,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2032,11,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2032,12,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R2,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R2,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R2,2034,3,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R2,2034,4,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2034,5,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2034,6,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R2,2034,7,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2034,9,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R2,2034,10,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2034,11,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2034,12,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R2,2034,13,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,CO2f,R1,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R1,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R2,2032,0,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R2,2032,1,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2032,0,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R1,2032,1,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R1,2032,2,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R1,2032,3,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R1,2032,4,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R1,2032,5,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R1,2032,6,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R1,2032,8,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R1,2032,9,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R1,2032,10,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R1,2032,11,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R1,2032,12,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R1,2034,0,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R1,2034,1,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R1,2034,3,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R1,2034,4,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R1,2034,5,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R1,2034,6,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R1,2034,7,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R1,2034,9,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R1,2034,10,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R1,2034,11,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R1,2034,12,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R1,2034,13,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R2,2032,0,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R2,2032,1,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R2,2032,2,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R2,2032,3,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R2,2032,4,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R2,2032,5,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R2,2032,6,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R2,2032,8,all-year,all-week,night,heatpump,2022,0.04760000000
+0,heat,R2,2032,9,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R2,2032,10,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R2,2032,11,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R2,2032,12,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R2,2034,0,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R2,2034,1,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R2,2034,3,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R2,2034,4,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R2,2034,5,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R2,2034,6,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R2,2034,7,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R2,2034,9,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R2,2034,10,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R2,2034,11,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R2,2034,12,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R2,2034,13,all-year,all-week,night,heatpump,2032,0.09520000000
+0,CO2f,R1,2032,0,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R1,2032,1,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R1,2034,0,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R1,2034,1,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R2,2032,0,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R2,2032,1,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R2,2034,0,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R2,2034,1,all-year,all-week,night,gasboiler,2024,3.13360000000
+1,heat,R1,2032,0,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R1,2032,1,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R1,2032,2,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R1,2032,3,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R1,2032,4,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R1,2032,5,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R1,2032,6,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R1,2032,8,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R1,2032,9,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R1,2032,10,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R1,2032,11,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R1,2032,12,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R1,2034,0,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R1,2034,1,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R1,2034,3,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R1,2034,4,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R1,2034,5,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R1,2034,6,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R1,2034,7,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R1,2034,9,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R1,2034,10,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R1,2034,11,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R1,2034,12,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R1,2034,13,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R2,2032,0,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R2,2032,1,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R2,2032,2,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R2,2032,3,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R2,2032,4,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R2,2032,5,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R2,2032,6,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R2,2032,8,all-year,all-week,morning,heatpump,2022,0.07140000000
+1,heat,R2,2032,9,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R2,2032,10,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R2,2032,11,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R2,2032,12,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R2,2034,0,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R2,2034,1,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R2,2034,3,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R2,2034,4,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R2,2034,5,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R2,2034,6,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R2,2034,7,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R2,2034,9,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R2,2034,10,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R2,2034,11,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R2,2034,12,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R2,2034,13,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,CO2f,R1,2032,0,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R1,2032,1,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R1,2034,0,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R1,2034,1,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R2,2032,0,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R2,2032,1,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R2,2034,0,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R2,2034,1,all-year,all-week,morning,gasboiler,2024,4.70040000000
+2,heat,R1,2032,0,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R1,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R1,2032,2,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R1,2032,3,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R1,2032,4,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R1,2032,5,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R1,2032,6,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R1,2032,8,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R1,2032,9,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R1,2032,10,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R1,2032,11,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R1,2032,12,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R1,2034,0,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R1,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R1,2034,3,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R1,2034,4,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R1,2034,5,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R1,2034,6,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R1,2034,7,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R1,2034,9,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R1,2034,10,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R1,2034,11,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R1,2034,12,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R1,2034,13,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R2,2032,0,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R2,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R2,2032,2,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R2,2032,3,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R2,2032,4,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R2,2032,5,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R2,2032,6,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R2,2032,8,all-year,all-week,mid-afternoon,heatpump,2022,0.04760000000
+2,heat,R2,2032,9,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R2,2032,10,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R2,2032,11,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R2,2032,12,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R2,2034,0,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R2,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R2,2034,3,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R2,2034,4,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R2,2034,5,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R2,2034,6,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R2,2034,7,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R2,2034,9,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R2,2034,10,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R2,2034,11,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R2,2034,12,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R2,2034,13,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,CO2f,R1,2032,0,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R1,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R1,2034,0,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R1,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R2,2032,0,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R2,2032,1,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R2,2034,0,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R2,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+3,heat,R1,2032,0,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R1,2032,1,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R1,2032,2,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R1,2032,3,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R1,2032,4,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R1,2032,5,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R1,2032,6,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R1,2032,8,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R1,2032,9,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R1,2032,10,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R1,2032,11,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R1,2032,12,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R1,2034,0,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R1,2034,1,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R1,2034,3,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R1,2034,4,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R1,2034,5,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R1,2034,6,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R1,2034,7,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R1,2034,9,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R1,2034,10,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R1,2034,11,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R1,2034,12,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R1,2034,13,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R2,2032,0,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R2,2032,1,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R2,2032,2,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R2,2032,3,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R2,2032,4,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R2,2032,5,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R2,2032,6,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R2,2032,8,all-year,all-week,early-peak,heatpump,2022,0.07140000000
+3,heat,R2,2032,9,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R2,2032,10,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R2,2032,11,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R2,2032,12,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R2,2034,0,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R2,2034,1,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R2,2034,3,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R2,2034,4,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R2,2034,5,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R2,2034,6,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R2,2034,7,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R2,2034,9,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R2,2034,10,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R2,2034,11,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R2,2034,12,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R2,2034,13,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,CO2f,R1,2032,0,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R1,2032,1,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R1,2034,0,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R1,2034,1,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R2,2032,0,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R2,2032,1,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R2,2034,0,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R2,2034,1,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+4,heat,R1,2032,0,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R1,2032,1,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R1,2032,2,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R1,2032,3,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R1,2032,4,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R1,2032,5,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R1,2032,6,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R1,2032,8,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R1,2032,9,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R1,2032,10,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R1,2032,11,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R1,2032,12,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R1,2034,0,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R1,2034,1,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R1,2034,3,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R1,2034,4,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R1,2034,5,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R1,2034,6,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R1,2034,7,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R1,2034,9,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R1,2034,10,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R1,2034,11,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R1,2034,12,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R1,2034,13,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R2,2032,0,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R2,2032,1,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R2,2032,2,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R2,2032,3,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R2,2032,4,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R2,2032,5,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R2,2032,6,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R2,2032,8,all-year,all-week,late-peak,heatpump,2022,0.14290000000
+4,heat,R2,2032,9,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R2,2032,10,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R2,2032,11,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R2,2032,12,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R2,2034,0,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R2,2034,1,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R2,2034,3,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R2,2034,4,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R2,2034,5,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R2,2034,6,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R2,2034,7,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R2,2034,9,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R2,2034,10,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R2,2034,11,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R2,2034,12,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R2,2034,13,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,CO2f,R1,2032,0,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R1,2032,1,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R1,2034,0,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R1,2034,1,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R2,2032,0,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R2,2032,1,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R2,2034,0,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R2,2034,1,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+5,heat,R1,2032,0,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R1,2032,1,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R1,2032,2,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R1,2032,3,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R1,2032,4,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R1,2032,5,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R1,2032,6,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R1,2032,8,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R1,2032,9,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R1,2032,10,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R1,2032,11,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R1,2032,12,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R1,2034,0,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R1,2034,1,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R1,2034,3,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R1,2034,4,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R1,2034,5,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R1,2034,6,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R1,2034,7,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R1,2034,9,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R1,2034,10,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R1,2034,11,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R1,2034,12,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R1,2034,13,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R2,2032,0,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R2,2032,1,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R2,2032,2,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R2,2032,3,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R2,2032,4,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R2,2032,5,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R2,2032,6,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R2,2032,8,all-year,all-week,evening,heatpump,2022,0.09530000000
+5,heat,R2,2032,9,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R2,2032,10,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R2,2032,11,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R2,2032,12,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R2,2034,0,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R2,2034,1,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R2,2034,3,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R2,2034,4,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R2,2034,5,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R2,2034,6,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R2,2034,7,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R2,2034,9,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R2,2034,10,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R2,2034,11,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R2,2034,12,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R2,2034,13,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,CO2f,R1,2032,0,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R1,2032,1,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R1,2034,0,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R1,2034,1,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R2,2032,0,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R2,2032,1,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R2,2034,0,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R2,2034,1,all-year,all-week,evening,gasboiler,2024,6.27150000000
+6,heat,R1,2032,0,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R1,2032,1,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R1,2032,2,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R1,2032,3,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R1,2032,4,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R1,2032,5,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R1,2032,6,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R1,2032,8,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R1,2032,9,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R1,2032,10,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R1,2032,11,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R1,2032,12,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R1,2034,0,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R1,2034,1,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R1,2034,3,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R1,2034,4,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R1,2034,5,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R1,2034,6,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R1,2034,7,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R1,2034,9,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R1,2034,10,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R1,2034,11,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R1,2034,12,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R1,2034,13,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R2,2032,0,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R2,2032,1,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R2,2032,2,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R2,2032,3,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R2,2032,4,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R2,2032,5,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R2,2032,6,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R2,2032,8,all-year,all-week,early-morning,heatpump,2022,0.09530000000
+6,heat,R2,2032,9,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R2,2032,10,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R2,2032,11,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R2,2032,12,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R2,2034,0,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R2,2034,1,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R2,2034,3,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R2,2034,4,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R2,2034,5,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R2,2034,6,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R2,2034,7,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R2,2034,9,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R2,2034,10,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R2,2034,11,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R2,2034,12,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R2,2034,13,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,CO2f,R1,2032,0,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R1,2032,1,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R1,2034,0,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R1,2034,1,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R2,2032,0,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R2,2032,1,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R2,2034,0,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R2,2034,1,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+7,heat,R1,2032,0,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R1,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R1,2032,2,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R1,2032,3,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R1,2032,4,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R1,2032,5,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R1,2032,6,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R1,2032,8,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R1,2032,9,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R1,2032,10,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R1,2032,11,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R1,2032,12,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R1,2034,0,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R1,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R1,2034,3,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R1,2034,4,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R1,2034,5,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R1,2034,6,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R1,2034,7,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R1,2034,9,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R1,2034,10,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R1,2034,11,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R1,2034,12,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R1,2034,13,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R2,2032,0,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R2,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R2,2032,2,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R2,2032,3,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R2,2032,4,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R2,2032,5,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R2,2032,6,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R2,2032,8,all-year,all-week,late-afternoon,heatpump,2022,0.09530000000
+7,heat,R2,2032,9,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R2,2032,10,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R2,2032,11,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R2,2032,12,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R2,2034,0,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R2,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R2,2034,3,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R2,2034,4,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R2,2034,5,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R2,2034,6,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R2,2034,7,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R2,2034,9,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R2,2034,10,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R2,2034,11,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R2,2034,12,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R2,2034,13,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,CO2f,R1,2032,0,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R1,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R1,2034,0,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R1,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R2,2032,0,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R2,2032,1,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R2,2034,0,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R2,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2034.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2034.csv
index fe8d5955e..d18aca821 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2034.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2034.csv
@@ -1,385 +1,385 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2034,0,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R1,2034,1,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R1,2034,2,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R1,2034,3,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R1,2034,4,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R1,2034,5,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R1,2034,6,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R1,2034,8,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R1,2034,9,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R1,2034,10,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R1,2034,11,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R1,2034,12,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R1,2036,3,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R1,2036,4,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R1,2036,5,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R1,2036,6,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R1,2036,7,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R1,2036,9,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R1,2036,10,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R1,2036,11,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R1,2036,12,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R1,2036,13,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R2,2034,0,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R2,2034,1,gasboiler,2024,all-year,all-week,night,0.04840000000
-0,heat,R2,2034,2,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R2,2034,3,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R2,2034,4,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R2,2034,5,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R2,2034,6,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R2,2034,8,heatpump,2024,all-year,all-week,night,0.10330000000
-0,heat,R2,2034,9,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R2,2034,10,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R2,2034,11,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R2,2034,12,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R2,2036,3,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R2,2036,4,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R2,2036,5,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R2,2036,6,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R2,2036,7,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R2,2036,9,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R2,2036,10,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R2,2036,11,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R2,2036,12,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R2,2036,13,heatpump,2034,all-year,all-week,night,0.19930000000
-0,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,night,3.13360000000
-0,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,night,3.13360000000
-0,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,night,3.13360000000
-0,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,night,3.13360000000
-1,heat,R1,2034,0,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R1,2034,1,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R1,2034,2,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R1,2034,3,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R1,2034,4,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R1,2034,5,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R1,2034,6,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R1,2034,8,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R1,2034,9,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R1,2034,10,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R1,2034,11,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R1,2034,12,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R1,2036,3,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R1,2036,4,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R1,2036,5,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R1,2036,6,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R1,2036,7,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R1,2036,9,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R1,2036,10,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R1,2036,11,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R1,2036,12,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R1,2036,13,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R2,2034,0,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R2,2034,1,gasboiler,2024,all-year,all-week,morning,0.07260000000
-1,heat,R2,2034,2,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R2,2034,3,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R2,2034,4,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R2,2034,5,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R2,2034,6,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R2,2034,8,heatpump,2024,all-year,all-week,morning,0.15490000000
-1,heat,R2,2034,9,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R2,2034,10,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R2,2034,11,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R2,2034,12,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R2,2036,3,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R2,2036,4,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R2,2036,5,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R2,2036,6,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R2,2036,7,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R2,2036,9,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R2,2036,10,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R2,2036,11,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R2,2036,12,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R2,2036,13,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,morning,4.70040000000
-1,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,morning,4.70040000000
-1,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,morning,4.70040000000
-1,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,morning,4.70040000000
-2,heat,R1,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R1,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R1,2034,2,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R1,2034,3,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2034,4,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2034,5,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R1,2034,6,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2034,8,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R1,2034,9,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2034,10,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2034,11,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R1,2034,12,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2036,3,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2036,4,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2036,5,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R1,2036,6,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2036,7,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R1,2036,9,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2036,10,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2036,11,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R1,2036,12,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2036,13,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R2,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R2,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,0.04840000000
-2,heat,R2,2034,2,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R2,2034,3,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2034,4,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2034,5,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R2,2034,6,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2034,8,heatpump,2024,all-year,all-week,mid-afternoon,0.10330000000
-2,heat,R2,2034,9,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2034,10,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2034,11,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R2,2034,12,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2036,3,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2036,4,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2036,5,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R2,2036,6,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2036,7,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R2,2036,9,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2036,10,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2036,11,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R2,2036,12,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2036,13,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-2,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,mid-afternoon,3.13360000000
-3,heat,R1,2034,0,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R1,2034,1,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R1,2034,2,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R1,2034,3,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2034,4,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2034,5,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R1,2034,6,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2034,8,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R1,2034,9,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2034,10,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2034,11,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R1,2034,12,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2036,3,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2036,4,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2036,5,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R1,2036,6,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2036,7,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R1,2036,9,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2036,10,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2036,11,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R1,2036,12,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2036,13,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R2,2034,0,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R2,2034,1,gasboiler,2024,all-year,all-week,early-peak,0.07260000000
-3,heat,R2,2034,2,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R2,2034,3,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2034,4,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2034,5,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R2,2034,6,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2034,8,heatpump,2024,all-year,all-week,early-peak,0.15490000000
-3,heat,R2,2034,9,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2034,10,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2034,11,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R2,2034,12,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2036,3,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2036,4,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2036,5,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R2,2036,6,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2036,7,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R2,2036,9,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2036,10,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2036,11,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R2,2036,12,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2036,13,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-3,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,early-peak,4.70040000000
-4,heat,R1,2034,0,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R1,2034,1,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R1,2034,2,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R1,2034,3,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2034,4,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2034,5,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R1,2034,6,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2034,8,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R1,2034,9,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2034,10,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2034,11,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R1,2034,12,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2036,3,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2036,4,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2036,5,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R1,2036,6,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2036,7,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R1,2036,9,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2036,10,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2036,11,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R1,2036,12,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2036,13,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R2,2034,0,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R2,2034,1,gasboiler,2024,all-year,all-week,late-peak,0.14530000000
-4,heat,R2,2034,2,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R2,2034,3,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2034,4,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2034,5,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R2,2034,6,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2034,8,heatpump,2024,all-year,all-week,late-peak,0.31000000000
-4,heat,R2,2034,9,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2034,10,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2034,11,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R2,2034,12,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2036,3,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2036,4,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2036,5,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R2,2036,6,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2036,7,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R2,2036,9,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2036,10,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2036,11,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R2,2036,12,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2036,13,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-4,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,late-peak,9.40510000000
-5,heat,R1,2034,0,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R1,2034,1,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R1,2034,2,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R1,2034,3,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R1,2034,4,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R1,2034,5,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R1,2034,6,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R1,2034,8,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R1,2034,9,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R1,2034,10,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R1,2034,11,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R1,2034,12,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R1,2036,3,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R1,2036,4,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R1,2036,5,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R1,2036,6,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R1,2036,7,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R1,2036,9,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R1,2036,10,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R1,2036,11,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R1,2036,12,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R1,2036,13,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R2,2034,0,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R2,2034,1,gasboiler,2024,all-year,all-week,evening,0.09690000000
-5,heat,R2,2034,2,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R2,2034,3,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R2,2034,4,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R2,2034,5,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R2,2034,6,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R2,2034,8,heatpump,2024,all-year,all-week,evening,0.20670000000
-5,heat,R2,2034,9,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R2,2034,10,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R2,2034,11,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R2,2034,12,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R2,2036,3,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R2,2036,4,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R2,2036,5,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R2,2036,6,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R2,2036,7,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R2,2036,9,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R2,2036,10,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R2,2036,11,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R2,2036,12,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R2,2036,13,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,evening,6.27150000000
-5,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,evening,6.27150000000
-5,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,evening,6.27150000000
-5,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,evening,6.27150000000
-6,heat,R1,2034,0,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R1,2034,1,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R1,2034,2,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R1,2034,3,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2034,4,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2034,5,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R1,2034,6,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2034,8,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R1,2034,9,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2034,10,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2034,11,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R1,2034,12,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2036,3,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2036,4,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2036,5,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R1,2036,6,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2036,7,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R1,2036,9,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2036,10,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2036,11,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R1,2036,12,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2036,13,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R2,2034,0,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R2,2034,1,gasboiler,2024,all-year,all-week,early-morning,0.09690000000
-6,heat,R2,2034,2,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R2,2034,3,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2034,4,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2034,5,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R2,2034,6,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2034,8,heatpump,2024,all-year,all-week,early-morning,0.20670000000
-6,heat,R2,2034,9,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2034,10,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2034,11,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R2,2034,12,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2036,3,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2036,4,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2036,5,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R2,2036,6,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2036,7,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R2,2036,9,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2036,10,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2036,11,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R2,2036,12,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2036,13,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-6,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,early-morning,6.27150000000
-7,heat,R1,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R1,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R1,2034,2,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R1,2034,3,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2034,4,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2034,5,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R1,2034,6,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2034,8,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R1,2034,9,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2034,10,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2034,11,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R1,2034,12,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2036,3,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2036,4,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2036,5,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R1,2036,6,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2036,7,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R1,2036,9,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2036,10,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2036,11,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R1,2036,12,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2036,13,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R2,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R2,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,0.09690000000
-7,heat,R2,2034,2,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R2,2034,3,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2034,4,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2034,5,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R2,2034,6,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2034,8,heatpump,2024,all-year,all-week,late-afternoon,0.20670000000
-7,heat,R2,2034,9,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2034,10,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2034,11,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R2,2034,12,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2036,3,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2036,4,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2036,5,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R2,2036,6,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2036,7,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R2,2036,9,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2036,10,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2036,11,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R2,2036,12,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2036,13,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,CO2f,R1,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R1,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R2,2034,0,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
-7,CO2f,R2,2034,1,gasboiler,2024,all-year,all-week,late-afternoon,6.27150000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2034,0,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R1,2034,1,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R1,2034,2,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R1,2034,3,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R1,2034,4,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R1,2034,5,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R1,2034,6,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R1,2034,8,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R1,2034,9,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R1,2034,10,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R1,2034,11,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R1,2034,12,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R1,2036,3,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R1,2036,4,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R1,2036,5,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R1,2036,6,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R1,2036,7,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R1,2036,9,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R1,2036,10,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R1,2036,11,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R1,2036,12,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R1,2036,13,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R2,2034,0,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R2,2034,1,all-year,all-week,night,gasboiler,2024,0.04840000000
+0,heat,R2,2034,2,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R2,2034,3,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R2,2034,4,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R2,2034,5,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R2,2034,6,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R2,2034,8,all-year,all-week,night,heatpump,2024,0.10330000000
+0,heat,R2,2034,9,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R2,2034,10,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R2,2034,11,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R2,2034,12,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R2,2036,3,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R2,2036,4,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R2,2036,5,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R2,2036,6,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R2,2036,7,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R2,2036,9,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R2,2036,10,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R2,2036,11,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R2,2036,12,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R2,2036,13,all-year,all-week,night,heatpump,2034,0.19930000000
+0,CO2f,R1,2034,0,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R1,2034,1,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R2,2034,0,all-year,all-week,night,gasboiler,2024,3.13360000000
+0,CO2f,R2,2034,1,all-year,all-week,night,gasboiler,2024,3.13360000000
+1,heat,R1,2034,0,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R1,2034,1,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R1,2034,2,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R1,2034,3,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R1,2034,4,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R1,2034,5,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R1,2034,6,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R1,2034,8,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R1,2034,9,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R1,2034,10,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R1,2034,11,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R1,2034,12,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R1,2036,3,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R1,2036,4,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R1,2036,5,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R1,2036,6,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R1,2036,7,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R1,2036,9,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R1,2036,10,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R1,2036,11,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R1,2036,12,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R1,2036,13,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R2,2034,0,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R2,2034,1,all-year,all-week,morning,gasboiler,2024,0.07260000000
+1,heat,R2,2034,2,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R2,2034,3,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R2,2034,4,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R2,2034,5,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R2,2034,6,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R2,2034,8,all-year,all-week,morning,heatpump,2024,0.15490000000
+1,heat,R2,2034,9,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R2,2034,10,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R2,2034,11,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R2,2034,12,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R2,2036,3,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R2,2036,4,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R2,2036,5,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R2,2036,6,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R2,2036,7,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R2,2036,9,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R2,2036,10,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R2,2036,11,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R2,2036,12,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R2,2036,13,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,CO2f,R1,2034,0,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R1,2034,1,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R2,2034,0,all-year,all-week,morning,gasboiler,2024,4.70040000000
+1,CO2f,R2,2034,1,all-year,all-week,morning,gasboiler,2024,4.70040000000
+2,heat,R1,2034,0,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R1,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R1,2034,2,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R1,2034,3,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R1,2034,4,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R1,2034,5,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R1,2034,6,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R1,2034,8,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R1,2034,9,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R1,2034,10,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R1,2034,11,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R1,2034,12,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R1,2036,3,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R1,2036,4,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R1,2036,5,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R1,2036,6,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R1,2036,7,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R1,2036,9,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R1,2036,10,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R1,2036,11,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R1,2036,12,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R1,2036,13,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R2,2034,0,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R2,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,0.04840000000
+2,heat,R2,2034,2,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R2,2034,3,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R2,2034,4,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R2,2034,5,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R2,2034,6,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R2,2034,8,all-year,all-week,mid-afternoon,heatpump,2024,0.10330000000
+2,heat,R2,2034,9,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R2,2034,10,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R2,2034,11,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R2,2034,12,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R2,2036,3,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R2,2036,4,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R2,2036,5,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R2,2036,6,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R2,2036,7,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R2,2036,9,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R2,2036,10,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R2,2036,11,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R2,2036,12,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R2,2036,13,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,CO2f,R1,2034,0,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R1,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R2,2034,0,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+2,CO2f,R2,2034,1,all-year,all-week,mid-afternoon,gasboiler,2024,3.13360000000
+3,heat,R1,2034,0,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R1,2034,1,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R1,2034,2,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R1,2034,3,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R1,2034,4,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R1,2034,5,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R1,2034,6,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R1,2034,8,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R1,2034,9,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R1,2034,10,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R1,2034,11,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R1,2034,12,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R1,2036,3,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R1,2036,4,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R1,2036,5,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R1,2036,6,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R1,2036,7,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R1,2036,9,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R1,2036,10,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R1,2036,11,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R1,2036,12,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R1,2036,13,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R2,2034,0,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R2,2034,1,all-year,all-week,early-peak,gasboiler,2024,0.07260000000
+3,heat,R2,2034,2,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R2,2034,3,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R2,2034,4,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R2,2034,5,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R2,2034,6,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R2,2034,8,all-year,all-week,early-peak,heatpump,2024,0.15490000000
+3,heat,R2,2034,9,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R2,2034,10,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R2,2034,11,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R2,2034,12,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R2,2036,3,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R2,2036,4,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R2,2036,5,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R2,2036,6,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R2,2036,7,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R2,2036,9,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R2,2036,10,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R2,2036,11,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R2,2036,12,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R2,2036,13,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,CO2f,R1,2034,0,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R1,2034,1,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R2,2034,0,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+3,CO2f,R2,2034,1,all-year,all-week,early-peak,gasboiler,2024,4.70040000000
+4,heat,R1,2034,0,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R1,2034,1,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R1,2034,2,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R1,2034,3,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R1,2034,4,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R1,2034,5,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R1,2034,6,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R1,2034,8,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R1,2034,9,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R1,2034,10,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R1,2034,11,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R1,2034,12,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R1,2036,3,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R1,2036,4,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R1,2036,5,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R1,2036,6,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R1,2036,7,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R1,2036,9,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R1,2036,10,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R1,2036,11,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R1,2036,12,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R1,2036,13,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R2,2034,0,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R2,2034,1,all-year,all-week,late-peak,gasboiler,2024,0.14530000000
+4,heat,R2,2034,2,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R2,2034,3,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R2,2034,4,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R2,2034,5,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R2,2034,6,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R2,2034,8,all-year,all-week,late-peak,heatpump,2024,0.31000000000
+4,heat,R2,2034,9,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R2,2034,10,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R2,2034,11,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R2,2034,12,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R2,2036,3,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R2,2036,4,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R2,2036,5,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R2,2036,6,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R2,2036,7,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R2,2036,9,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R2,2036,10,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R2,2036,11,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R2,2036,12,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R2,2036,13,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,CO2f,R1,2034,0,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R1,2034,1,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R2,2034,0,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+4,CO2f,R2,2034,1,all-year,all-week,late-peak,gasboiler,2024,9.40510000000
+5,heat,R1,2034,0,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R1,2034,1,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R1,2034,2,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R1,2034,3,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R1,2034,4,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R1,2034,5,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R1,2034,6,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R1,2034,8,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R1,2034,9,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R1,2034,10,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R1,2034,11,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R1,2034,12,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R1,2036,3,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R1,2036,4,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R1,2036,5,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R1,2036,6,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R1,2036,7,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R1,2036,9,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R1,2036,10,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R1,2036,11,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R1,2036,12,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R1,2036,13,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R2,2034,0,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R2,2034,1,all-year,all-week,evening,gasboiler,2024,0.09690000000
+5,heat,R2,2034,2,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R2,2034,3,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R2,2034,4,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R2,2034,5,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R2,2034,6,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R2,2034,8,all-year,all-week,evening,heatpump,2024,0.20670000000
+5,heat,R2,2034,9,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R2,2034,10,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R2,2034,11,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R2,2034,12,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R2,2036,3,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R2,2036,4,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R2,2036,5,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R2,2036,6,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R2,2036,7,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R2,2036,9,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R2,2036,10,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R2,2036,11,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R2,2036,12,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R2,2036,13,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,CO2f,R1,2034,0,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R1,2034,1,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R2,2034,0,all-year,all-week,evening,gasboiler,2024,6.27150000000
+5,CO2f,R2,2034,1,all-year,all-week,evening,gasboiler,2024,6.27150000000
+6,heat,R1,2034,0,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R1,2034,1,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R1,2034,2,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R1,2034,3,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R1,2034,4,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R1,2034,5,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R1,2034,6,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R1,2034,8,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R1,2034,9,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R1,2034,10,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R1,2034,11,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R1,2034,12,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R1,2036,3,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R1,2036,4,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R1,2036,5,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R1,2036,6,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R1,2036,7,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R1,2036,9,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R1,2036,10,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R1,2036,11,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R1,2036,12,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R1,2036,13,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R2,2034,0,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R2,2034,1,all-year,all-week,early-morning,gasboiler,2024,0.09690000000
+6,heat,R2,2034,2,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R2,2034,3,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R2,2034,4,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R2,2034,5,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R2,2034,6,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R2,2034,8,all-year,all-week,early-morning,heatpump,2024,0.20670000000
+6,heat,R2,2034,9,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R2,2034,10,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R2,2034,11,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R2,2034,12,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R2,2036,3,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R2,2036,4,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R2,2036,5,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R2,2036,6,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R2,2036,7,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R2,2036,9,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R2,2036,10,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R2,2036,11,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R2,2036,12,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R2,2036,13,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,CO2f,R1,2034,0,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R1,2034,1,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R2,2034,0,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+6,CO2f,R2,2034,1,all-year,all-week,early-morning,gasboiler,2024,6.27150000000
+7,heat,R1,2034,0,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R1,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R1,2034,2,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R1,2034,3,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R1,2034,4,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R1,2034,5,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R1,2034,6,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R1,2034,8,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R1,2034,9,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R1,2034,10,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R1,2034,11,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R1,2034,12,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R1,2036,3,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R1,2036,4,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R1,2036,5,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R1,2036,6,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R1,2036,7,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R1,2036,9,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R1,2036,10,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R1,2036,11,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R1,2036,12,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R1,2036,13,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R2,2034,0,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R2,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,0.09690000000
+7,heat,R2,2034,2,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R2,2034,3,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R2,2034,4,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R2,2034,5,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R2,2034,6,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R2,2034,8,all-year,all-week,late-afternoon,heatpump,2024,0.20670000000
+7,heat,R2,2034,9,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R2,2034,10,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R2,2034,11,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R2,2034,12,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R2,2036,3,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R2,2036,4,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R2,2036,5,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R2,2036,6,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R2,2036,7,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R2,2036,9,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R2,2036,10,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R2,2036,11,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R2,2036,12,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R2,2036,13,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,CO2f,R1,2034,0,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R1,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R2,2034,0,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
+7,CO2f,R2,2034,1,all-year,all-week,late-afternoon,gasboiler,2024,6.27150000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2036.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2036.csv
index 121eb083c..e143766af 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2036.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2036.csv
@@ -1,321 +1,321 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2036,0,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R1,2036,1,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R1,2036,2,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R1,2036,3,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R1,2036,4,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R1,2036,6,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R1,2036,7,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R1,2036,8,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R1,2036,9,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R1,2036,10,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R1,2038,1,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R1,2038,2,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R1,2038,3,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R1,2038,4,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R1,2038,5,heatpump,2036,all-year,all-week,night,0.09520000000
-0,heat,R1,2038,7,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R1,2038,8,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R1,2038,9,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R1,2038,10,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R1,2038,11,heatpump,2036,all-year,all-week,night,0.09520000000
-0,heat,R2,2036,0,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R2,2036,1,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R2,2036,2,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R2,2036,3,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R2,2036,4,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R2,2036,6,heatpump,2026,all-year,all-week,night,0.04760000000
-0,heat,R2,2036,7,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R2,2036,8,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R2,2036,9,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R2,2036,10,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R2,2038,1,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R2,2038,2,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R2,2038,3,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R2,2038,4,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R2,2038,5,heatpump,2036,all-year,all-week,night,0.09520000000
-0,heat,R2,2038,7,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R2,2038,8,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R2,2038,9,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R2,2038,10,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R2,2038,11,heatpump,2036,all-year,all-week,night,0.09520000000
-1,heat,R1,2036,0,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R1,2036,1,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R1,2036,2,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R1,2036,3,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R1,2036,4,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R1,2036,6,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R1,2036,7,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R1,2036,8,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R1,2036,9,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R1,2036,10,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R1,2038,1,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R1,2038,2,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R1,2038,3,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R1,2038,4,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R1,2038,5,heatpump,2036,all-year,all-week,morning,0.14280000000
-1,heat,R1,2038,7,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R1,2038,8,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R1,2038,9,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R1,2038,10,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R1,2038,11,heatpump,2036,all-year,all-week,morning,0.14280000000
-1,heat,R2,2036,0,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R2,2036,1,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R2,2036,2,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R2,2036,3,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R2,2036,4,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R2,2036,6,heatpump,2026,all-year,all-week,morning,0.07140000000
-1,heat,R2,2036,7,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R2,2036,8,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R2,2036,9,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R2,2036,10,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R2,2038,1,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R2,2038,2,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R2,2038,3,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R2,2038,4,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R2,2038,5,heatpump,2036,all-year,all-week,morning,0.14280000000
-1,heat,R2,2038,7,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R2,2038,8,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R2,2038,9,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R2,2038,10,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R2,2038,11,heatpump,2036,all-year,all-week,morning,0.14280000000
-2,heat,R1,2036,0,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2036,1,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2036,2,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R1,2036,3,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2036,4,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R1,2036,6,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2036,7,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2036,8,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R1,2036,9,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2036,10,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R1,2038,1,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2038,2,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R1,2038,3,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2038,4,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R1,2038,5,heatpump,2036,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2038,7,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2038,8,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R1,2038,9,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2038,10,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R1,2038,11,heatpump,2036,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2036,0,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2036,1,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2036,2,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R2,2036,3,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2036,4,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R2,2036,6,heatpump,2026,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2036,7,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2036,8,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R2,2036,9,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2036,10,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R2,2038,1,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2038,2,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R2,2038,3,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2038,4,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R2,2038,5,heatpump,2036,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2038,7,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2038,8,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R2,2038,9,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2038,10,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R2,2038,11,heatpump,2036,all-year,all-week,mid-afternoon,0.09520000000
-3,heat,R1,2036,0,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2036,1,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2036,2,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R1,2036,3,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2036,4,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R1,2036,6,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2036,7,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2036,8,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R1,2036,9,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2036,10,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R1,2038,1,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2038,2,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R1,2038,3,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2038,4,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R1,2038,5,heatpump,2036,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2038,7,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2038,8,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R1,2038,9,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2038,10,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R1,2038,11,heatpump,2036,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2036,0,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2036,1,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2036,2,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R2,2036,3,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2036,4,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R2,2036,6,heatpump,2026,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2036,7,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2036,8,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R2,2036,9,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2036,10,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R2,2038,1,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2038,2,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R2,2038,3,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2038,4,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R2,2038,5,heatpump,2036,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2038,7,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2038,8,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R2,2038,9,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2038,10,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R2,2038,11,heatpump,2036,all-year,all-week,early-peak,0.14280000000
-4,heat,R1,2036,0,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2036,1,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2036,2,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R1,2036,3,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2036,4,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R1,2036,6,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2036,7,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2036,8,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R1,2036,9,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2036,10,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R1,2038,1,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2038,2,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R1,2038,3,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2038,4,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R1,2038,5,heatpump,2036,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2038,7,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2038,8,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R1,2038,9,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2038,10,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R1,2038,11,heatpump,2036,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2036,0,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2036,1,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2036,2,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R2,2036,3,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2036,4,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R2,2036,6,heatpump,2026,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2036,7,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2036,8,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R2,2036,9,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2036,10,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R2,2038,1,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2038,2,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R2,2038,3,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2038,4,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R2,2038,5,heatpump,2036,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2038,7,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2038,8,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R2,2038,9,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2038,10,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R2,2038,11,heatpump,2036,all-year,all-week,late-peak,0.28570000000
-5,heat,R1,2036,0,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R1,2036,1,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R1,2036,2,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R1,2036,3,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R1,2036,4,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R1,2036,6,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R1,2036,7,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R1,2036,8,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R1,2036,9,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R1,2036,10,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R1,2038,1,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R1,2038,2,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R1,2038,3,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R1,2038,4,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R1,2038,5,heatpump,2036,all-year,all-week,evening,0.19050000000
-5,heat,R1,2038,7,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R1,2038,8,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R1,2038,9,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R1,2038,10,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R1,2038,11,heatpump,2036,all-year,all-week,evening,0.19050000000
-5,heat,R2,2036,0,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R2,2036,1,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R2,2036,2,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R2,2036,3,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R2,2036,4,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R2,2036,6,heatpump,2026,all-year,all-week,evening,0.09530000000
-5,heat,R2,2036,7,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R2,2036,8,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R2,2036,9,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R2,2036,10,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R2,2038,1,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R2,2038,2,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R2,2038,3,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R2,2038,4,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R2,2038,5,heatpump,2036,all-year,all-week,evening,0.19050000000
-5,heat,R2,2038,7,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R2,2038,8,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R2,2038,9,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R2,2038,10,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R2,2038,11,heatpump,2036,all-year,all-week,evening,0.19050000000
-6,heat,R1,2036,0,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2036,1,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2036,2,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R1,2036,3,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2036,4,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R1,2036,6,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2036,7,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2036,8,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R1,2036,9,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2036,10,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R1,2038,1,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2038,2,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R1,2038,3,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2038,4,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R1,2038,5,heatpump,2036,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2038,7,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2038,8,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R1,2038,9,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2038,10,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R1,2038,11,heatpump,2036,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2036,0,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2036,1,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2036,2,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R2,2036,3,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2036,4,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R2,2036,6,heatpump,2026,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2036,7,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2036,8,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R2,2036,9,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2036,10,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R2,2038,1,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2038,2,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R2,2038,3,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2038,4,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R2,2038,5,heatpump,2036,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2038,7,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2038,8,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R2,2038,9,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2038,10,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R2,2038,11,heatpump,2036,all-year,all-week,early-morning,0.19050000000
-7,heat,R1,2036,0,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2036,1,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2036,2,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R1,2036,3,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2036,4,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R1,2036,6,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2036,7,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2036,8,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R1,2036,9,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2036,10,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R1,2038,1,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2038,2,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R1,2038,3,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2038,4,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R1,2038,5,heatpump,2036,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2038,7,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2038,8,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R1,2038,9,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2038,10,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R1,2038,11,heatpump,2036,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2036,0,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2036,1,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2036,2,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R2,2036,3,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2036,4,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R2,2036,6,heatpump,2026,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2036,7,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2036,8,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R2,2036,9,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2036,10,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R2,2038,1,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2038,2,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R2,2038,3,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2038,4,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R2,2038,5,heatpump,2036,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2038,7,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2038,8,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R2,2038,9,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2038,10,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R2,2038,11,heatpump,2036,all-year,all-week,late-afternoon,0.19050000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2036,0,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R1,2036,1,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R1,2036,2,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R1,2036,3,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R1,2036,4,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R1,2036,6,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R1,2036,7,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R1,2036,8,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R1,2036,9,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R1,2036,10,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R1,2038,1,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R1,2038,2,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R1,2038,3,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R1,2038,4,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R1,2038,5,all-year,all-week,night,heatpump,2036,0.09520000000
+0,heat,R1,2038,7,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R1,2038,8,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R1,2038,9,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R1,2038,10,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R1,2038,11,all-year,all-week,night,heatpump,2036,0.09520000000
+0,heat,R2,2036,0,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R2,2036,1,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R2,2036,2,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R2,2036,3,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R2,2036,4,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R2,2036,6,all-year,all-week,night,heatpump,2026,0.04760000000
+0,heat,R2,2036,7,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R2,2036,8,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R2,2036,9,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R2,2036,10,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R2,2038,1,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R2,2038,2,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R2,2038,3,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R2,2038,4,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R2,2038,5,all-year,all-week,night,heatpump,2036,0.09520000000
+0,heat,R2,2038,7,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R2,2038,8,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R2,2038,9,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R2,2038,10,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R2,2038,11,all-year,all-week,night,heatpump,2036,0.09520000000
+1,heat,R1,2036,0,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R1,2036,1,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R1,2036,2,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R1,2036,3,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R1,2036,4,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R1,2036,6,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R1,2036,7,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R1,2036,8,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R1,2036,9,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R1,2036,10,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R1,2038,1,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R1,2038,2,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R1,2038,3,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R1,2038,4,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R1,2038,5,all-year,all-week,morning,heatpump,2036,0.14280000000
+1,heat,R1,2038,7,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R1,2038,8,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R1,2038,9,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R1,2038,10,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R1,2038,11,all-year,all-week,morning,heatpump,2036,0.14280000000
+1,heat,R2,2036,0,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R2,2036,1,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R2,2036,2,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R2,2036,3,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R2,2036,4,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R2,2036,6,all-year,all-week,morning,heatpump,2026,0.07140000000
+1,heat,R2,2036,7,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R2,2036,8,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R2,2036,9,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R2,2036,10,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R2,2038,1,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R2,2038,2,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R2,2038,3,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R2,2038,4,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R2,2038,5,all-year,all-week,morning,heatpump,2036,0.14280000000
+1,heat,R2,2038,7,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R2,2038,8,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R2,2038,9,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R2,2038,10,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R2,2038,11,all-year,all-week,morning,heatpump,2036,0.14280000000
+2,heat,R1,2036,0,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R1,2036,1,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R1,2036,2,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R1,2036,3,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R1,2036,4,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R1,2036,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R1,2036,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R1,2036,8,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R1,2036,9,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R1,2036,10,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R1,2038,1,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R1,2038,2,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R1,2038,3,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R1,2038,4,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R1,2038,5,all-year,all-week,mid-afternoon,heatpump,2036,0.09520000000
+2,heat,R1,2038,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R1,2038,8,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R1,2038,9,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R1,2038,10,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R1,2038,11,all-year,all-week,mid-afternoon,heatpump,2036,0.09520000000
+2,heat,R2,2036,0,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R2,2036,1,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R2,2036,2,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R2,2036,3,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R2,2036,4,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R2,2036,6,all-year,all-week,mid-afternoon,heatpump,2026,0.04760000000
+2,heat,R2,2036,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R2,2036,8,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R2,2036,9,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R2,2036,10,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R2,2038,1,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R2,2038,2,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R2,2038,3,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R2,2038,4,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R2,2038,5,all-year,all-week,mid-afternoon,heatpump,2036,0.09520000000
+2,heat,R2,2038,7,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R2,2038,8,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R2,2038,9,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R2,2038,10,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R2,2038,11,all-year,all-week,mid-afternoon,heatpump,2036,0.09520000000
+3,heat,R1,2036,0,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R1,2036,1,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R1,2036,2,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R1,2036,3,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R1,2036,4,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R1,2036,6,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R1,2036,7,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R1,2036,8,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R1,2036,9,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R1,2036,10,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R1,2038,1,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R1,2038,2,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R1,2038,3,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R1,2038,4,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R1,2038,5,all-year,all-week,early-peak,heatpump,2036,0.14280000000
+3,heat,R1,2038,7,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R1,2038,8,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R1,2038,9,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R1,2038,10,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R1,2038,11,all-year,all-week,early-peak,heatpump,2036,0.14280000000
+3,heat,R2,2036,0,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R2,2036,1,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R2,2036,2,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R2,2036,3,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R2,2036,4,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R2,2036,6,all-year,all-week,early-peak,heatpump,2026,0.07140000000
+3,heat,R2,2036,7,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R2,2036,8,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R2,2036,9,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R2,2036,10,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R2,2038,1,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R2,2038,2,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R2,2038,3,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R2,2038,4,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R2,2038,5,all-year,all-week,early-peak,heatpump,2036,0.14280000000
+3,heat,R2,2038,7,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R2,2038,8,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R2,2038,9,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R2,2038,10,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R2,2038,11,all-year,all-week,early-peak,heatpump,2036,0.14280000000
+4,heat,R1,2036,0,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R1,2036,1,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R1,2036,2,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R1,2036,3,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R1,2036,4,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R1,2036,6,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R1,2036,7,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R1,2036,8,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R1,2036,9,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R1,2036,10,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R1,2038,1,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R1,2038,2,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R1,2038,3,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R1,2038,4,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R1,2038,5,all-year,all-week,late-peak,heatpump,2036,0.28570000000
+4,heat,R1,2038,7,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R1,2038,8,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R1,2038,9,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R1,2038,10,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R1,2038,11,all-year,all-week,late-peak,heatpump,2036,0.28570000000
+4,heat,R2,2036,0,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R2,2036,1,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R2,2036,2,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R2,2036,3,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R2,2036,4,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R2,2036,6,all-year,all-week,late-peak,heatpump,2026,0.14290000000
+4,heat,R2,2036,7,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R2,2036,8,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R2,2036,9,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R2,2036,10,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R2,2038,1,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R2,2038,2,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R2,2038,3,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R2,2038,4,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R2,2038,5,all-year,all-week,late-peak,heatpump,2036,0.28570000000
+4,heat,R2,2038,7,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R2,2038,8,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R2,2038,9,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R2,2038,10,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R2,2038,11,all-year,all-week,late-peak,heatpump,2036,0.28570000000
+5,heat,R1,2036,0,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R1,2036,1,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R1,2036,2,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R1,2036,3,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R1,2036,4,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R1,2036,6,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R1,2036,7,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R1,2036,8,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R1,2036,9,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R1,2036,10,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R1,2038,1,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R1,2038,2,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R1,2038,3,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R1,2038,4,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R1,2038,5,all-year,all-week,evening,heatpump,2036,0.19050000000
+5,heat,R1,2038,7,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R1,2038,8,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R1,2038,9,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R1,2038,10,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R1,2038,11,all-year,all-week,evening,heatpump,2036,0.19050000000
+5,heat,R2,2036,0,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R2,2036,1,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R2,2036,2,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R2,2036,3,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R2,2036,4,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R2,2036,6,all-year,all-week,evening,heatpump,2026,0.09530000000
+5,heat,R2,2036,7,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R2,2036,8,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R2,2036,9,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R2,2036,10,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R2,2038,1,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R2,2038,2,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R2,2038,3,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R2,2038,4,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R2,2038,5,all-year,all-week,evening,heatpump,2036,0.19050000000
+5,heat,R2,2038,7,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R2,2038,8,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R2,2038,9,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R2,2038,10,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R2,2038,11,all-year,all-week,evening,heatpump,2036,0.19050000000
+6,heat,R1,2036,0,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R1,2036,1,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R1,2036,2,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R1,2036,3,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R1,2036,4,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R1,2036,6,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R1,2036,7,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R1,2036,8,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R1,2036,9,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R1,2036,10,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R1,2038,1,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R1,2038,2,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R1,2038,3,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R1,2038,4,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R1,2038,5,all-year,all-week,early-morning,heatpump,2036,0.19050000000
+6,heat,R1,2038,7,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R1,2038,8,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R1,2038,9,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R1,2038,10,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R1,2038,11,all-year,all-week,early-morning,heatpump,2036,0.19050000000
+6,heat,R2,2036,0,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R2,2036,1,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R2,2036,2,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R2,2036,3,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R2,2036,4,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R2,2036,6,all-year,all-week,early-morning,heatpump,2026,0.09530000000
+6,heat,R2,2036,7,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R2,2036,8,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R2,2036,9,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R2,2036,10,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R2,2038,1,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R2,2038,2,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R2,2038,3,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R2,2038,4,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R2,2038,5,all-year,all-week,early-morning,heatpump,2036,0.19050000000
+6,heat,R2,2038,7,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R2,2038,8,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R2,2038,9,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R2,2038,10,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R2,2038,11,all-year,all-week,early-morning,heatpump,2036,0.19050000000
+7,heat,R1,2036,0,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R1,2036,1,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R1,2036,2,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R1,2036,3,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R1,2036,4,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R1,2036,6,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R1,2036,7,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R1,2036,8,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R1,2036,9,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R1,2036,10,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R1,2038,1,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R1,2038,2,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R1,2038,3,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R1,2038,4,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R1,2038,5,all-year,all-week,late-afternoon,heatpump,2036,0.19050000000
+7,heat,R1,2038,7,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R1,2038,8,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R1,2038,9,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R1,2038,10,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R1,2038,11,all-year,all-week,late-afternoon,heatpump,2036,0.19050000000
+7,heat,R2,2036,0,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R2,2036,1,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R2,2036,2,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R2,2036,3,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R2,2036,4,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R2,2036,6,all-year,all-week,late-afternoon,heatpump,2026,0.09530000000
+7,heat,R2,2036,7,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R2,2036,8,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R2,2036,9,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R2,2036,10,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R2,2038,1,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R2,2038,2,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R2,2038,3,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R2,2038,4,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R2,2038,5,all-year,all-week,late-afternoon,heatpump,2036,0.19050000000
+7,heat,R2,2038,7,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R2,2038,8,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R2,2038,9,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R2,2038,10,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R2,2038,11,all-year,all-week,late-afternoon,heatpump,2036,0.19050000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2038.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2038.csv
index 89992632f..d2c29412c 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2038.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2038.csv
@@ -1,321 +1,321 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2038,0,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R1,2038,1,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R1,2038,2,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R1,2038,3,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R1,2038,4,heatpump,2036,all-year,all-week,night,0.09520000000
-0,heat,R1,2038,6,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R1,2038,7,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R1,2038,8,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R1,2038,9,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R1,2038,10,heatpump,2036,all-year,all-week,night,0.09520000000
-0,heat,R1,2040,1,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R1,2040,2,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R1,2040,3,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R1,2040,4,heatpump,2036,all-year,all-week,night,0.09520000000
-0,heat,R1,2040,5,heatpump,2038,all-year,all-week,night,0.09520000000
-0,heat,R1,2040,7,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R1,2040,8,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R1,2040,9,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R1,2040,10,heatpump,2036,all-year,all-week,night,0.09520000000
-0,heat,R1,2040,11,heatpump,2038,all-year,all-week,night,0.09520000000
-0,heat,R2,2038,0,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R2,2038,1,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R2,2038,2,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R2,2038,3,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R2,2038,4,heatpump,2036,all-year,all-week,night,0.09520000000
-0,heat,R2,2038,6,heatpump,2028,all-year,all-week,night,0.04760000000
-0,heat,R2,2038,7,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R2,2038,8,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R2,2038,9,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R2,2038,10,heatpump,2036,all-year,all-week,night,0.09520000000
-0,heat,R2,2040,1,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R2,2040,2,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R2,2040,3,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R2,2040,4,heatpump,2036,all-year,all-week,night,0.09520000000
-0,heat,R2,2040,5,heatpump,2038,all-year,all-week,night,0.09520000000
-0,heat,R2,2040,7,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R2,2040,8,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R2,2040,9,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R2,2040,10,heatpump,2036,all-year,all-week,night,0.09520000000
-0,heat,R2,2040,11,heatpump,2038,all-year,all-week,night,0.09520000000
-1,heat,R1,2038,0,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R1,2038,1,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R1,2038,2,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R1,2038,3,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R1,2038,4,heatpump,2036,all-year,all-week,morning,0.14280000000
-1,heat,R1,2038,6,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R1,2038,7,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R1,2038,8,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R1,2038,9,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R1,2038,10,heatpump,2036,all-year,all-week,morning,0.14280000000
-1,heat,R1,2040,1,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R1,2040,2,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R1,2040,3,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R1,2040,4,heatpump,2036,all-year,all-week,morning,0.14280000000
-1,heat,R1,2040,5,heatpump,2038,all-year,all-week,morning,0.14280000000
-1,heat,R1,2040,7,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R1,2040,8,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R1,2040,9,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R1,2040,10,heatpump,2036,all-year,all-week,morning,0.14280000000
-1,heat,R1,2040,11,heatpump,2038,all-year,all-week,morning,0.14280000000
-1,heat,R2,2038,0,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R2,2038,1,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R2,2038,2,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R2,2038,3,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R2,2038,4,heatpump,2036,all-year,all-week,morning,0.14280000000
-1,heat,R2,2038,6,heatpump,2028,all-year,all-week,morning,0.07140000000
-1,heat,R2,2038,7,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R2,2038,8,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R2,2038,9,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R2,2038,10,heatpump,2036,all-year,all-week,morning,0.14280000000
-1,heat,R2,2040,1,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R2,2040,2,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R2,2040,3,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R2,2040,4,heatpump,2036,all-year,all-week,morning,0.14280000000
-1,heat,R2,2040,5,heatpump,2038,all-year,all-week,morning,0.14280000000
-1,heat,R2,2040,7,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R2,2040,8,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R2,2040,9,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R2,2040,10,heatpump,2036,all-year,all-week,morning,0.14280000000
-1,heat,R2,2040,11,heatpump,2038,all-year,all-week,morning,0.14280000000
-2,heat,R1,2038,0,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2038,1,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R1,2038,2,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2038,3,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R1,2038,4,heatpump,2036,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2038,6,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R1,2038,7,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R1,2038,8,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2038,9,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R1,2038,10,heatpump,2036,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2040,1,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R1,2040,2,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2040,3,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R1,2040,4,heatpump,2036,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2040,5,heatpump,2038,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2040,7,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R1,2040,8,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2040,9,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R1,2040,10,heatpump,2036,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2040,11,heatpump,2038,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2038,0,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2038,1,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R2,2038,2,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2038,3,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R2,2038,4,heatpump,2036,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2038,6,heatpump,2028,all-year,all-week,mid-afternoon,0.04760000000
-2,heat,R2,2038,7,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R2,2038,8,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2038,9,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R2,2038,10,heatpump,2036,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2040,1,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R2,2040,2,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2040,3,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R2,2040,4,heatpump,2036,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2040,5,heatpump,2038,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2040,7,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R2,2040,8,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2040,9,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R2,2040,10,heatpump,2036,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2040,11,heatpump,2038,all-year,all-week,mid-afternoon,0.09520000000
-3,heat,R1,2038,0,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2038,1,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R1,2038,2,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2038,3,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R1,2038,4,heatpump,2036,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2038,6,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R1,2038,7,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R1,2038,8,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2038,9,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R1,2038,10,heatpump,2036,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2040,1,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R1,2040,2,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2040,3,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R1,2040,4,heatpump,2036,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2040,5,heatpump,2038,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2040,7,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R1,2040,8,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2040,9,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R1,2040,10,heatpump,2036,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2040,11,heatpump,2038,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2038,0,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2038,1,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R2,2038,2,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2038,3,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R2,2038,4,heatpump,2036,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2038,6,heatpump,2028,all-year,all-week,early-peak,0.07140000000
-3,heat,R2,2038,7,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R2,2038,8,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2038,9,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R2,2038,10,heatpump,2036,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2040,1,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R2,2040,2,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2040,3,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R2,2040,4,heatpump,2036,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2040,5,heatpump,2038,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2040,7,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R2,2040,8,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2040,9,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R2,2040,10,heatpump,2036,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2040,11,heatpump,2038,all-year,all-week,early-peak,0.14280000000
-4,heat,R1,2038,0,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2038,1,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R1,2038,2,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2038,3,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R1,2038,4,heatpump,2036,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2038,6,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R1,2038,7,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R1,2038,8,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2038,9,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R1,2038,10,heatpump,2036,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2040,1,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R1,2040,2,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2040,3,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R1,2040,4,heatpump,2036,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2040,5,heatpump,2038,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2040,7,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R1,2040,8,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2040,9,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R1,2040,10,heatpump,2036,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2040,11,heatpump,2038,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2038,0,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2038,1,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R2,2038,2,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2038,3,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R2,2038,4,heatpump,2036,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2038,6,heatpump,2028,all-year,all-week,late-peak,0.14290000000
-4,heat,R2,2038,7,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R2,2038,8,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2038,9,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R2,2038,10,heatpump,2036,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2040,1,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R2,2040,2,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2040,3,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R2,2040,4,heatpump,2036,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2040,5,heatpump,2038,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2040,7,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R2,2040,8,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2040,9,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R2,2040,10,heatpump,2036,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2040,11,heatpump,2038,all-year,all-week,late-peak,0.28570000000
-5,heat,R1,2038,0,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R1,2038,1,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R1,2038,2,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R1,2038,3,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R1,2038,4,heatpump,2036,all-year,all-week,evening,0.19050000000
-5,heat,R1,2038,6,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R1,2038,7,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R1,2038,8,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R1,2038,9,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R1,2038,10,heatpump,2036,all-year,all-week,evening,0.19050000000
-5,heat,R1,2040,1,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R1,2040,2,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R1,2040,3,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R1,2040,4,heatpump,2036,all-year,all-week,evening,0.19050000000
-5,heat,R1,2040,5,heatpump,2038,all-year,all-week,evening,0.19050000000
-5,heat,R1,2040,7,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R1,2040,8,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R1,2040,9,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R1,2040,10,heatpump,2036,all-year,all-week,evening,0.19050000000
-5,heat,R1,2040,11,heatpump,2038,all-year,all-week,evening,0.19050000000
-5,heat,R2,2038,0,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R2,2038,1,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R2,2038,2,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R2,2038,3,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R2,2038,4,heatpump,2036,all-year,all-week,evening,0.19050000000
-5,heat,R2,2038,6,heatpump,2028,all-year,all-week,evening,0.09530000000
-5,heat,R2,2038,7,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R2,2038,8,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R2,2038,9,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R2,2038,10,heatpump,2036,all-year,all-week,evening,0.19050000000
-5,heat,R2,2040,1,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R2,2040,2,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R2,2040,3,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R2,2040,4,heatpump,2036,all-year,all-week,evening,0.19050000000
-5,heat,R2,2040,5,heatpump,2038,all-year,all-week,evening,0.19050000000
-5,heat,R2,2040,7,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R2,2040,8,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R2,2040,9,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R2,2040,10,heatpump,2036,all-year,all-week,evening,0.19050000000
-5,heat,R2,2040,11,heatpump,2038,all-year,all-week,evening,0.19050000000
-6,heat,R1,2038,0,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2038,1,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R1,2038,2,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2038,3,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R1,2038,4,heatpump,2036,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2038,6,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R1,2038,7,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R1,2038,8,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2038,9,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R1,2038,10,heatpump,2036,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2040,1,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R1,2040,2,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2040,3,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R1,2040,4,heatpump,2036,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2040,5,heatpump,2038,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2040,7,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R1,2040,8,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2040,9,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R1,2040,10,heatpump,2036,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2040,11,heatpump,2038,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2038,0,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2038,1,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R2,2038,2,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2038,3,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R2,2038,4,heatpump,2036,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2038,6,heatpump,2028,all-year,all-week,early-morning,0.09530000000
-6,heat,R2,2038,7,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R2,2038,8,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2038,9,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R2,2038,10,heatpump,2036,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2040,1,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R2,2040,2,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2040,3,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R2,2040,4,heatpump,2036,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2040,5,heatpump,2038,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2040,7,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R2,2040,8,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2040,9,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R2,2040,10,heatpump,2036,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2040,11,heatpump,2038,all-year,all-week,early-morning,0.19050000000
-7,heat,R1,2038,0,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2038,1,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R1,2038,2,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2038,3,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R1,2038,4,heatpump,2036,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2038,6,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R1,2038,7,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R1,2038,8,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2038,9,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R1,2038,10,heatpump,2036,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2040,1,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R1,2040,2,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2040,3,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R1,2040,4,heatpump,2036,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2040,5,heatpump,2038,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2040,7,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R1,2040,8,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2040,9,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R1,2040,10,heatpump,2036,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2040,11,heatpump,2038,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2038,0,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2038,1,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R2,2038,2,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2038,3,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R2,2038,4,heatpump,2036,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2038,6,heatpump,2028,all-year,all-week,late-afternoon,0.09530000000
-7,heat,R2,2038,7,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R2,2038,8,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2038,9,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R2,2038,10,heatpump,2036,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2040,1,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R2,2040,2,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2040,3,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R2,2040,4,heatpump,2036,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2040,5,heatpump,2038,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2040,7,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R2,2040,8,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2040,9,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R2,2040,10,heatpump,2036,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2040,11,heatpump,2038,all-year,all-week,late-afternoon,0.19050000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2038,0,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R1,2038,1,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R1,2038,2,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R1,2038,3,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R1,2038,4,all-year,all-week,night,heatpump,2036,0.09520000000
+0,heat,R1,2038,6,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R1,2038,7,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R1,2038,8,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R1,2038,9,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R1,2038,10,all-year,all-week,night,heatpump,2036,0.09520000000
+0,heat,R1,2040,1,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R1,2040,2,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R1,2040,3,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R1,2040,4,all-year,all-week,night,heatpump,2036,0.09520000000
+0,heat,R1,2040,5,all-year,all-week,night,heatpump,2038,0.09520000000
+0,heat,R1,2040,7,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R1,2040,8,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R1,2040,10,all-year,all-week,night,heatpump,2036,0.09520000000
+0,heat,R1,2040,11,all-year,all-week,night,heatpump,2038,0.09520000000
+0,heat,R2,2038,0,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R2,2038,1,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R2,2038,2,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R2,2038,3,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R2,2038,4,all-year,all-week,night,heatpump,2036,0.09520000000
+0,heat,R2,2038,6,all-year,all-week,night,heatpump,2028,0.04760000000
+0,heat,R2,2038,7,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R2,2038,8,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R2,2038,9,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R2,2038,10,all-year,all-week,night,heatpump,2036,0.09520000000
+0,heat,R2,2040,1,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R2,2040,2,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R2,2040,3,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R2,2040,4,all-year,all-week,night,heatpump,2036,0.09520000000
+0,heat,R2,2040,5,all-year,all-week,night,heatpump,2038,0.09520000000
+0,heat,R2,2040,7,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R2,2040,8,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R2,2040,10,all-year,all-week,night,heatpump,2036,0.09520000000
+0,heat,R2,2040,11,all-year,all-week,night,heatpump,2038,0.09520000000
+1,heat,R1,2038,0,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R1,2038,1,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R1,2038,2,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R1,2038,3,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R1,2038,4,all-year,all-week,morning,heatpump,2036,0.14280000000
+1,heat,R1,2038,6,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R1,2038,7,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R1,2038,8,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R1,2038,9,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R1,2038,10,all-year,all-week,morning,heatpump,2036,0.14280000000
+1,heat,R1,2040,1,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R1,2040,2,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2036,0.14280000000
+1,heat,R1,2040,5,all-year,all-week,morning,heatpump,2038,0.14280000000
+1,heat,R1,2040,7,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2036,0.14280000000
+1,heat,R1,2040,11,all-year,all-week,morning,heatpump,2038,0.14280000000
+1,heat,R2,2038,0,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R2,2038,1,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R2,2038,2,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R2,2038,3,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R2,2038,4,all-year,all-week,morning,heatpump,2036,0.14280000000
+1,heat,R2,2038,6,all-year,all-week,morning,heatpump,2028,0.07140000000
+1,heat,R2,2038,7,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R2,2038,8,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R2,2038,9,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R2,2038,10,all-year,all-week,morning,heatpump,2036,0.14280000000
+1,heat,R2,2040,1,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R2,2040,2,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2036,0.14280000000
+1,heat,R2,2040,5,all-year,all-week,morning,heatpump,2038,0.14280000000
+1,heat,R2,2040,7,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2036,0.14280000000
+1,heat,R2,2040,11,all-year,all-week,morning,heatpump,2038,0.14280000000
+2,heat,R1,2038,0,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R1,2038,1,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R1,2038,2,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R1,2038,3,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R1,2038,4,all-year,all-week,mid-afternoon,heatpump,2036,0.09520000000
+2,heat,R1,2038,6,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R1,2038,7,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R1,2038,8,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R1,2038,9,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R1,2038,10,all-year,all-week,mid-afternoon,heatpump,2036,0.09520000000
+2,heat,R1,2040,1,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R1,2040,2,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R1,2040,3,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R1,2040,4,all-year,all-week,mid-afternoon,heatpump,2036,0.09520000000
+2,heat,R1,2040,5,all-year,all-week,mid-afternoon,heatpump,2038,0.09520000000
+2,heat,R1,2040,7,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2036,0.09520000000
+2,heat,R1,2040,11,all-year,all-week,mid-afternoon,heatpump,2038,0.09520000000
+2,heat,R2,2038,0,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R2,2038,1,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R2,2038,2,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R2,2038,3,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R2,2038,4,all-year,all-week,mid-afternoon,heatpump,2036,0.09520000000
+2,heat,R2,2038,6,all-year,all-week,mid-afternoon,heatpump,2028,0.04760000000
+2,heat,R2,2038,7,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R2,2038,8,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R2,2038,9,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R2,2038,10,all-year,all-week,mid-afternoon,heatpump,2036,0.09520000000
+2,heat,R2,2040,1,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R2,2040,2,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R2,2040,3,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R2,2040,4,all-year,all-week,mid-afternoon,heatpump,2036,0.09520000000
+2,heat,R2,2040,5,all-year,all-week,mid-afternoon,heatpump,2038,0.09520000000
+2,heat,R2,2040,7,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2036,0.09520000000
+2,heat,R2,2040,11,all-year,all-week,mid-afternoon,heatpump,2038,0.09520000000
+3,heat,R1,2038,0,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R1,2038,1,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R1,2038,2,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R1,2038,3,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R1,2038,4,all-year,all-week,early-peak,heatpump,2036,0.14280000000
+3,heat,R1,2038,6,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R1,2038,7,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R1,2038,8,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R1,2038,9,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R1,2038,10,all-year,all-week,early-peak,heatpump,2036,0.14280000000
+3,heat,R1,2040,1,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R1,2040,2,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2036,0.14280000000
+3,heat,R1,2040,5,all-year,all-week,early-peak,heatpump,2038,0.14280000000
+3,heat,R1,2040,7,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2036,0.14280000000
+3,heat,R1,2040,11,all-year,all-week,early-peak,heatpump,2038,0.14280000000
+3,heat,R2,2038,0,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R2,2038,1,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R2,2038,2,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R2,2038,3,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R2,2038,4,all-year,all-week,early-peak,heatpump,2036,0.14280000000
+3,heat,R2,2038,6,all-year,all-week,early-peak,heatpump,2028,0.07140000000
+3,heat,R2,2038,7,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R2,2038,8,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R2,2038,9,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R2,2038,10,all-year,all-week,early-peak,heatpump,2036,0.14280000000
+3,heat,R2,2040,1,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R2,2040,2,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2036,0.14280000000
+3,heat,R2,2040,5,all-year,all-week,early-peak,heatpump,2038,0.14280000000
+3,heat,R2,2040,7,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2036,0.14280000000
+3,heat,R2,2040,11,all-year,all-week,early-peak,heatpump,2038,0.14280000000
+4,heat,R1,2038,0,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R1,2038,1,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R1,2038,2,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R1,2038,3,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R1,2038,4,all-year,all-week,late-peak,heatpump,2036,0.28570000000
+4,heat,R1,2038,6,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R1,2038,7,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R1,2038,8,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R1,2038,9,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R1,2038,10,all-year,all-week,late-peak,heatpump,2036,0.28570000000
+4,heat,R1,2040,1,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R1,2040,2,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2036,0.28570000000
+4,heat,R1,2040,5,all-year,all-week,late-peak,heatpump,2038,0.28570000000
+4,heat,R1,2040,7,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2036,0.28570000000
+4,heat,R1,2040,11,all-year,all-week,late-peak,heatpump,2038,0.28570000000
+4,heat,R2,2038,0,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R2,2038,1,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R2,2038,2,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R2,2038,3,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R2,2038,4,all-year,all-week,late-peak,heatpump,2036,0.28570000000
+4,heat,R2,2038,6,all-year,all-week,late-peak,heatpump,2028,0.14290000000
+4,heat,R2,2038,7,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R2,2038,8,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R2,2038,9,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R2,2038,10,all-year,all-week,late-peak,heatpump,2036,0.28570000000
+4,heat,R2,2040,1,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R2,2040,2,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2036,0.28570000000
+4,heat,R2,2040,5,all-year,all-week,late-peak,heatpump,2038,0.28570000000
+4,heat,R2,2040,7,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2036,0.28570000000
+4,heat,R2,2040,11,all-year,all-week,late-peak,heatpump,2038,0.28570000000
+5,heat,R1,2038,0,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R1,2038,1,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R1,2038,2,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R1,2038,3,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R1,2038,4,all-year,all-week,evening,heatpump,2036,0.19050000000
+5,heat,R1,2038,6,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R1,2038,7,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R1,2038,8,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R1,2038,9,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R1,2038,10,all-year,all-week,evening,heatpump,2036,0.19050000000
+5,heat,R1,2040,1,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R1,2040,2,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2036,0.19050000000
+5,heat,R1,2040,5,all-year,all-week,evening,heatpump,2038,0.19050000000
+5,heat,R1,2040,7,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2036,0.19050000000
+5,heat,R1,2040,11,all-year,all-week,evening,heatpump,2038,0.19050000000
+5,heat,R2,2038,0,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R2,2038,1,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R2,2038,2,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R2,2038,3,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R2,2038,4,all-year,all-week,evening,heatpump,2036,0.19050000000
+5,heat,R2,2038,6,all-year,all-week,evening,heatpump,2028,0.09530000000
+5,heat,R2,2038,7,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R2,2038,8,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R2,2038,9,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R2,2038,10,all-year,all-week,evening,heatpump,2036,0.19050000000
+5,heat,R2,2040,1,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R2,2040,2,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2036,0.19050000000
+5,heat,R2,2040,5,all-year,all-week,evening,heatpump,2038,0.19050000000
+5,heat,R2,2040,7,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2036,0.19050000000
+5,heat,R2,2040,11,all-year,all-week,evening,heatpump,2038,0.19050000000
+6,heat,R1,2038,0,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R1,2038,1,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R1,2038,2,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R1,2038,3,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R1,2038,4,all-year,all-week,early-morning,heatpump,2036,0.19050000000
+6,heat,R1,2038,6,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R1,2038,7,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R1,2038,8,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R1,2038,9,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R1,2038,10,all-year,all-week,early-morning,heatpump,2036,0.19050000000
+6,heat,R1,2040,1,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R1,2040,2,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R1,2040,3,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R1,2040,4,all-year,all-week,early-morning,heatpump,2036,0.19050000000
+6,heat,R1,2040,5,all-year,all-week,early-morning,heatpump,2038,0.19050000000
+6,heat,R1,2040,7,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2036,0.19050000000
+6,heat,R1,2040,11,all-year,all-week,early-morning,heatpump,2038,0.19050000000
+6,heat,R2,2038,0,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R2,2038,1,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R2,2038,2,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R2,2038,3,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R2,2038,4,all-year,all-week,early-morning,heatpump,2036,0.19050000000
+6,heat,R2,2038,6,all-year,all-week,early-morning,heatpump,2028,0.09530000000
+6,heat,R2,2038,7,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R2,2038,8,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R2,2038,9,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R2,2038,10,all-year,all-week,early-morning,heatpump,2036,0.19050000000
+6,heat,R2,2040,1,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R2,2040,2,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R2,2040,3,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R2,2040,4,all-year,all-week,early-morning,heatpump,2036,0.19050000000
+6,heat,R2,2040,5,all-year,all-week,early-morning,heatpump,2038,0.19050000000
+6,heat,R2,2040,7,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2036,0.19050000000
+6,heat,R2,2040,11,all-year,all-week,early-morning,heatpump,2038,0.19050000000
+7,heat,R1,2038,0,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R1,2038,1,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R1,2038,2,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R1,2038,3,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R1,2038,4,all-year,all-week,late-afternoon,heatpump,2036,0.19050000000
+7,heat,R1,2038,6,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R1,2038,7,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R1,2038,8,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R1,2038,9,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R1,2038,10,all-year,all-week,late-afternoon,heatpump,2036,0.19050000000
+7,heat,R1,2040,1,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R1,2040,2,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R1,2040,3,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R1,2040,4,all-year,all-week,late-afternoon,heatpump,2036,0.19050000000
+7,heat,R1,2040,5,all-year,all-week,late-afternoon,heatpump,2038,0.19050000000
+7,heat,R1,2040,7,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2036,0.19050000000
+7,heat,R1,2040,11,all-year,all-week,late-afternoon,heatpump,2038,0.19050000000
+7,heat,R2,2038,0,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R2,2038,1,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R2,2038,2,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R2,2038,3,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R2,2038,4,all-year,all-week,late-afternoon,heatpump,2036,0.19050000000
+7,heat,R2,2038,6,all-year,all-week,late-afternoon,heatpump,2028,0.09530000000
+7,heat,R2,2038,7,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R2,2038,8,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R2,2038,9,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R2,2038,10,all-year,all-week,late-afternoon,heatpump,2036,0.19050000000
+7,heat,R2,2040,1,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R2,2040,2,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R2,2040,3,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R2,2040,4,all-year,all-week,late-afternoon,heatpump,2036,0.19050000000
+7,heat,R2,2040,5,all-year,all-week,late-afternoon,heatpump,2038,0.19050000000
+7,heat,R2,2040,7,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2036,0.19050000000
+7,heat,R2,2040,11,all-year,all-week,late-afternoon,heatpump,2038,0.19050000000
diff --git a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2040.csv b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2040.csv
index b0cd3e1d7..0fab7de01 100644
--- a/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/4-modify-timing-data/2-modify-time-framework/Results/Residential/Supply/2040.csv
@@ -1,321 +1,321 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2040,0,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R1,2040,1,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R1,2040,2,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R1,2040,3,heatpump,2036,all-year,all-week,night,0.09520000000
-0,heat,R1,2040,4,heatpump,2038,all-year,all-week,night,0.09520000000
-0,heat,R1,2040,6,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R1,2040,7,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R1,2040,8,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R1,2040,9,heatpump,2036,all-year,all-week,night,0.09520000000
-0,heat,R1,2040,10,heatpump,2038,all-year,all-week,night,0.09520000000
-0,heat,R1,2042,1,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R1,2042,2,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R1,2042,3,heatpump,2036,all-year,all-week,night,0.09520000000
-0,heat,R1,2042,4,heatpump,2038,all-year,all-week,night,0.09520000000
-0,heat,R1,2042,5,heatpump,2040,all-year,all-week,night,0.39570000000
-0,heat,R1,2042,7,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R1,2042,8,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R1,2042,9,heatpump,2036,all-year,all-week,night,0.09520000000
-0,heat,R1,2042,10,heatpump,2038,all-year,all-week,night,0.09520000000
-0,heat,R1,2042,11,heatpump,2040,all-year,all-week,night,0.39570000000
-0,heat,R2,2040,0,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R2,2040,1,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R2,2040,2,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R2,2040,3,heatpump,2036,all-year,all-week,night,0.09520000000
-0,heat,R2,2040,4,heatpump,2038,all-year,all-week,night,0.09520000000
-0,heat,R2,2040,6,heatpump,2030,all-year,all-week,night,0.34810000000
-0,heat,R2,2040,7,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R2,2040,8,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R2,2040,9,heatpump,2036,all-year,all-week,night,0.09520000000
-0,heat,R2,2040,10,heatpump,2038,all-year,all-week,night,0.09520000000
-0,heat,R2,2042,1,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R2,2042,2,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R2,2042,3,heatpump,2036,all-year,all-week,night,0.09520000000
-0,heat,R2,2042,4,heatpump,2038,all-year,all-week,night,0.09520000000
-0,heat,R2,2042,5,heatpump,2040,all-year,all-week,night,0.39570000000
-0,heat,R2,2042,7,heatpump,2032,all-year,all-week,night,0.09520000000
-0,heat,R2,2042,8,heatpump,2034,all-year,all-week,night,0.19930000000
-0,heat,R2,2042,9,heatpump,2036,all-year,all-week,night,0.09520000000
-0,heat,R2,2042,10,heatpump,2038,all-year,all-week,night,0.09520000000
-0,heat,R2,2042,11,heatpump,2040,all-year,all-week,night,0.39570000000
-1,heat,R1,2040,0,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R1,2040,1,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R1,2040,2,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R1,2040,3,heatpump,2036,all-year,all-week,morning,0.14280000000
-1,heat,R1,2040,4,heatpump,2038,all-year,all-week,morning,0.14280000000
-1,heat,R1,2040,6,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R1,2040,7,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R1,2040,8,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R1,2040,9,heatpump,2036,all-year,all-week,morning,0.14280000000
-1,heat,R1,2040,10,heatpump,2038,all-year,all-week,morning,0.14280000000
-1,heat,R1,2042,1,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R1,2042,2,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R1,2042,3,heatpump,2036,all-year,all-week,morning,0.14280000000
-1,heat,R1,2042,4,heatpump,2038,all-year,all-week,morning,0.14280000000
-1,heat,R1,2042,5,heatpump,2040,all-year,all-week,morning,0.59350000000
-1,heat,R1,2042,7,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R1,2042,8,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R1,2042,9,heatpump,2036,all-year,all-week,morning,0.14280000000
-1,heat,R1,2042,10,heatpump,2038,all-year,all-week,morning,0.14280000000
-1,heat,R1,2042,11,heatpump,2040,all-year,all-week,morning,0.59350000000
-1,heat,R2,2040,0,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R2,2040,1,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R2,2040,2,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R2,2040,3,heatpump,2036,all-year,all-week,morning,0.14280000000
-1,heat,R2,2040,4,heatpump,2038,all-year,all-week,morning,0.14280000000
-1,heat,R2,2040,6,heatpump,2030,all-year,all-week,morning,0.52210000000
-1,heat,R2,2040,7,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R2,2040,8,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R2,2040,9,heatpump,2036,all-year,all-week,morning,0.14280000000
-1,heat,R2,2040,10,heatpump,2038,all-year,all-week,morning,0.14280000000
-1,heat,R2,2042,1,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R2,2042,2,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R2,2042,3,heatpump,2036,all-year,all-week,morning,0.14280000000
-1,heat,R2,2042,4,heatpump,2038,all-year,all-week,morning,0.14280000000
-1,heat,R2,2042,5,heatpump,2040,all-year,all-week,morning,0.59350000000
-1,heat,R2,2042,7,heatpump,2032,all-year,all-week,morning,0.14280000000
-1,heat,R2,2042,8,heatpump,2034,all-year,all-week,morning,0.29900000000
-1,heat,R2,2042,9,heatpump,2036,all-year,all-week,morning,0.14280000000
-1,heat,R2,2042,10,heatpump,2038,all-year,all-week,morning,0.14280000000
-1,heat,R2,2042,11,heatpump,2040,all-year,all-week,morning,0.59350000000
-2,heat,R1,2040,0,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R1,2040,1,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2040,2,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R1,2040,3,heatpump,2036,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2040,4,heatpump,2038,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2040,6,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R1,2040,7,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2040,8,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R1,2040,9,heatpump,2036,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2040,10,heatpump,2038,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2042,1,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2042,2,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R1,2042,3,heatpump,2036,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2042,4,heatpump,2038,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2042,5,heatpump,2040,all-year,all-week,mid-afternoon,0.39570000000
-2,heat,R1,2042,7,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2042,8,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R1,2042,9,heatpump,2036,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2042,10,heatpump,2038,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R1,2042,11,heatpump,2040,all-year,all-week,mid-afternoon,0.39570000000
-2,heat,R2,2040,0,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R2,2040,1,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2040,2,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R2,2040,3,heatpump,2036,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2040,4,heatpump,2038,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2040,6,heatpump,2030,all-year,all-week,mid-afternoon,0.34810000000
-2,heat,R2,2040,7,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2040,8,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R2,2040,9,heatpump,2036,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2040,10,heatpump,2038,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2042,1,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2042,2,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R2,2042,3,heatpump,2036,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2042,4,heatpump,2038,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2042,5,heatpump,2040,all-year,all-week,mid-afternoon,0.39570000000
-2,heat,R2,2042,7,heatpump,2032,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2042,8,heatpump,2034,all-year,all-week,mid-afternoon,0.19930000000
-2,heat,R2,2042,9,heatpump,2036,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2042,10,heatpump,2038,all-year,all-week,mid-afternoon,0.09520000000
-2,heat,R2,2042,11,heatpump,2040,all-year,all-week,mid-afternoon,0.39570000000
-3,heat,R1,2040,0,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R1,2040,1,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2040,2,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R1,2040,3,heatpump,2036,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2040,4,heatpump,2038,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2040,6,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R1,2040,7,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2040,8,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R1,2040,9,heatpump,2036,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2040,10,heatpump,2038,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2042,1,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2042,2,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R1,2042,3,heatpump,2036,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2042,4,heatpump,2038,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2042,5,heatpump,2040,all-year,all-week,early-peak,0.59350000000
-3,heat,R1,2042,7,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2042,8,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R1,2042,9,heatpump,2036,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2042,10,heatpump,2038,all-year,all-week,early-peak,0.14280000000
-3,heat,R1,2042,11,heatpump,2040,all-year,all-week,early-peak,0.59350000000
-3,heat,R2,2040,0,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R2,2040,1,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2040,2,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R2,2040,3,heatpump,2036,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2040,4,heatpump,2038,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2040,6,heatpump,2030,all-year,all-week,early-peak,0.52210000000
-3,heat,R2,2040,7,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2040,8,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R2,2040,9,heatpump,2036,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2040,10,heatpump,2038,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2042,1,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2042,2,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R2,2042,3,heatpump,2036,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2042,4,heatpump,2038,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2042,5,heatpump,2040,all-year,all-week,early-peak,0.59350000000
-3,heat,R2,2042,7,heatpump,2032,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2042,8,heatpump,2034,all-year,all-week,early-peak,0.29900000000
-3,heat,R2,2042,9,heatpump,2036,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2042,10,heatpump,2038,all-year,all-week,early-peak,0.14280000000
-3,heat,R2,2042,11,heatpump,2040,all-year,all-week,early-peak,0.59350000000
-4,heat,R1,2040,0,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R1,2040,1,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2040,2,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R1,2040,3,heatpump,2036,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2040,4,heatpump,2038,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2040,6,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R1,2040,7,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2040,8,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R1,2040,9,heatpump,2036,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2040,10,heatpump,2038,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2042,1,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2042,2,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R1,2042,3,heatpump,2036,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2042,4,heatpump,2038,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2042,5,heatpump,2040,all-year,all-week,late-peak,1.18760000000
-4,heat,R1,2042,7,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2042,8,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R1,2042,9,heatpump,2036,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2042,10,heatpump,2038,all-year,all-week,late-peak,0.28570000000
-4,heat,R1,2042,11,heatpump,2040,all-year,all-week,late-peak,1.18760000000
-4,heat,R2,2040,0,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R2,2040,1,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2040,2,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R2,2040,3,heatpump,2036,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2040,4,heatpump,2038,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2040,6,heatpump,2030,all-year,all-week,late-peak,1.04470000000
-4,heat,R2,2040,7,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2040,8,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R2,2040,9,heatpump,2036,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2040,10,heatpump,2038,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2042,1,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2042,2,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R2,2042,3,heatpump,2036,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2042,4,heatpump,2038,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2042,5,heatpump,2040,all-year,all-week,late-peak,1.18760000000
-4,heat,R2,2042,7,heatpump,2032,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2042,8,heatpump,2034,all-year,all-week,late-peak,0.59820000000
-4,heat,R2,2042,9,heatpump,2036,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2042,10,heatpump,2038,all-year,all-week,late-peak,0.28570000000
-4,heat,R2,2042,11,heatpump,2040,all-year,all-week,late-peak,1.18760000000
-5,heat,R1,2040,0,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R1,2040,1,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R1,2040,2,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R1,2040,3,heatpump,2036,all-year,all-week,evening,0.19050000000
-5,heat,R1,2040,4,heatpump,2038,all-year,all-week,evening,0.19050000000
-5,heat,R1,2040,6,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R1,2040,7,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R1,2040,8,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R1,2040,9,heatpump,2036,all-year,all-week,evening,0.19050000000
-5,heat,R1,2040,10,heatpump,2038,all-year,all-week,evening,0.19050000000
-5,heat,R1,2042,1,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R1,2042,2,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R1,2042,3,heatpump,2036,all-year,all-week,evening,0.19050000000
-5,heat,R1,2042,4,heatpump,2038,all-year,all-week,evening,0.19050000000
-5,heat,R1,2042,5,heatpump,2040,all-year,all-week,evening,0.79190000000
-5,heat,R1,2042,7,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R1,2042,8,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R1,2042,9,heatpump,2036,all-year,all-week,evening,0.19050000000
-5,heat,R1,2042,10,heatpump,2038,all-year,all-week,evening,0.19050000000
-5,heat,R1,2042,11,heatpump,2040,all-year,all-week,evening,0.79190000000
-5,heat,R2,2040,0,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R2,2040,1,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R2,2040,2,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R2,2040,3,heatpump,2036,all-year,all-week,evening,0.19050000000
-5,heat,R2,2040,4,heatpump,2038,all-year,all-week,evening,0.19050000000
-5,heat,R2,2040,6,heatpump,2030,all-year,all-week,evening,0.69670000000
-5,heat,R2,2040,7,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R2,2040,8,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R2,2040,9,heatpump,2036,all-year,all-week,evening,0.19050000000
-5,heat,R2,2040,10,heatpump,2038,all-year,all-week,evening,0.19050000000
-5,heat,R2,2042,1,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R2,2042,2,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R2,2042,3,heatpump,2036,all-year,all-week,evening,0.19050000000
-5,heat,R2,2042,4,heatpump,2038,all-year,all-week,evening,0.19050000000
-5,heat,R2,2042,5,heatpump,2040,all-year,all-week,evening,0.79190000000
-5,heat,R2,2042,7,heatpump,2032,all-year,all-week,evening,0.19050000000
-5,heat,R2,2042,8,heatpump,2034,all-year,all-week,evening,0.39890000000
-5,heat,R2,2042,9,heatpump,2036,all-year,all-week,evening,0.19050000000
-5,heat,R2,2042,10,heatpump,2038,all-year,all-week,evening,0.19050000000
-5,heat,R2,2042,11,heatpump,2040,all-year,all-week,evening,0.79190000000
-6,heat,R1,2040,0,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R1,2040,1,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2040,2,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R1,2040,3,heatpump,2036,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2040,4,heatpump,2038,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2040,6,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R1,2040,7,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2040,8,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R1,2040,9,heatpump,2036,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2040,10,heatpump,2038,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2042,1,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2042,2,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R1,2042,3,heatpump,2036,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2042,4,heatpump,2038,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2042,5,heatpump,2040,all-year,all-week,early-morning,0.79190000000
-6,heat,R1,2042,7,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2042,8,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R1,2042,9,heatpump,2036,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2042,10,heatpump,2038,all-year,all-week,early-morning,0.19050000000
-6,heat,R1,2042,11,heatpump,2040,all-year,all-week,early-morning,0.79190000000
-6,heat,R2,2040,0,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R2,2040,1,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2040,2,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R2,2040,3,heatpump,2036,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2040,4,heatpump,2038,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2040,6,heatpump,2030,all-year,all-week,early-morning,0.69670000000
-6,heat,R2,2040,7,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2040,8,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R2,2040,9,heatpump,2036,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2040,10,heatpump,2038,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2042,1,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2042,2,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R2,2042,3,heatpump,2036,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2042,4,heatpump,2038,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2042,5,heatpump,2040,all-year,all-week,early-morning,0.79190000000
-6,heat,R2,2042,7,heatpump,2032,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2042,8,heatpump,2034,all-year,all-week,early-morning,0.39890000000
-6,heat,R2,2042,9,heatpump,2036,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2042,10,heatpump,2038,all-year,all-week,early-morning,0.19050000000
-6,heat,R2,2042,11,heatpump,2040,all-year,all-week,early-morning,0.79190000000
-7,heat,R1,2040,0,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R1,2040,1,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2040,2,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R1,2040,3,heatpump,2036,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2040,4,heatpump,2038,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2040,6,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R1,2040,7,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2040,8,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R1,2040,9,heatpump,2036,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2040,10,heatpump,2038,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2042,1,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2042,2,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R1,2042,3,heatpump,2036,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2042,4,heatpump,2038,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2042,5,heatpump,2040,all-year,all-week,late-afternoon,0.79190000000
-7,heat,R1,2042,7,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2042,8,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R1,2042,9,heatpump,2036,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2042,10,heatpump,2038,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R1,2042,11,heatpump,2040,all-year,all-week,late-afternoon,0.79190000000
-7,heat,R2,2040,0,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R2,2040,1,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2040,2,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R2,2040,3,heatpump,2036,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2040,4,heatpump,2038,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2040,6,heatpump,2030,all-year,all-week,late-afternoon,0.69670000000
-7,heat,R2,2040,7,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2040,8,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R2,2040,9,heatpump,2036,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2040,10,heatpump,2038,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2042,1,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2042,2,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R2,2042,3,heatpump,2036,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2042,4,heatpump,2038,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2042,5,heatpump,2040,all-year,all-week,late-afternoon,0.79190000000
-7,heat,R2,2042,7,heatpump,2032,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2042,8,heatpump,2034,all-year,all-week,late-afternoon,0.39890000000
-7,heat,R2,2042,9,heatpump,2036,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2042,10,heatpump,2038,all-year,all-week,late-afternoon,0.19050000000
-7,heat,R2,2042,11,heatpump,2040,all-year,all-week,late-afternoon,0.79190000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2040,0,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R1,2040,1,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R1,2040,2,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R1,2040,3,all-year,all-week,night,heatpump,2036,0.09520000000
+0,heat,R1,2040,4,all-year,all-week,night,heatpump,2038,0.09520000000
+0,heat,R1,2040,6,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R1,2040,7,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R1,2040,8,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2036,0.09520000000
+0,heat,R1,2040,10,all-year,all-week,night,heatpump,2038,0.09520000000
+0,heat,R1,2042,1,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R1,2042,2,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R1,2042,3,all-year,all-week,night,heatpump,2036,0.09520000000
+0,heat,R1,2042,4,all-year,all-week,night,heatpump,2038,0.09520000000
+0,heat,R1,2042,5,all-year,all-week,night,heatpump,2040,0.39570000000
+0,heat,R1,2042,7,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R1,2042,8,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R1,2042,9,all-year,all-week,night,heatpump,2036,0.09520000000
+0,heat,R1,2042,10,all-year,all-week,night,heatpump,2038,0.09520000000
+0,heat,R1,2042,11,all-year,all-week,night,heatpump,2040,0.39570000000
+0,heat,R2,2040,0,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R2,2040,1,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R2,2040,2,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R2,2040,3,all-year,all-week,night,heatpump,2036,0.09520000000
+0,heat,R2,2040,4,all-year,all-week,night,heatpump,2038,0.09520000000
+0,heat,R2,2040,6,all-year,all-week,night,heatpump,2030,0.34810000000
+0,heat,R2,2040,7,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R2,2040,8,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2036,0.09520000000
+0,heat,R2,2040,10,all-year,all-week,night,heatpump,2038,0.09520000000
+0,heat,R2,2042,1,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R2,2042,2,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R2,2042,3,all-year,all-week,night,heatpump,2036,0.09520000000
+0,heat,R2,2042,4,all-year,all-week,night,heatpump,2038,0.09520000000
+0,heat,R2,2042,5,all-year,all-week,night,heatpump,2040,0.39570000000
+0,heat,R2,2042,7,all-year,all-week,night,heatpump,2032,0.09520000000
+0,heat,R2,2042,8,all-year,all-week,night,heatpump,2034,0.19930000000
+0,heat,R2,2042,9,all-year,all-week,night,heatpump,2036,0.09520000000
+0,heat,R2,2042,10,all-year,all-week,night,heatpump,2038,0.09520000000
+0,heat,R2,2042,11,all-year,all-week,night,heatpump,2040,0.39570000000
+1,heat,R1,2040,0,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R1,2040,1,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R1,2040,2,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R1,2040,3,all-year,all-week,morning,heatpump,2036,0.14280000000
+1,heat,R1,2040,4,all-year,all-week,morning,heatpump,2038,0.14280000000
+1,heat,R1,2040,6,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R1,2040,7,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R1,2040,8,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2036,0.14280000000
+1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2038,0.14280000000
+1,heat,R1,2042,1,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R1,2042,2,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R1,2042,3,all-year,all-week,morning,heatpump,2036,0.14280000000
+1,heat,R1,2042,4,all-year,all-week,morning,heatpump,2038,0.14280000000
+1,heat,R1,2042,5,all-year,all-week,morning,heatpump,2040,0.59350000000
+1,heat,R1,2042,7,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R1,2042,8,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R1,2042,9,all-year,all-week,morning,heatpump,2036,0.14280000000
+1,heat,R1,2042,10,all-year,all-week,morning,heatpump,2038,0.14280000000
+1,heat,R1,2042,11,all-year,all-week,morning,heatpump,2040,0.59350000000
+1,heat,R2,2040,0,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R2,2040,1,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R2,2040,2,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R2,2040,3,all-year,all-week,morning,heatpump,2036,0.14280000000
+1,heat,R2,2040,4,all-year,all-week,morning,heatpump,2038,0.14280000000
+1,heat,R2,2040,6,all-year,all-week,morning,heatpump,2030,0.52210000000
+1,heat,R2,2040,7,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R2,2040,8,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2036,0.14280000000
+1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2038,0.14280000000
+1,heat,R2,2042,1,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R2,2042,2,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R2,2042,3,all-year,all-week,morning,heatpump,2036,0.14280000000
+1,heat,R2,2042,4,all-year,all-week,morning,heatpump,2038,0.14280000000
+1,heat,R2,2042,5,all-year,all-week,morning,heatpump,2040,0.59350000000
+1,heat,R2,2042,7,all-year,all-week,morning,heatpump,2032,0.14280000000
+1,heat,R2,2042,8,all-year,all-week,morning,heatpump,2034,0.29900000000
+1,heat,R2,2042,9,all-year,all-week,morning,heatpump,2036,0.14280000000
+1,heat,R2,2042,10,all-year,all-week,morning,heatpump,2038,0.14280000000
+1,heat,R2,2042,11,all-year,all-week,morning,heatpump,2040,0.59350000000
+2,heat,R1,2040,0,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R1,2040,1,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R1,2040,2,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R1,2040,3,all-year,all-week,mid-afternoon,heatpump,2036,0.09520000000
+2,heat,R1,2040,4,all-year,all-week,mid-afternoon,heatpump,2038,0.09520000000
+2,heat,R1,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R1,2040,7,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R1,2040,8,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2036,0.09520000000
+2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2038,0.09520000000
+2,heat,R1,2042,1,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R1,2042,2,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R1,2042,3,all-year,all-week,mid-afternoon,heatpump,2036,0.09520000000
+2,heat,R1,2042,4,all-year,all-week,mid-afternoon,heatpump,2038,0.09520000000
+2,heat,R1,2042,5,all-year,all-week,mid-afternoon,heatpump,2040,0.39570000000
+2,heat,R1,2042,7,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R1,2042,8,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R1,2042,9,all-year,all-week,mid-afternoon,heatpump,2036,0.09520000000
+2,heat,R1,2042,10,all-year,all-week,mid-afternoon,heatpump,2038,0.09520000000
+2,heat,R1,2042,11,all-year,all-week,mid-afternoon,heatpump,2040,0.39570000000
+2,heat,R2,2040,0,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R2,2040,1,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R2,2040,2,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R2,2040,3,all-year,all-week,mid-afternoon,heatpump,2036,0.09520000000
+2,heat,R2,2040,4,all-year,all-week,mid-afternoon,heatpump,2038,0.09520000000
+2,heat,R2,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.34810000000
+2,heat,R2,2040,7,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R2,2040,8,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2036,0.09520000000
+2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2038,0.09520000000
+2,heat,R2,2042,1,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R2,2042,2,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R2,2042,3,all-year,all-week,mid-afternoon,heatpump,2036,0.09520000000
+2,heat,R2,2042,4,all-year,all-week,mid-afternoon,heatpump,2038,0.09520000000
+2,heat,R2,2042,5,all-year,all-week,mid-afternoon,heatpump,2040,0.39570000000
+2,heat,R2,2042,7,all-year,all-week,mid-afternoon,heatpump,2032,0.09520000000
+2,heat,R2,2042,8,all-year,all-week,mid-afternoon,heatpump,2034,0.19930000000
+2,heat,R2,2042,9,all-year,all-week,mid-afternoon,heatpump,2036,0.09520000000
+2,heat,R2,2042,10,all-year,all-week,mid-afternoon,heatpump,2038,0.09520000000
+2,heat,R2,2042,11,all-year,all-week,mid-afternoon,heatpump,2040,0.39570000000
+3,heat,R1,2040,0,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R1,2040,1,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R1,2040,2,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R1,2040,3,all-year,all-week,early-peak,heatpump,2036,0.14280000000
+3,heat,R1,2040,4,all-year,all-week,early-peak,heatpump,2038,0.14280000000
+3,heat,R1,2040,6,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R1,2040,7,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R1,2040,8,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2036,0.14280000000
+3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2038,0.14280000000
+3,heat,R1,2042,1,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R1,2042,2,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R1,2042,3,all-year,all-week,early-peak,heatpump,2036,0.14280000000
+3,heat,R1,2042,4,all-year,all-week,early-peak,heatpump,2038,0.14280000000
+3,heat,R1,2042,5,all-year,all-week,early-peak,heatpump,2040,0.59350000000
+3,heat,R1,2042,7,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R1,2042,8,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R1,2042,9,all-year,all-week,early-peak,heatpump,2036,0.14280000000
+3,heat,R1,2042,10,all-year,all-week,early-peak,heatpump,2038,0.14280000000
+3,heat,R1,2042,11,all-year,all-week,early-peak,heatpump,2040,0.59350000000
+3,heat,R2,2040,0,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R2,2040,1,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R2,2040,2,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R2,2040,3,all-year,all-week,early-peak,heatpump,2036,0.14280000000
+3,heat,R2,2040,4,all-year,all-week,early-peak,heatpump,2038,0.14280000000
+3,heat,R2,2040,6,all-year,all-week,early-peak,heatpump,2030,0.52210000000
+3,heat,R2,2040,7,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R2,2040,8,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2036,0.14280000000
+3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2038,0.14280000000
+3,heat,R2,2042,1,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R2,2042,2,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R2,2042,3,all-year,all-week,early-peak,heatpump,2036,0.14280000000
+3,heat,R2,2042,4,all-year,all-week,early-peak,heatpump,2038,0.14280000000
+3,heat,R2,2042,5,all-year,all-week,early-peak,heatpump,2040,0.59350000000
+3,heat,R2,2042,7,all-year,all-week,early-peak,heatpump,2032,0.14280000000
+3,heat,R2,2042,8,all-year,all-week,early-peak,heatpump,2034,0.29900000000
+3,heat,R2,2042,9,all-year,all-week,early-peak,heatpump,2036,0.14280000000
+3,heat,R2,2042,10,all-year,all-week,early-peak,heatpump,2038,0.14280000000
+3,heat,R2,2042,11,all-year,all-week,early-peak,heatpump,2040,0.59350000000
+4,heat,R1,2040,0,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R1,2040,1,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R1,2040,2,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R1,2040,3,all-year,all-week,late-peak,heatpump,2036,0.28570000000
+4,heat,R1,2040,4,all-year,all-week,late-peak,heatpump,2038,0.28570000000
+4,heat,R1,2040,6,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R1,2040,7,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R1,2040,8,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2036,0.28570000000
+4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2038,0.28570000000
+4,heat,R1,2042,1,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R1,2042,2,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R1,2042,3,all-year,all-week,late-peak,heatpump,2036,0.28570000000
+4,heat,R1,2042,4,all-year,all-week,late-peak,heatpump,2038,0.28570000000
+4,heat,R1,2042,5,all-year,all-week,late-peak,heatpump,2040,1.18760000000
+4,heat,R1,2042,7,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R1,2042,8,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R1,2042,9,all-year,all-week,late-peak,heatpump,2036,0.28570000000
+4,heat,R1,2042,10,all-year,all-week,late-peak,heatpump,2038,0.28570000000
+4,heat,R1,2042,11,all-year,all-week,late-peak,heatpump,2040,1.18760000000
+4,heat,R2,2040,0,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R2,2040,1,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R2,2040,2,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R2,2040,3,all-year,all-week,late-peak,heatpump,2036,0.28570000000
+4,heat,R2,2040,4,all-year,all-week,late-peak,heatpump,2038,0.28570000000
+4,heat,R2,2040,6,all-year,all-week,late-peak,heatpump,2030,1.04470000000
+4,heat,R2,2040,7,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R2,2040,8,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2036,0.28570000000
+4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2038,0.28570000000
+4,heat,R2,2042,1,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R2,2042,2,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R2,2042,3,all-year,all-week,late-peak,heatpump,2036,0.28570000000
+4,heat,R2,2042,4,all-year,all-week,late-peak,heatpump,2038,0.28570000000
+4,heat,R2,2042,5,all-year,all-week,late-peak,heatpump,2040,1.18760000000
+4,heat,R2,2042,7,all-year,all-week,late-peak,heatpump,2032,0.28570000000
+4,heat,R2,2042,8,all-year,all-week,late-peak,heatpump,2034,0.59820000000
+4,heat,R2,2042,9,all-year,all-week,late-peak,heatpump,2036,0.28570000000
+4,heat,R2,2042,10,all-year,all-week,late-peak,heatpump,2038,0.28570000000
+4,heat,R2,2042,11,all-year,all-week,late-peak,heatpump,2040,1.18760000000
+5,heat,R1,2040,0,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R1,2040,1,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R1,2040,2,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R1,2040,3,all-year,all-week,evening,heatpump,2036,0.19050000000
+5,heat,R1,2040,4,all-year,all-week,evening,heatpump,2038,0.19050000000
+5,heat,R1,2040,6,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R1,2040,7,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R1,2040,8,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2036,0.19050000000
+5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2038,0.19050000000
+5,heat,R1,2042,1,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R1,2042,2,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R1,2042,3,all-year,all-week,evening,heatpump,2036,0.19050000000
+5,heat,R1,2042,4,all-year,all-week,evening,heatpump,2038,0.19050000000
+5,heat,R1,2042,5,all-year,all-week,evening,heatpump,2040,0.79190000000
+5,heat,R1,2042,7,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R1,2042,8,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R1,2042,9,all-year,all-week,evening,heatpump,2036,0.19050000000
+5,heat,R1,2042,10,all-year,all-week,evening,heatpump,2038,0.19050000000
+5,heat,R1,2042,11,all-year,all-week,evening,heatpump,2040,0.79190000000
+5,heat,R2,2040,0,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R2,2040,1,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R2,2040,2,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R2,2040,3,all-year,all-week,evening,heatpump,2036,0.19050000000
+5,heat,R2,2040,4,all-year,all-week,evening,heatpump,2038,0.19050000000
+5,heat,R2,2040,6,all-year,all-week,evening,heatpump,2030,0.69670000000
+5,heat,R2,2040,7,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R2,2040,8,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2036,0.19050000000
+5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2038,0.19050000000
+5,heat,R2,2042,1,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R2,2042,2,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R2,2042,3,all-year,all-week,evening,heatpump,2036,0.19050000000
+5,heat,R2,2042,4,all-year,all-week,evening,heatpump,2038,0.19050000000
+5,heat,R2,2042,5,all-year,all-week,evening,heatpump,2040,0.79190000000
+5,heat,R2,2042,7,all-year,all-week,evening,heatpump,2032,0.19050000000
+5,heat,R2,2042,8,all-year,all-week,evening,heatpump,2034,0.39890000000
+5,heat,R2,2042,9,all-year,all-week,evening,heatpump,2036,0.19050000000
+5,heat,R2,2042,10,all-year,all-week,evening,heatpump,2038,0.19050000000
+5,heat,R2,2042,11,all-year,all-week,evening,heatpump,2040,0.79190000000
+6,heat,R1,2040,0,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R1,2040,1,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R1,2040,2,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R1,2040,3,all-year,all-week,early-morning,heatpump,2036,0.19050000000
+6,heat,R1,2040,4,all-year,all-week,early-morning,heatpump,2038,0.19050000000
+6,heat,R1,2040,6,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R1,2040,7,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R1,2040,8,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2036,0.19050000000
+6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2038,0.19050000000
+6,heat,R1,2042,1,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R1,2042,2,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R1,2042,3,all-year,all-week,early-morning,heatpump,2036,0.19050000000
+6,heat,R1,2042,4,all-year,all-week,early-morning,heatpump,2038,0.19050000000
+6,heat,R1,2042,5,all-year,all-week,early-morning,heatpump,2040,0.79190000000
+6,heat,R1,2042,7,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R1,2042,8,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R1,2042,9,all-year,all-week,early-morning,heatpump,2036,0.19050000000
+6,heat,R1,2042,10,all-year,all-week,early-morning,heatpump,2038,0.19050000000
+6,heat,R1,2042,11,all-year,all-week,early-morning,heatpump,2040,0.79190000000
+6,heat,R2,2040,0,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R2,2040,1,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R2,2040,2,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R2,2040,3,all-year,all-week,early-morning,heatpump,2036,0.19050000000
+6,heat,R2,2040,4,all-year,all-week,early-morning,heatpump,2038,0.19050000000
+6,heat,R2,2040,6,all-year,all-week,early-morning,heatpump,2030,0.69670000000
+6,heat,R2,2040,7,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R2,2040,8,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2036,0.19050000000
+6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2038,0.19050000000
+6,heat,R2,2042,1,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R2,2042,2,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R2,2042,3,all-year,all-week,early-morning,heatpump,2036,0.19050000000
+6,heat,R2,2042,4,all-year,all-week,early-morning,heatpump,2038,0.19050000000
+6,heat,R2,2042,5,all-year,all-week,early-morning,heatpump,2040,0.79190000000
+6,heat,R2,2042,7,all-year,all-week,early-morning,heatpump,2032,0.19050000000
+6,heat,R2,2042,8,all-year,all-week,early-morning,heatpump,2034,0.39890000000
+6,heat,R2,2042,9,all-year,all-week,early-morning,heatpump,2036,0.19050000000
+6,heat,R2,2042,10,all-year,all-week,early-morning,heatpump,2038,0.19050000000
+6,heat,R2,2042,11,all-year,all-week,early-morning,heatpump,2040,0.79190000000
+7,heat,R1,2040,0,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R1,2040,1,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R1,2040,2,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R1,2040,3,all-year,all-week,late-afternoon,heatpump,2036,0.19050000000
+7,heat,R1,2040,4,all-year,all-week,late-afternoon,heatpump,2038,0.19050000000
+7,heat,R1,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R1,2040,7,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R1,2040,8,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2036,0.19050000000
+7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2038,0.19050000000
+7,heat,R1,2042,1,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R1,2042,2,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R1,2042,3,all-year,all-week,late-afternoon,heatpump,2036,0.19050000000
+7,heat,R1,2042,4,all-year,all-week,late-afternoon,heatpump,2038,0.19050000000
+7,heat,R1,2042,5,all-year,all-week,late-afternoon,heatpump,2040,0.79190000000
+7,heat,R1,2042,7,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R1,2042,8,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R1,2042,9,all-year,all-week,late-afternoon,heatpump,2036,0.19050000000
+7,heat,R1,2042,10,all-year,all-week,late-afternoon,heatpump,2038,0.19050000000
+7,heat,R1,2042,11,all-year,all-week,late-afternoon,heatpump,2040,0.79190000000
+7,heat,R2,2040,0,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R2,2040,1,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R2,2040,2,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R2,2040,3,all-year,all-week,late-afternoon,heatpump,2036,0.19050000000
+7,heat,R2,2040,4,all-year,all-week,late-afternoon,heatpump,2038,0.19050000000
+7,heat,R2,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.69670000000
+7,heat,R2,2040,7,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R2,2040,8,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2036,0.19050000000
+7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2038,0.19050000000
+7,heat,R2,2042,1,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R2,2042,2,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R2,2042,3,all-year,all-week,late-afternoon,heatpump,2036,0.19050000000
+7,heat,R2,2042,4,all-year,all-week,late-afternoon,heatpump,2038,0.19050000000
+7,heat,R2,2042,5,all-year,all-week,late-afternoon,heatpump,2040,0.79190000000
+7,heat,R2,2042,7,all-year,all-week,late-afternoon,heatpump,2032,0.19050000000
+7,heat,R2,2042,8,all-year,all-week,late-afternoon,heatpump,2034,0.39890000000
+7,heat,R2,2042,9,all-year,all-week,late-afternoon,heatpump,2036,0.19050000000
+7,heat,R2,2042,10,all-year,all-week,late-afternoon,heatpump,2038,0.19050000000
+7,heat,R2,2042,11,all-year,all-week,late-afternoon,heatpump,2040,0.79190000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2020.csv
index 192f9bf99..1d028468e 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2020.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2020.csv
@@ -1,7 +1,7 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gassupply1,15.00000000000
-0,2025,R1,2020,gassupply1,15.00000000000
-0,2030,R1,2020,gassupply1,7.50000000000
-1,2020,R2,2020,gassupply1,15.00000000000
-1,2025,R2,2020,gassupply1,15.00000000000
-1,2030,R2,2020,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2020,R2,gassupply1,2020,15.00000000000
+1,2025,R2,gassupply1,2020,15.00000000000
+1,2030,R2,gassupply1,2020,7.50000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2025.csv
index 9836bff0c..a5827773c 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2025.csv
@@ -1,17 +1,17 @@
-asset,year,region,installed,technology,capacity
-0,2025,R1,2020,gassupply1,15.00000000000
-0,2030,R1,2020,gassupply1,7.50000000000
-1,2030,R1,2025,gassupply1,4.70400000000
-1,2035,R1,2025,gassupply1,4.70400000000
-1,2040,R1,2025,gassupply1,4.70400000000
-1,2045,R1,2025,gassupply1,4.70400000000
-1,2050,R1,2025,gassupply1,4.70400000000
-1,2064,R1,2025,gassupply1,4.70400000000
-2,2025,R2,2020,gassupply1,15.00000000000
-2,2030,R2,2020,gassupply1,7.50000000000
-3,2030,R2,2025,gassupply1,4.70400000000
-3,2035,R2,2025,gassupply1,4.70400000000
-3,2040,R2,2025,gassupply1,4.70400000000
-3,2045,R2,2025,gassupply1,4.70400000000
-3,2050,R2,2025,gassupply1,4.70400000000
-3,2064,R2,2025,gassupply1,4.70400000000
+asset,year,region,technology,installed,capacity
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2030,R1,gassupply1,2025,4.70400000000
+1,2035,R1,gassupply1,2025,4.70400000000
+1,2040,R1,gassupply1,2025,4.70400000000
+1,2045,R1,gassupply1,2025,4.70400000000
+1,2050,R1,gassupply1,2025,4.70400000000
+1,2064,R1,gassupply1,2025,4.70400000000
+2,2025,R2,gassupply1,2020,15.00000000000
+2,2030,R2,gassupply1,2020,7.50000000000
+3,2030,R2,gassupply1,2025,4.70400000000
+3,2035,R2,gassupply1,2025,4.70400000000
+3,2040,R2,gassupply1,2025,4.70400000000
+3,2045,R2,gassupply1,2025,4.70400000000
+3,2050,R2,gassupply1,2025,4.70400000000
+3,2064,R2,gassupply1,2025,4.70400000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2030.csv
index 9dd424977..870d5a276 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2030.csv
@@ -1,29 +1,29 @@
-asset,year,region,installed,technology,capacity
-0,2030,R1,2020,gassupply1,7.50000000000
-1,2030,R1,2025,gassupply1,4.70400000000
-1,2035,R1,2025,gassupply1,4.70400000000
-1,2040,R1,2025,gassupply1,4.70400000000
-1,2045,R1,2025,gassupply1,4.70400000000
-1,2050,R1,2025,gassupply1,4.70400000000
-1,2064,R1,2025,gassupply1,4.70400000000
-2,2035,R1,2030,gassupply1,7.50000000000
-2,2040,R1,2030,gassupply1,7.50000000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
-3,2030,R2,2020,gassupply1,7.50000000000
-4,2030,R2,2025,gassupply1,4.70400000000
-4,2035,R2,2025,gassupply1,4.70400000000
-4,2040,R2,2025,gassupply1,4.70400000000
-4,2045,R2,2025,gassupply1,4.70400000000
-4,2050,R2,2025,gassupply1,4.70400000000
-4,2064,R2,2025,gassupply1,4.70400000000
-5,2035,R2,2030,gassupply1,7.50000000000
-5,2040,R2,2030,gassupply1,7.50000000000
-5,2045,R2,2030,gassupply1,7.50000000000
-5,2050,R2,2030,gassupply1,7.50000000000
-5,2064,R2,2030,gassupply1,7.50000000000
-5,2065,R2,2030,gassupply1,7.50000000000
-5,2069,R2,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2030,R1,gassupply1,2025,4.70400000000
+1,2035,R1,gassupply1,2025,4.70400000000
+1,2040,R1,gassupply1,2025,4.70400000000
+1,2045,R1,gassupply1,2025,4.70400000000
+1,2050,R1,gassupply1,2025,4.70400000000
+1,2064,R1,gassupply1,2025,4.70400000000
+2,2035,R1,gassupply1,2030,7.50000000000
+2,2040,R1,gassupply1,2030,7.50000000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
+3,2030,R2,gassupply1,2020,7.50000000000
+4,2030,R2,gassupply1,2025,4.70400000000
+4,2035,R2,gassupply1,2025,4.70400000000
+4,2040,R2,gassupply1,2025,4.70400000000
+4,2045,R2,gassupply1,2025,4.70400000000
+4,2050,R2,gassupply1,2025,4.70400000000
+4,2064,R2,gassupply1,2025,4.70400000000
+5,2035,R2,gassupply1,2030,7.50000000000
+5,2040,R2,gassupply1,2030,7.50000000000
+5,2045,R2,gassupply1,2030,7.50000000000
+5,2050,R2,gassupply1,2030,7.50000000000
+5,2064,R2,gassupply1,2030,7.50000000000
+5,2065,R2,gassupply1,2030,7.50000000000
+5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2035.csv
index 48ffe4c5b..1fa9d0e59 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2035.csv
@@ -1,25 +1,25 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2025,gassupply1,4.70400000000
-1,2040,R1,2025,gassupply1,4.70400000000
-1,2045,R1,2025,gassupply1,4.70400000000
-1,2050,R1,2025,gassupply1,4.70400000000
-1,2064,R1,2025,gassupply1,4.70400000000
-2,2035,R1,2030,gassupply1,7.50000000000
-2,2040,R1,2030,gassupply1,7.50000000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
-4,2035,R2,2025,gassupply1,4.70400000000
-4,2040,R2,2025,gassupply1,4.70400000000
-4,2045,R2,2025,gassupply1,4.70400000000
-4,2050,R2,2025,gassupply1,4.70400000000
-4,2064,R2,2025,gassupply1,4.70400000000
-5,2035,R2,2030,gassupply1,7.50000000000
-5,2040,R2,2030,gassupply1,7.50000000000
-5,2045,R2,2030,gassupply1,7.50000000000
-5,2050,R2,2030,gassupply1,7.50000000000
-5,2064,R2,2030,gassupply1,7.50000000000
-5,2065,R2,2030,gassupply1,7.50000000000
-5,2069,R2,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2035,R1,gassupply1,2025,4.70400000000
+1,2040,R1,gassupply1,2025,4.70400000000
+1,2045,R1,gassupply1,2025,4.70400000000
+1,2050,R1,gassupply1,2025,4.70400000000
+1,2064,R1,gassupply1,2025,4.70400000000
+2,2035,R1,gassupply1,2030,7.50000000000
+2,2040,R1,gassupply1,2030,7.50000000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
+4,2035,R2,gassupply1,2025,4.70400000000
+4,2040,R2,gassupply1,2025,4.70400000000
+4,2045,R2,gassupply1,2025,4.70400000000
+4,2050,R2,gassupply1,2025,4.70400000000
+4,2064,R2,gassupply1,2025,4.70400000000
+5,2035,R2,gassupply1,2030,7.50000000000
+5,2040,R2,gassupply1,2030,7.50000000000
+5,2045,R2,gassupply1,2030,7.50000000000
+5,2050,R2,gassupply1,2030,7.50000000000
+5,2064,R2,gassupply1,2030,7.50000000000
+5,2065,R2,gassupply1,2030,7.50000000000
+5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2040.csv
index ff57f6c84..06c54c7e1 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2040.csv
@@ -1,21 +1,21 @@
-asset,year,region,installed,technology,capacity
-1,2040,R1,2025,gassupply1,4.70400000000
-1,2045,R1,2025,gassupply1,4.70400000000
-1,2050,R1,2025,gassupply1,4.70400000000
-1,2064,R1,2025,gassupply1,4.70400000000
-2,2040,R1,2030,gassupply1,7.50000000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
-4,2040,R2,2025,gassupply1,4.70400000000
-4,2045,R2,2025,gassupply1,4.70400000000
-4,2050,R2,2025,gassupply1,4.70400000000
-4,2064,R2,2025,gassupply1,4.70400000000
-5,2040,R2,2030,gassupply1,7.50000000000
-5,2045,R2,2030,gassupply1,7.50000000000
-5,2050,R2,2030,gassupply1,7.50000000000
-5,2064,R2,2030,gassupply1,7.50000000000
-5,2065,R2,2030,gassupply1,7.50000000000
-5,2069,R2,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2040,R1,gassupply1,2025,4.70400000000
+1,2045,R1,gassupply1,2025,4.70400000000
+1,2050,R1,gassupply1,2025,4.70400000000
+1,2064,R1,gassupply1,2025,4.70400000000
+2,2040,R1,gassupply1,2030,7.50000000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
+4,2040,R2,gassupply1,2025,4.70400000000
+4,2045,R2,gassupply1,2025,4.70400000000
+4,2050,R2,gassupply1,2025,4.70400000000
+4,2064,R2,gassupply1,2025,4.70400000000
+5,2040,R2,gassupply1,2030,7.50000000000
+5,2045,R2,gassupply1,2030,7.50000000000
+5,2050,R2,gassupply1,2030,7.50000000000
+5,2064,R2,gassupply1,2030,7.50000000000
+5,2065,R2,gassupply1,2030,7.50000000000
+5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2045.csv
index 865dc571f..27d05c29c 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2045.csv
@@ -1,17 +1,17 @@
-asset,year,region,installed,technology,capacity
-1,2045,R1,2025,gassupply1,4.70400000000
-1,2050,R1,2025,gassupply1,4.70400000000
-1,2064,R1,2025,gassupply1,4.70400000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
-4,2045,R2,2025,gassupply1,4.70400000000
-4,2050,R2,2025,gassupply1,4.70400000000
-4,2064,R2,2025,gassupply1,4.70400000000
-5,2045,R2,2030,gassupply1,7.50000000000
-5,2050,R2,2030,gassupply1,7.50000000000
-5,2064,R2,2030,gassupply1,7.50000000000
-5,2065,R2,2030,gassupply1,7.50000000000
-5,2069,R2,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2045,R1,gassupply1,2025,4.70400000000
+1,2050,R1,gassupply1,2025,4.70400000000
+1,2064,R1,gassupply1,2025,4.70400000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
+4,2045,R2,gassupply1,2025,4.70400000000
+4,2050,R2,gassupply1,2025,4.70400000000
+4,2064,R2,gassupply1,2025,4.70400000000
+5,2045,R2,gassupply1,2030,7.50000000000
+5,2050,R2,gassupply1,2030,7.50000000000
+5,2064,R2,gassupply1,2030,7.50000000000
+5,2065,R2,gassupply1,2030,7.50000000000
+5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2050.csv
index 50f6271df..3e6eb8a29 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Gas/Capacity/2050.csv
@@ -1,17 +1,17 @@
-asset,year,region,installed,technology,capacity
-1,2050,R1,2025,gassupply1,4.70400000000
-1,2055,R1,2025,gassupply1,4.70400000000
-1,2064,R1,2025,gassupply1,4.70400000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2055,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
-4,2050,R2,2025,gassupply1,4.70400000000
-4,2055,R2,2025,gassupply1,4.70400000000
-4,2064,R2,2025,gassupply1,4.70400000000
-5,2050,R2,2030,gassupply1,7.50000000000
-5,2055,R2,2030,gassupply1,7.50000000000
-5,2064,R2,2030,gassupply1,7.50000000000
-5,2065,R2,2030,gassupply1,7.50000000000
-5,2069,R2,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2050,R1,gassupply1,2025,4.70400000000
+1,2055,R1,gassupply1,2025,4.70400000000
+1,2064,R1,gassupply1,2025,4.70400000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2055,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
+4,2050,R2,gassupply1,2025,4.70400000000
+4,2055,R2,gassupply1,2025,4.70400000000
+4,2064,R2,gassupply1,2025,4.70400000000
+5,2050,R2,gassupply1,2030,7.50000000000
+5,2055,R2,gassupply1,2030,7.50000000000
+5,2064,R2,gassupply1,2030,7.50000000000
+5,2065,R2,gassupply1,2030,7.50000000000
+5,2069,R2,gassupply1,2030,7.50000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2020.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2020.csv
index c4dfc406c..b0d9e28be 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2020.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2020.csv
@@ -1,29 +1,29 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gasCCGT,1.00000000000
-0,2025,R1,2020,gasCCGT,1.00000000000
-1,2025,R1,2020,solarPV,13.46730000000
-1,2030,R1,2020,solarPV,13.46730000000
-1,2035,R1,2020,solarPV,13.46730000000
-1,2040,R1,2020,solarPV,13.46730000000
-1,2045,R1,2020,solarPV,13.46730000000
-1,2049,R1,2020,solarPV,13.46730000000
-2,2025,R1,2020,windturbine,20.00000000000
-2,2030,R1,2020,windturbine,20.00000000000
-2,2035,R1,2020,windturbine,20.00000000000
-2,2040,R1,2020,windturbine,20.00000000000
-2,2045,R1,2020,windturbine,20.00000000000
-2,2049,R1,2020,windturbine,20.00000000000
-3,2020,R2,2020,gasCCGT,1.00000000000
-3,2025,R2,2020,gasCCGT,1.00000000000
-4,2025,R2,2020,solarPV,13.46730000000
-4,2030,R2,2020,solarPV,13.46730000000
-4,2035,R2,2020,solarPV,13.46730000000
-4,2040,R2,2020,solarPV,13.46730000000
-4,2045,R2,2020,solarPV,13.46730000000
-4,2049,R2,2020,solarPV,13.46730000000
-5,2025,R2,2020,windturbine,20.00000000000
-5,2030,R2,2020,windturbine,20.00000000000
-5,2035,R2,2020,windturbine,20.00000000000
-5,2040,R2,2020,windturbine,20.00000000000
-5,2045,R2,2020,windturbine,20.00000000000
-5,2049,R2,2020,windturbine,20.00000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2025,R1,solarPV,2020,13.46730000000
+1,2030,R1,solarPV,2020,13.46730000000
+1,2035,R1,solarPV,2020,13.46730000000
+1,2040,R1,solarPV,2020,13.46730000000
+1,2045,R1,solarPV,2020,13.46730000000
+1,2049,R1,solarPV,2020,13.46730000000
+2,2025,R1,windturbine,2020,20.00000000000
+2,2030,R1,windturbine,2020,20.00000000000
+2,2035,R1,windturbine,2020,20.00000000000
+2,2040,R1,windturbine,2020,20.00000000000
+2,2045,R1,windturbine,2020,20.00000000000
+2,2049,R1,windturbine,2020,20.00000000000
+3,2020,R2,gasCCGT,2020,1.00000000000
+3,2025,R2,gasCCGT,2020,1.00000000000
+4,2025,R2,solarPV,2020,13.46730000000
+4,2030,R2,solarPV,2020,13.46730000000
+4,2035,R2,solarPV,2020,13.46730000000
+4,2040,R2,solarPV,2020,13.46730000000
+4,2045,R2,solarPV,2020,13.46730000000
+4,2049,R2,solarPV,2020,13.46730000000
+5,2025,R2,windturbine,2020,20.00000000000
+5,2030,R2,windturbine,2020,20.00000000000
+5,2035,R2,windturbine,2020,20.00000000000
+5,2040,R2,windturbine,2020,20.00000000000
+5,2045,R2,windturbine,2020,20.00000000000
+5,2049,R2,windturbine,2020,20.00000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2030.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2030.csv
index 5920f22ed..f3bc25580 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2030.csv
@@ -1,73 +1,73 @@
-asset,year,region,installed,technology,capacity
-1,2030,R1,2020,solarPV,13.46730000000
-1,2035,R1,2020,solarPV,13.46730000000
-1,2040,R1,2020,solarPV,13.46730000000
-1,2045,R1,2020,solarPV,13.46730000000
-1,2049,R1,2020,solarPV,13.46730000000
-2,2030,R1,2020,windturbine,20.00000000000
-2,2035,R1,2020,windturbine,20.00000000000
-2,2040,R1,2020,windturbine,20.00000000000
-2,2045,R1,2020,windturbine,20.00000000000
-2,2049,R1,2020,windturbine,20.00000000000
-3,2030,R1,2025,gasCCGT,4.00000000000
-3,2035,R1,2025,gasCCGT,4.00000000000
-3,2040,R1,2025,gasCCGT,4.00000000000
-3,2045,R1,2025,gasCCGT,4.00000000000
-3,2049,R1,2025,gasCCGT,4.00000000000
-3,2050,R1,2025,gasCCGT,4.00000000000
-3,2054,R1,2025,gasCCGT,4.00000000000
-3,2055,R1,2025,gasCCGT,4.00000000000
-3,2059,R1,2025,gasCCGT,4.00000000000
-3,2060,R1,2025,gasCCGT,4.00000000000
-3,2064,R1,2025,gasCCGT,4.00000000000
-4,2030,R1,2025,solarPV,10.39350000000
-4,2035,R1,2025,solarPV,10.39350000000
-4,2040,R1,2025,solarPV,10.39350000000
-4,2045,R1,2025,solarPV,10.39350000000
-4,2049,R1,2025,solarPV,10.39350000000
-4,2050,R1,2025,solarPV,10.39350000000
-4,2054,R1,2025,solarPV,10.39350000000
-5,2035,R1,2030,solarPV,11.42930000000
-5,2040,R1,2030,solarPV,11.42930000000
-5,2045,R1,2030,solarPV,11.42930000000
-5,2049,R1,2030,solarPV,11.42930000000
-5,2050,R1,2030,solarPV,11.42930000000
-5,2054,R1,2030,solarPV,11.42930000000
-5,2055,R1,2030,solarPV,11.42930000000
-5,2059,R1,2030,solarPV,11.42930000000
-7,2030,R2,2020,solarPV,13.46730000000
-7,2035,R2,2020,solarPV,13.46730000000
-7,2040,R2,2020,solarPV,13.46730000000
-7,2045,R2,2020,solarPV,13.46730000000
-7,2049,R2,2020,solarPV,13.46730000000
-8,2030,R2,2020,windturbine,20.00000000000
-8,2035,R2,2020,windturbine,20.00000000000
-8,2040,R2,2020,windturbine,20.00000000000
-8,2045,R2,2020,windturbine,20.00000000000
-8,2049,R2,2020,windturbine,20.00000000000
-9,2030,R2,2025,gasCCGT,4.00000000000
-9,2035,R2,2025,gasCCGT,4.00000000000
-9,2040,R2,2025,gasCCGT,4.00000000000
-9,2045,R2,2025,gasCCGT,4.00000000000
-9,2049,R2,2025,gasCCGT,4.00000000000
-9,2050,R2,2025,gasCCGT,4.00000000000
-9,2054,R2,2025,gasCCGT,4.00000000000
-9,2055,R2,2025,gasCCGT,4.00000000000
-9,2059,R2,2025,gasCCGT,4.00000000000
-9,2060,R2,2025,gasCCGT,4.00000000000
-9,2064,R2,2025,gasCCGT,4.00000000000
-10,2030,R2,2025,solarPV,10.39350000000
-10,2035,R2,2025,solarPV,10.39350000000
-10,2040,R2,2025,solarPV,10.39350000000
-10,2045,R2,2025,solarPV,10.39350000000
-10,2049,R2,2025,solarPV,10.39350000000
-10,2050,R2,2025,solarPV,10.39350000000
-10,2054,R2,2025,solarPV,10.39350000000
-11,2035,R2,2030,solarPV,11.42930000000
-11,2040,R2,2030,solarPV,11.42930000000
-11,2045,R2,2030,solarPV,11.42930000000
-11,2049,R2,2030,solarPV,11.42930000000
-11,2050,R2,2030,solarPV,11.42930000000
-11,2054,R2,2030,solarPV,11.42930000000
-11,2055,R2,2030,solarPV,11.42930000000
-11,2059,R2,2030,solarPV,11.42930000000
+asset,year,region,technology,installed,capacity
+1,2030,R1,gasCCGT,2025,4.00000000000
+1,2035,R1,gasCCGT,2025,4.00000000000
+1,2040,R1,gasCCGT,2025,4.00000000000
+1,2045,R1,gasCCGT,2025,4.00000000000
+1,2049,R1,gasCCGT,2025,4.00000000000
+1,2050,R1,gasCCGT,2025,4.00000000000
+1,2054,R1,gasCCGT,2025,4.00000000000
+1,2055,R1,gasCCGT,2025,4.00000000000
+1,2059,R1,gasCCGT,2025,4.00000000000
+1,2060,R1,gasCCGT,2025,4.00000000000
+1,2064,R1,gasCCGT,2025,4.00000000000
+2,2030,R1,solarPV,2020,13.46730000000
+2,2035,R1,solarPV,2020,13.46730000000
+2,2040,R1,solarPV,2020,13.46730000000
+2,2045,R1,solarPV,2020,13.46730000000
+2,2049,R1,solarPV,2020,13.46730000000
+3,2030,R1,solarPV,2025,10.39350000000
+3,2035,R1,solarPV,2025,10.39350000000
+3,2040,R1,solarPV,2025,10.39350000000
+3,2045,R1,solarPV,2025,10.39350000000
+3,2049,R1,solarPV,2025,10.39350000000
+3,2050,R1,solarPV,2025,10.39350000000
+3,2054,R1,solarPV,2025,10.39350000000
+4,2035,R1,solarPV,2030,11.42930000000
+4,2040,R1,solarPV,2030,11.42930000000
+4,2045,R1,solarPV,2030,11.42930000000
+4,2049,R1,solarPV,2030,11.42930000000
+4,2050,R1,solarPV,2030,11.42930000000
+4,2054,R1,solarPV,2030,11.42930000000
+4,2055,R1,solarPV,2030,11.42930000000
+4,2059,R1,solarPV,2030,11.42930000000
+5,2030,R1,windturbine,2020,20.00000000000
+5,2035,R1,windturbine,2020,20.00000000000
+5,2040,R1,windturbine,2020,20.00000000000
+5,2045,R1,windturbine,2020,20.00000000000
+5,2049,R1,windturbine,2020,20.00000000000
+7,2030,R2,gasCCGT,2025,4.00000000000
+7,2035,R2,gasCCGT,2025,4.00000000000
+7,2040,R2,gasCCGT,2025,4.00000000000
+7,2045,R2,gasCCGT,2025,4.00000000000
+7,2049,R2,gasCCGT,2025,4.00000000000
+7,2050,R2,gasCCGT,2025,4.00000000000
+7,2054,R2,gasCCGT,2025,4.00000000000
+7,2055,R2,gasCCGT,2025,4.00000000000
+7,2059,R2,gasCCGT,2025,4.00000000000
+7,2060,R2,gasCCGT,2025,4.00000000000
+7,2064,R2,gasCCGT,2025,4.00000000000
+8,2030,R2,solarPV,2020,13.46730000000
+8,2035,R2,solarPV,2020,13.46730000000
+8,2040,R2,solarPV,2020,13.46730000000
+8,2045,R2,solarPV,2020,13.46730000000
+8,2049,R2,solarPV,2020,13.46730000000
+9,2030,R2,solarPV,2025,10.39350000000
+9,2035,R2,solarPV,2025,10.39350000000
+9,2040,R2,solarPV,2025,10.39350000000
+9,2045,R2,solarPV,2025,10.39350000000
+9,2049,R2,solarPV,2025,10.39350000000
+9,2050,R2,solarPV,2025,10.39350000000
+9,2054,R2,solarPV,2025,10.39350000000
+10,2035,R2,solarPV,2030,11.42930000000
+10,2040,R2,solarPV,2030,11.42930000000
+10,2045,R2,solarPV,2030,11.42930000000
+10,2049,R2,solarPV,2030,11.42930000000
+10,2050,R2,solarPV,2030,11.42930000000
+10,2054,R2,solarPV,2030,11.42930000000
+10,2055,R2,solarPV,2030,11.42930000000
+10,2059,R2,solarPV,2030,11.42930000000
+11,2030,R2,windturbine,2020,20.00000000000
+11,2035,R2,windturbine,2020,20.00000000000
+11,2040,R2,windturbine,2020,20.00000000000
+11,2045,R2,windturbine,2020,20.00000000000
+11,2049,R2,windturbine,2020,20.00000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2035.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2035.csv
index 73f39ddee..c2cb90707 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2035.csv
@@ -1,83 +1,83 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2020,solarPV,13.46730000000
-1,2040,R1,2020,solarPV,13.46730000000
-1,2045,R1,2020,solarPV,13.46730000000
-1,2049,R1,2020,solarPV,13.46730000000
-2,2035,R1,2020,windturbine,20.00000000000
-2,2040,R1,2020,windturbine,20.00000000000
-2,2045,R1,2020,windturbine,20.00000000000
-2,2049,R1,2020,windturbine,20.00000000000
-3,2035,R1,2025,gasCCGT,4.00000000000
-3,2040,R1,2025,gasCCGT,4.00000000000
-3,2045,R1,2025,gasCCGT,4.00000000000
-3,2049,R1,2025,gasCCGT,4.00000000000
-3,2050,R1,2025,gasCCGT,4.00000000000
-3,2054,R1,2025,gasCCGT,4.00000000000
-3,2055,R1,2025,gasCCGT,4.00000000000
-3,2059,R1,2025,gasCCGT,4.00000000000
-3,2060,R1,2025,gasCCGT,4.00000000000
-3,2064,R1,2025,gasCCGT,4.00000000000
-4,2035,R1,2025,solarPV,10.39350000000
-4,2040,R1,2025,solarPV,10.39350000000
-4,2045,R1,2025,solarPV,10.39350000000
-4,2049,R1,2025,solarPV,10.39350000000
-4,2050,R1,2025,solarPV,10.39350000000
-4,2054,R1,2025,solarPV,10.39350000000
-5,2035,R1,2030,solarPV,11.42930000000
-5,2040,R1,2030,solarPV,11.42930000000
-5,2045,R1,2030,solarPV,11.42930000000
-5,2049,R1,2030,solarPV,11.42930000000
-5,2050,R1,2030,solarPV,11.42930000000
-5,2054,R1,2030,solarPV,11.42930000000
-5,2055,R1,2030,solarPV,11.42930000000
-5,2059,R1,2030,solarPV,11.42930000000
-6,2040,R1,2035,solarPV,15.71520000000
-6,2045,R1,2035,solarPV,15.71520000000
-6,2049,R1,2035,solarPV,15.71520000000
-6,2050,R1,2035,solarPV,15.71520000000
-6,2054,R1,2035,solarPV,15.71520000000
-6,2055,R1,2035,solarPV,15.71520000000
-6,2059,R1,2035,solarPV,15.71520000000
-6,2060,R1,2035,solarPV,15.71520000000
-6,2064,R1,2035,solarPV,15.71520000000
-8,2035,R2,2020,solarPV,13.46730000000
-8,2040,R2,2020,solarPV,13.46730000000
-8,2045,R2,2020,solarPV,13.46730000000
-8,2049,R2,2020,solarPV,13.46730000000
-9,2035,R2,2020,windturbine,20.00000000000
-9,2040,R2,2020,windturbine,20.00000000000
-9,2045,R2,2020,windturbine,20.00000000000
-9,2049,R2,2020,windturbine,20.00000000000
-10,2035,R2,2025,gasCCGT,4.00000000000
-10,2040,R2,2025,gasCCGT,4.00000000000
-10,2045,R2,2025,gasCCGT,4.00000000000
-10,2049,R2,2025,gasCCGT,4.00000000000
-10,2050,R2,2025,gasCCGT,4.00000000000
-10,2054,R2,2025,gasCCGT,4.00000000000
-10,2055,R2,2025,gasCCGT,4.00000000000
-10,2059,R2,2025,gasCCGT,4.00000000000
-10,2060,R2,2025,gasCCGT,4.00000000000
-10,2064,R2,2025,gasCCGT,4.00000000000
-11,2035,R2,2025,solarPV,10.39350000000
-11,2040,R2,2025,solarPV,10.39350000000
-11,2045,R2,2025,solarPV,10.39350000000
-11,2049,R2,2025,solarPV,10.39350000000
-11,2050,R2,2025,solarPV,10.39350000000
-11,2054,R2,2025,solarPV,10.39350000000
-12,2035,R2,2030,solarPV,11.42930000000
-12,2040,R2,2030,solarPV,11.42930000000
-12,2045,R2,2030,solarPV,11.42930000000
-12,2049,R2,2030,solarPV,11.42930000000
-12,2050,R2,2030,solarPV,11.42930000000
-12,2054,R2,2030,solarPV,11.42930000000
-12,2055,R2,2030,solarPV,11.42930000000
-12,2059,R2,2030,solarPV,11.42930000000
-13,2040,R2,2035,solarPV,15.71520000000
-13,2045,R2,2035,solarPV,15.71520000000
-13,2049,R2,2035,solarPV,15.71520000000
-13,2050,R2,2035,solarPV,15.71520000000
-13,2054,R2,2035,solarPV,15.71520000000
-13,2055,R2,2035,solarPV,15.71520000000
-13,2059,R2,2035,solarPV,15.71520000000
-13,2060,R2,2035,solarPV,15.71520000000
-13,2064,R2,2035,solarPV,15.71520000000
+asset,year,region,technology,installed,capacity
+1,2035,R1,gasCCGT,2025,4.00000000000
+1,2040,R1,gasCCGT,2025,4.00000000000
+1,2045,R1,gasCCGT,2025,4.00000000000
+1,2049,R1,gasCCGT,2025,4.00000000000
+1,2050,R1,gasCCGT,2025,4.00000000000
+1,2054,R1,gasCCGT,2025,4.00000000000
+1,2055,R1,gasCCGT,2025,4.00000000000
+1,2059,R1,gasCCGT,2025,4.00000000000
+1,2060,R1,gasCCGT,2025,4.00000000000
+1,2064,R1,gasCCGT,2025,4.00000000000
+2,2035,R1,solarPV,2020,13.46730000000
+2,2040,R1,solarPV,2020,13.46730000000
+2,2045,R1,solarPV,2020,13.46730000000
+2,2049,R1,solarPV,2020,13.46730000000
+3,2035,R1,solarPV,2025,10.39350000000
+3,2040,R1,solarPV,2025,10.39350000000
+3,2045,R1,solarPV,2025,10.39350000000
+3,2049,R1,solarPV,2025,10.39350000000
+3,2050,R1,solarPV,2025,10.39350000000
+3,2054,R1,solarPV,2025,10.39350000000
+4,2035,R1,solarPV,2030,11.42930000000
+4,2040,R1,solarPV,2030,11.42930000000
+4,2045,R1,solarPV,2030,11.42930000000
+4,2049,R1,solarPV,2030,11.42930000000
+4,2050,R1,solarPV,2030,11.42930000000
+4,2054,R1,solarPV,2030,11.42930000000
+4,2055,R1,solarPV,2030,11.42930000000
+4,2059,R1,solarPV,2030,11.42930000000
+5,2040,R1,solarPV,2035,15.71520000000
+5,2045,R1,solarPV,2035,15.71520000000
+5,2049,R1,solarPV,2035,15.71520000000
+5,2050,R1,solarPV,2035,15.71520000000
+5,2054,R1,solarPV,2035,15.71520000000
+5,2055,R1,solarPV,2035,15.71520000000
+5,2059,R1,solarPV,2035,15.71520000000
+5,2060,R1,solarPV,2035,15.71520000000
+5,2064,R1,solarPV,2035,15.71520000000
+6,2035,R1,windturbine,2020,20.00000000000
+6,2040,R1,windturbine,2020,20.00000000000
+6,2045,R1,windturbine,2020,20.00000000000
+6,2049,R1,windturbine,2020,20.00000000000
+8,2035,R2,gasCCGT,2025,4.00000000000
+8,2040,R2,gasCCGT,2025,4.00000000000
+8,2045,R2,gasCCGT,2025,4.00000000000
+8,2049,R2,gasCCGT,2025,4.00000000000
+8,2050,R2,gasCCGT,2025,4.00000000000
+8,2054,R2,gasCCGT,2025,4.00000000000
+8,2055,R2,gasCCGT,2025,4.00000000000
+8,2059,R2,gasCCGT,2025,4.00000000000
+8,2060,R2,gasCCGT,2025,4.00000000000
+8,2064,R2,gasCCGT,2025,4.00000000000
+9,2035,R2,solarPV,2020,13.46730000000
+9,2040,R2,solarPV,2020,13.46730000000
+9,2045,R2,solarPV,2020,13.46730000000
+9,2049,R2,solarPV,2020,13.46730000000
+10,2035,R2,solarPV,2025,10.39350000000
+10,2040,R2,solarPV,2025,10.39350000000
+10,2045,R2,solarPV,2025,10.39350000000
+10,2049,R2,solarPV,2025,10.39350000000
+10,2050,R2,solarPV,2025,10.39350000000
+10,2054,R2,solarPV,2025,10.39350000000
+11,2035,R2,solarPV,2030,11.42930000000
+11,2040,R2,solarPV,2030,11.42930000000
+11,2045,R2,solarPV,2030,11.42930000000
+11,2049,R2,solarPV,2030,11.42930000000
+11,2050,R2,solarPV,2030,11.42930000000
+11,2054,R2,solarPV,2030,11.42930000000
+11,2055,R2,solarPV,2030,11.42930000000
+11,2059,R2,solarPV,2030,11.42930000000
+12,2040,R2,solarPV,2035,15.71520000000
+12,2045,R2,solarPV,2035,15.71520000000
+12,2049,R2,solarPV,2035,15.71520000000
+12,2050,R2,solarPV,2035,15.71520000000
+12,2054,R2,solarPV,2035,15.71520000000
+12,2055,R2,solarPV,2035,15.71520000000
+12,2059,R2,solarPV,2035,15.71520000000
+12,2060,R2,solarPV,2035,15.71520000000
+12,2064,R2,solarPV,2035,15.71520000000
+13,2035,R2,windturbine,2020,20.00000000000
+13,2040,R2,windturbine,2020,20.00000000000
+13,2045,R2,windturbine,2020,20.00000000000
+13,2049,R2,windturbine,2020,20.00000000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2040.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2040.csv
index 5aecf3d98..d400caf70 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2040.csv
@@ -1,113 +1,113 @@
-asset,year,region,installed,technology,capacity
-1,2040,R1,2020,solarPV,13.46730000000
-1,2045,R1,2020,solarPV,13.46730000000
-1,2049,R1,2020,solarPV,13.46730000000
-2,2040,R1,2020,windturbine,20.00000000000
-2,2045,R1,2020,windturbine,20.00000000000
-2,2049,R1,2020,windturbine,20.00000000000
-3,2040,R1,2025,gasCCGT,4.00000000000
-3,2045,R1,2025,gasCCGT,4.00000000000
-3,2049,R1,2025,gasCCGT,4.00000000000
-3,2050,R1,2025,gasCCGT,4.00000000000
-3,2054,R1,2025,gasCCGT,4.00000000000
-3,2055,R1,2025,gasCCGT,4.00000000000
-3,2059,R1,2025,gasCCGT,4.00000000000
-3,2060,R1,2025,gasCCGT,4.00000000000
-3,2064,R1,2025,gasCCGT,4.00000000000
-4,2040,R1,2025,solarPV,10.39350000000
-4,2045,R1,2025,solarPV,10.39350000000
-4,2049,R1,2025,solarPV,10.39350000000
-4,2050,R1,2025,solarPV,10.39350000000
-4,2054,R1,2025,solarPV,10.39350000000
-5,2040,R1,2030,solarPV,11.42930000000
-5,2045,R1,2030,solarPV,11.42930000000
-5,2049,R1,2030,solarPV,11.42930000000
-5,2050,R1,2030,solarPV,11.42930000000
-5,2054,R1,2030,solarPV,11.42930000000
-5,2055,R1,2030,solarPV,11.42930000000
-5,2059,R1,2030,solarPV,11.42930000000
-6,2040,R1,2035,solarPV,15.71520000000
-6,2045,R1,2035,solarPV,15.71520000000
-6,2049,R1,2035,solarPV,15.71520000000
-6,2050,R1,2035,solarPV,15.71520000000
-6,2054,R1,2035,solarPV,15.71520000000
-6,2055,R1,2035,solarPV,15.71520000000
-6,2059,R1,2035,solarPV,15.71520000000
-6,2060,R1,2035,solarPV,15.71520000000
-6,2064,R1,2035,solarPV,15.71520000000
-7,2045,R1,2040,solarPV,8.99470000000
-7,2049,R1,2040,solarPV,8.99470000000
-7,2050,R1,2040,solarPV,8.99470000000
-7,2054,R1,2040,solarPV,8.99470000000
-7,2055,R1,2040,solarPV,8.99470000000
-7,2059,R1,2040,solarPV,8.99470000000
-7,2060,R1,2040,solarPV,8.99470000000
-7,2064,R1,2040,solarPV,8.99470000000
-7,2065,R1,2040,solarPV,8.99470000000
-7,2069,R1,2040,solarPV,8.99470000000
-8,2045,R1,2040,windturbine,2.43470000000
-8,2049,R1,2040,windturbine,2.43470000000
-8,2050,R1,2040,windturbine,2.43470000000
-8,2054,R1,2040,windturbine,2.43470000000
-8,2055,R1,2040,windturbine,2.43470000000
-8,2059,R1,2040,windturbine,2.43470000000
-8,2060,R1,2040,windturbine,2.43470000000
-8,2064,R1,2040,windturbine,2.43470000000
-8,2065,R1,2040,windturbine,2.43470000000
-8,2069,R1,2040,windturbine,2.43470000000
-10,2040,R2,2020,solarPV,13.46730000000
-10,2045,R2,2020,solarPV,13.46730000000
-10,2049,R2,2020,solarPV,13.46730000000
-11,2040,R2,2020,windturbine,20.00000000000
-11,2045,R2,2020,windturbine,20.00000000000
-11,2049,R2,2020,windturbine,20.00000000000
-12,2040,R2,2025,gasCCGT,4.00000000000
-12,2045,R2,2025,gasCCGT,4.00000000000
-12,2049,R2,2025,gasCCGT,4.00000000000
-12,2050,R2,2025,gasCCGT,4.00000000000
-12,2054,R2,2025,gasCCGT,4.00000000000
-12,2055,R2,2025,gasCCGT,4.00000000000
-12,2059,R2,2025,gasCCGT,4.00000000000
-12,2060,R2,2025,gasCCGT,4.00000000000
-12,2064,R2,2025,gasCCGT,4.00000000000
-13,2040,R2,2025,solarPV,10.39350000000
-13,2045,R2,2025,solarPV,10.39350000000
-13,2049,R2,2025,solarPV,10.39350000000
-13,2050,R2,2025,solarPV,10.39350000000
-13,2054,R2,2025,solarPV,10.39350000000
-14,2040,R2,2030,solarPV,11.42930000000
-14,2045,R2,2030,solarPV,11.42930000000
-14,2049,R2,2030,solarPV,11.42930000000
-14,2050,R2,2030,solarPV,11.42930000000
-14,2054,R2,2030,solarPV,11.42930000000
-14,2055,R2,2030,solarPV,11.42930000000
-14,2059,R2,2030,solarPV,11.42930000000
-15,2040,R2,2035,solarPV,15.71520000000
-15,2045,R2,2035,solarPV,15.71520000000
-15,2049,R2,2035,solarPV,15.71520000000
-15,2050,R2,2035,solarPV,15.71520000000
-15,2054,R2,2035,solarPV,15.71520000000
-15,2055,R2,2035,solarPV,15.71520000000
-15,2059,R2,2035,solarPV,15.71520000000
-15,2060,R2,2035,solarPV,15.71520000000
-15,2064,R2,2035,solarPV,15.71520000000
-16,2045,R2,2040,solarPV,8.99470000000
-16,2049,R2,2040,solarPV,8.99470000000
-16,2050,R2,2040,solarPV,8.99470000000
-16,2054,R2,2040,solarPV,8.99470000000
-16,2055,R2,2040,solarPV,8.99470000000
-16,2059,R2,2040,solarPV,8.99470000000
-16,2060,R2,2040,solarPV,8.99470000000
-16,2064,R2,2040,solarPV,8.99470000000
-16,2065,R2,2040,solarPV,8.99470000000
-16,2069,R2,2040,solarPV,8.99470000000
-17,2045,R2,2040,windturbine,2.43470000000
-17,2049,R2,2040,windturbine,2.43470000000
-17,2050,R2,2040,windturbine,2.43470000000
-17,2054,R2,2040,windturbine,2.43470000000
-17,2055,R2,2040,windturbine,2.43470000000
-17,2059,R2,2040,windturbine,2.43470000000
-17,2060,R2,2040,windturbine,2.43470000000
-17,2064,R2,2040,windturbine,2.43470000000
-17,2065,R2,2040,windturbine,2.43470000000
-17,2069,R2,2040,windturbine,2.43470000000
+asset,year,region,technology,installed,capacity
+1,2040,R1,gasCCGT,2025,4.00000000000
+1,2045,R1,gasCCGT,2025,4.00000000000
+1,2049,R1,gasCCGT,2025,4.00000000000
+1,2050,R1,gasCCGT,2025,4.00000000000
+1,2054,R1,gasCCGT,2025,4.00000000000
+1,2055,R1,gasCCGT,2025,4.00000000000
+1,2059,R1,gasCCGT,2025,4.00000000000
+1,2060,R1,gasCCGT,2025,4.00000000000
+1,2064,R1,gasCCGT,2025,4.00000000000
+2,2040,R1,solarPV,2020,13.46730000000
+2,2045,R1,solarPV,2020,13.46730000000
+2,2049,R1,solarPV,2020,13.46730000000
+3,2040,R1,solarPV,2025,10.39350000000
+3,2045,R1,solarPV,2025,10.39350000000
+3,2049,R1,solarPV,2025,10.39350000000
+3,2050,R1,solarPV,2025,10.39350000000
+3,2054,R1,solarPV,2025,10.39350000000
+4,2040,R1,solarPV,2030,11.42930000000
+4,2045,R1,solarPV,2030,11.42930000000
+4,2049,R1,solarPV,2030,11.42930000000
+4,2050,R1,solarPV,2030,11.42930000000
+4,2054,R1,solarPV,2030,11.42930000000
+4,2055,R1,solarPV,2030,11.42930000000
+4,2059,R1,solarPV,2030,11.42930000000
+5,2040,R1,solarPV,2035,15.71520000000
+5,2045,R1,solarPV,2035,15.71520000000
+5,2049,R1,solarPV,2035,15.71520000000
+5,2050,R1,solarPV,2035,15.71520000000
+5,2054,R1,solarPV,2035,15.71520000000
+5,2055,R1,solarPV,2035,15.71520000000
+5,2059,R1,solarPV,2035,15.71520000000
+5,2060,R1,solarPV,2035,15.71520000000
+5,2064,R1,solarPV,2035,15.71520000000
+6,2045,R1,solarPV,2040,8.99470000000
+6,2049,R1,solarPV,2040,8.99470000000
+6,2050,R1,solarPV,2040,8.99470000000
+6,2054,R1,solarPV,2040,8.99470000000
+6,2055,R1,solarPV,2040,8.99470000000
+6,2059,R1,solarPV,2040,8.99470000000
+6,2060,R1,solarPV,2040,8.99470000000
+6,2064,R1,solarPV,2040,8.99470000000
+6,2065,R1,solarPV,2040,8.99470000000
+6,2069,R1,solarPV,2040,8.99470000000
+7,2040,R1,windturbine,2020,20.00000000000
+7,2045,R1,windturbine,2020,20.00000000000
+7,2049,R1,windturbine,2020,20.00000000000
+8,2045,R1,windturbine,2040,2.43470000000
+8,2049,R1,windturbine,2040,2.43470000000
+8,2050,R1,windturbine,2040,2.43470000000
+8,2054,R1,windturbine,2040,2.43470000000
+8,2055,R1,windturbine,2040,2.43470000000
+8,2059,R1,windturbine,2040,2.43470000000
+8,2060,R1,windturbine,2040,2.43470000000
+8,2064,R1,windturbine,2040,2.43470000000
+8,2065,R1,windturbine,2040,2.43470000000
+8,2069,R1,windturbine,2040,2.43470000000
+10,2040,R2,gasCCGT,2025,4.00000000000
+10,2045,R2,gasCCGT,2025,4.00000000000
+10,2049,R2,gasCCGT,2025,4.00000000000
+10,2050,R2,gasCCGT,2025,4.00000000000
+10,2054,R2,gasCCGT,2025,4.00000000000
+10,2055,R2,gasCCGT,2025,4.00000000000
+10,2059,R2,gasCCGT,2025,4.00000000000
+10,2060,R2,gasCCGT,2025,4.00000000000
+10,2064,R2,gasCCGT,2025,4.00000000000
+11,2040,R2,solarPV,2020,13.46730000000
+11,2045,R2,solarPV,2020,13.46730000000
+11,2049,R2,solarPV,2020,13.46730000000
+12,2040,R2,solarPV,2025,10.39350000000
+12,2045,R2,solarPV,2025,10.39350000000
+12,2049,R2,solarPV,2025,10.39350000000
+12,2050,R2,solarPV,2025,10.39350000000
+12,2054,R2,solarPV,2025,10.39350000000
+13,2040,R2,solarPV,2030,11.42930000000
+13,2045,R2,solarPV,2030,11.42930000000
+13,2049,R2,solarPV,2030,11.42930000000
+13,2050,R2,solarPV,2030,11.42930000000
+13,2054,R2,solarPV,2030,11.42930000000
+13,2055,R2,solarPV,2030,11.42930000000
+13,2059,R2,solarPV,2030,11.42930000000
+14,2040,R2,solarPV,2035,15.71520000000
+14,2045,R2,solarPV,2035,15.71520000000
+14,2049,R2,solarPV,2035,15.71520000000
+14,2050,R2,solarPV,2035,15.71520000000
+14,2054,R2,solarPV,2035,15.71520000000
+14,2055,R2,solarPV,2035,15.71520000000
+14,2059,R2,solarPV,2035,15.71520000000
+14,2060,R2,solarPV,2035,15.71520000000
+14,2064,R2,solarPV,2035,15.71520000000
+15,2045,R2,solarPV,2040,8.99470000000
+15,2049,R2,solarPV,2040,8.99470000000
+15,2050,R2,solarPV,2040,8.99470000000
+15,2054,R2,solarPV,2040,8.99470000000
+15,2055,R2,solarPV,2040,8.99470000000
+15,2059,R2,solarPV,2040,8.99470000000
+15,2060,R2,solarPV,2040,8.99470000000
+15,2064,R2,solarPV,2040,8.99470000000
+15,2065,R2,solarPV,2040,8.99470000000
+15,2069,R2,solarPV,2040,8.99470000000
+16,2040,R2,windturbine,2020,20.00000000000
+16,2045,R2,windturbine,2020,20.00000000000
+16,2049,R2,windturbine,2020,20.00000000000
+17,2045,R2,windturbine,2040,2.43470000000
+17,2049,R2,windturbine,2040,2.43470000000
+17,2050,R2,windturbine,2040,2.43470000000
+17,2054,R2,windturbine,2040,2.43470000000
+17,2055,R2,windturbine,2040,2.43470000000
+17,2059,R2,windturbine,2040,2.43470000000
+17,2060,R2,windturbine,2040,2.43470000000
+17,2064,R2,windturbine,2040,2.43470000000
+17,2065,R2,windturbine,2040,2.43470000000
+17,2069,R2,windturbine,2040,2.43470000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2050.csv
index 6092e0621..8a614458b 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Power/Capacity/2050.csv
@@ -1,129 +1,129 @@
-asset,year,region,installed,technology,capacity
-2,2050,R1,2025,gasCCGT,4.00000000000
-2,2054,R1,2025,gasCCGT,4.00000000000
-2,2055,R1,2025,gasCCGT,4.00000000000
-2,2059,R1,2025,gasCCGT,4.00000000000
-2,2060,R1,2025,gasCCGT,4.00000000000
-2,2064,R1,2025,gasCCGT,4.00000000000
-3,2050,R1,2025,solarPV,10.39350000000
-3,2054,R1,2025,solarPV,10.39350000000
-4,2050,R1,2030,solarPV,11.42930000000
-4,2054,R1,2030,solarPV,11.42930000000
-4,2055,R1,2030,solarPV,11.42930000000
-4,2059,R1,2030,solarPV,11.42930000000
-5,2050,R1,2035,solarPV,15.71520000000
-5,2054,R1,2035,solarPV,15.71520000000
-5,2055,R1,2035,solarPV,15.71520000000
-5,2059,R1,2035,solarPV,15.71520000000
-5,2060,R1,2035,solarPV,15.71520000000
-5,2064,R1,2035,solarPV,15.71520000000
-6,2050,R1,2040,solarPV,8.99470000000
-6,2054,R1,2040,solarPV,8.99470000000
-6,2055,R1,2040,solarPV,8.99470000000
-6,2059,R1,2040,solarPV,8.99470000000
-6,2060,R1,2040,solarPV,8.99470000000
-6,2064,R1,2040,solarPV,8.99470000000
-6,2065,R1,2040,solarPV,8.99470000000
-6,2069,R1,2040,solarPV,8.99470000000
-7,2050,R1,2040,windturbine,2.43470000000
-7,2054,R1,2040,windturbine,2.43470000000
-7,2055,R1,2040,windturbine,2.43470000000
-7,2059,R1,2040,windturbine,2.43470000000
-7,2060,R1,2040,windturbine,2.43470000000
-7,2064,R1,2040,windturbine,2.43470000000
-7,2065,R1,2040,windturbine,2.43470000000
-7,2069,R1,2040,windturbine,2.43470000000
-8,2050,R1,2045,solarPV,24.89670000000
-8,2054,R1,2045,solarPV,24.89670000000
-8,2055,R1,2045,solarPV,24.89670000000
-8,2059,R1,2045,solarPV,24.89670000000
-8,2060,R1,2045,solarPV,24.89670000000
-8,2064,R1,2045,solarPV,24.89670000000
-8,2065,R1,2045,solarPV,24.89670000000
-8,2069,R1,2045,solarPV,24.89670000000
-8,2070,R1,2045,solarPV,24.89670000000
-8,2074,R1,2045,solarPV,24.89670000000
-9,2050,R1,2045,windturbine,20.00000000000
-9,2054,R1,2045,windturbine,20.00000000000
-9,2055,R1,2045,windturbine,20.00000000000
-9,2059,R1,2045,windturbine,20.00000000000
-9,2060,R1,2045,windturbine,20.00000000000
-9,2064,R1,2045,windturbine,20.00000000000
-9,2065,R1,2045,windturbine,20.00000000000
-9,2069,R1,2045,windturbine,20.00000000000
-9,2070,R1,2045,windturbine,20.00000000000
-9,2074,R1,2045,windturbine,20.00000000000
-10,2055,R1,2050,windturbine,10.39350000000
-10,2059,R1,2050,windturbine,10.39350000000
-10,2060,R1,2050,windturbine,10.39350000000
-10,2064,R1,2050,windturbine,10.39350000000
-10,2065,R1,2050,windturbine,10.39350000000
-10,2069,R1,2050,windturbine,10.39350000000
-10,2070,R1,2050,windturbine,10.39350000000
-10,2074,R1,2050,windturbine,10.39350000000
-10,2075,R1,2050,windturbine,10.39350000000
-10,2079,R1,2050,windturbine,10.39350000000
-13,2050,R2,2025,gasCCGT,4.00000000000
-13,2054,R2,2025,gasCCGT,4.00000000000
-13,2055,R2,2025,gasCCGT,4.00000000000
-13,2059,R2,2025,gasCCGT,4.00000000000
-13,2060,R2,2025,gasCCGT,4.00000000000
-13,2064,R2,2025,gasCCGT,4.00000000000
-14,2050,R2,2025,solarPV,10.39350000000
-14,2054,R2,2025,solarPV,10.39350000000
-15,2050,R2,2030,solarPV,11.42930000000
-15,2054,R2,2030,solarPV,11.42930000000
-15,2055,R2,2030,solarPV,11.42930000000
-15,2059,R2,2030,solarPV,11.42930000000
-16,2050,R2,2035,solarPV,15.71520000000
-16,2054,R2,2035,solarPV,15.71520000000
-16,2055,R2,2035,solarPV,15.71520000000
-16,2059,R2,2035,solarPV,15.71520000000
-16,2060,R2,2035,solarPV,15.71520000000
-16,2064,R2,2035,solarPV,15.71520000000
-17,2050,R2,2040,solarPV,8.99470000000
-17,2054,R2,2040,solarPV,8.99470000000
-17,2055,R2,2040,solarPV,8.99470000000
-17,2059,R2,2040,solarPV,8.99470000000
-17,2060,R2,2040,solarPV,8.99470000000
-17,2064,R2,2040,solarPV,8.99470000000
-17,2065,R2,2040,solarPV,8.99470000000
-17,2069,R2,2040,solarPV,8.99470000000
-18,2050,R2,2040,windturbine,2.43470000000
-18,2054,R2,2040,windturbine,2.43470000000
-18,2055,R2,2040,windturbine,2.43470000000
-18,2059,R2,2040,windturbine,2.43470000000
-18,2060,R2,2040,windturbine,2.43470000000
-18,2064,R2,2040,windturbine,2.43470000000
-18,2065,R2,2040,windturbine,2.43470000000
-18,2069,R2,2040,windturbine,2.43470000000
-19,2050,R2,2045,solarPV,24.89670000000
-19,2054,R2,2045,solarPV,24.89670000000
-19,2055,R2,2045,solarPV,24.89670000000
-19,2059,R2,2045,solarPV,24.89670000000
-19,2060,R2,2045,solarPV,24.89670000000
-19,2064,R2,2045,solarPV,24.89670000000
-19,2065,R2,2045,solarPV,24.89670000000
-19,2069,R2,2045,solarPV,24.89670000000
-19,2070,R2,2045,solarPV,24.89670000000
-19,2074,R2,2045,solarPV,24.89670000000
-20,2050,R2,2045,windturbine,20.00000000000
-20,2054,R2,2045,windturbine,20.00000000000
-20,2055,R2,2045,windturbine,20.00000000000
-20,2059,R2,2045,windturbine,20.00000000000
-20,2060,R2,2045,windturbine,20.00000000000
-20,2064,R2,2045,windturbine,20.00000000000
-20,2065,R2,2045,windturbine,20.00000000000
-20,2069,R2,2045,windturbine,20.00000000000
-20,2070,R2,2045,windturbine,20.00000000000
-20,2074,R2,2045,windturbine,20.00000000000
-21,2055,R2,2050,windturbine,10.39350000000
-21,2059,R2,2050,windturbine,10.39350000000
-21,2060,R2,2050,windturbine,10.39350000000
-21,2064,R2,2050,windturbine,10.39350000000
-21,2065,R2,2050,windturbine,10.39350000000
-21,2069,R2,2050,windturbine,10.39350000000
-21,2070,R2,2050,windturbine,10.39350000000
-21,2074,R2,2050,windturbine,10.39350000000
-21,2075,R2,2050,windturbine,10.39350000000
-21,2079,R2,2050,windturbine,10.39350000000
+asset,year,region,technology,installed,capacity
+0,2050,R1,gasCCGT,2025,4.00000000000
+0,2054,R1,gasCCGT,2025,4.00000000000
+0,2055,R1,gasCCGT,2025,4.00000000000
+0,2059,R1,gasCCGT,2025,4.00000000000
+0,2060,R1,gasCCGT,2025,4.00000000000
+0,2064,R1,gasCCGT,2025,4.00000000000
+2,2050,R1,solarPV,2025,10.39350000000
+2,2054,R1,solarPV,2025,10.39350000000
+3,2050,R1,solarPV,2030,11.42930000000
+3,2054,R1,solarPV,2030,11.42930000000
+3,2055,R1,solarPV,2030,11.42930000000
+3,2059,R1,solarPV,2030,11.42930000000
+4,2050,R1,solarPV,2035,15.71520000000
+4,2054,R1,solarPV,2035,15.71520000000
+4,2055,R1,solarPV,2035,15.71520000000
+4,2059,R1,solarPV,2035,15.71520000000
+4,2060,R1,solarPV,2035,15.71520000000
+4,2064,R1,solarPV,2035,15.71520000000
+5,2050,R1,solarPV,2040,8.99470000000
+5,2054,R1,solarPV,2040,8.99470000000
+5,2055,R1,solarPV,2040,8.99470000000
+5,2059,R1,solarPV,2040,8.99470000000
+5,2060,R1,solarPV,2040,8.99470000000
+5,2064,R1,solarPV,2040,8.99470000000
+5,2065,R1,solarPV,2040,8.99470000000
+5,2069,R1,solarPV,2040,8.99470000000
+6,2050,R1,solarPV,2045,24.89670000000
+6,2054,R1,solarPV,2045,24.89670000000
+6,2055,R1,solarPV,2045,24.89670000000
+6,2059,R1,solarPV,2045,24.89670000000
+6,2060,R1,solarPV,2045,24.89670000000
+6,2064,R1,solarPV,2045,24.89670000000
+6,2065,R1,solarPV,2045,24.89670000000
+6,2069,R1,solarPV,2045,24.89670000000
+6,2070,R1,solarPV,2045,24.89670000000
+6,2074,R1,solarPV,2045,24.89670000000
+8,2050,R1,windturbine,2040,2.43470000000
+8,2054,R1,windturbine,2040,2.43470000000
+8,2055,R1,windturbine,2040,2.43470000000
+8,2059,R1,windturbine,2040,2.43470000000
+8,2060,R1,windturbine,2040,2.43470000000
+8,2064,R1,windturbine,2040,2.43470000000
+8,2065,R1,windturbine,2040,2.43470000000
+8,2069,R1,windturbine,2040,2.43470000000
+9,2050,R1,windturbine,2045,20.00000000000
+9,2054,R1,windturbine,2045,20.00000000000
+9,2055,R1,windturbine,2045,20.00000000000
+9,2059,R1,windturbine,2045,20.00000000000
+9,2060,R1,windturbine,2045,20.00000000000
+9,2064,R1,windturbine,2045,20.00000000000
+9,2065,R1,windturbine,2045,20.00000000000
+9,2069,R1,windturbine,2045,20.00000000000
+9,2070,R1,windturbine,2045,20.00000000000
+9,2074,R1,windturbine,2045,20.00000000000
+10,2055,R1,windturbine,2050,10.39350000000
+10,2059,R1,windturbine,2050,10.39350000000
+10,2060,R1,windturbine,2050,10.39350000000
+10,2064,R1,windturbine,2050,10.39350000000
+10,2065,R1,windturbine,2050,10.39350000000
+10,2069,R1,windturbine,2050,10.39350000000
+10,2070,R1,windturbine,2050,10.39350000000
+10,2074,R1,windturbine,2050,10.39350000000
+10,2075,R1,windturbine,2050,10.39350000000
+10,2079,R1,windturbine,2050,10.39350000000
+11,2050,R2,gasCCGT,2025,4.00000000000
+11,2054,R2,gasCCGT,2025,4.00000000000
+11,2055,R2,gasCCGT,2025,4.00000000000
+11,2059,R2,gasCCGT,2025,4.00000000000
+11,2060,R2,gasCCGT,2025,4.00000000000
+11,2064,R2,gasCCGT,2025,4.00000000000
+13,2050,R2,solarPV,2025,10.39350000000
+13,2054,R2,solarPV,2025,10.39350000000
+14,2050,R2,solarPV,2030,11.42930000000
+14,2054,R2,solarPV,2030,11.42930000000
+14,2055,R2,solarPV,2030,11.42930000000
+14,2059,R2,solarPV,2030,11.42930000000
+15,2050,R2,solarPV,2035,15.71520000000
+15,2054,R2,solarPV,2035,15.71520000000
+15,2055,R2,solarPV,2035,15.71520000000
+15,2059,R2,solarPV,2035,15.71520000000
+15,2060,R2,solarPV,2035,15.71520000000
+15,2064,R2,solarPV,2035,15.71520000000
+16,2050,R2,solarPV,2040,8.99470000000
+16,2054,R2,solarPV,2040,8.99470000000
+16,2055,R2,solarPV,2040,8.99470000000
+16,2059,R2,solarPV,2040,8.99470000000
+16,2060,R2,solarPV,2040,8.99470000000
+16,2064,R2,solarPV,2040,8.99470000000
+16,2065,R2,solarPV,2040,8.99470000000
+16,2069,R2,solarPV,2040,8.99470000000
+17,2050,R2,solarPV,2045,24.89670000000
+17,2054,R2,solarPV,2045,24.89670000000
+17,2055,R2,solarPV,2045,24.89670000000
+17,2059,R2,solarPV,2045,24.89670000000
+17,2060,R2,solarPV,2045,24.89670000000
+17,2064,R2,solarPV,2045,24.89670000000
+17,2065,R2,solarPV,2045,24.89670000000
+17,2069,R2,solarPV,2045,24.89670000000
+17,2070,R2,solarPV,2045,24.89670000000
+17,2074,R2,solarPV,2045,24.89670000000
+19,2050,R2,windturbine,2040,2.43470000000
+19,2054,R2,windturbine,2040,2.43470000000
+19,2055,R2,windturbine,2040,2.43470000000
+19,2059,R2,windturbine,2040,2.43470000000
+19,2060,R2,windturbine,2040,2.43470000000
+19,2064,R2,windturbine,2040,2.43470000000
+19,2065,R2,windturbine,2040,2.43470000000
+19,2069,R2,windturbine,2040,2.43470000000
+20,2050,R2,windturbine,2045,20.00000000000
+20,2054,R2,windturbine,2045,20.00000000000
+20,2055,R2,windturbine,2045,20.00000000000
+20,2059,R2,windturbine,2045,20.00000000000
+20,2060,R2,windturbine,2045,20.00000000000
+20,2064,R2,windturbine,2045,20.00000000000
+20,2065,R2,windturbine,2045,20.00000000000
+20,2069,R2,windturbine,2045,20.00000000000
+20,2070,R2,windturbine,2045,20.00000000000
+20,2074,R2,windturbine,2045,20.00000000000
+21,2055,R2,windturbine,2050,10.39350000000
+21,2059,R2,windturbine,2050,10.39350000000
+21,2060,R2,windturbine,2050,10.39350000000
+21,2064,R2,windturbine,2050,10.39350000000
+21,2065,R2,windturbine,2050,10.39350000000
+21,2069,R2,windturbine,2050,10.39350000000
+21,2070,R2,windturbine,2050,10.39350000000
+21,2074,R2,windturbine,2050,10.39350000000
+21,2075,R2,windturbine,2050,10.39350000000
+21,2079,R2,windturbine,2050,10.39350000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2050.csv
index 811361264..3702353ca 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Capacity/2050.csv
@@ -1,41 +1,41 @@
-asset,year,region,installed,technology,capacity
-2,2050,R1,2040,estove,29.28800000000
-2,2054,R1,2040,estove,29.28800000000
-3,2050,R1,2040,heatpump,29.28800000000
-3,2054,R1,2040,heatpump,29.28800000000
-4,2050,R1,2045,estove,22.14400000000
-4,2054,R1,2045,estove,22.14400000000
-4,2055,R1,2045,estove,22.14400000000
-4,2059,R1,2045,estove,22.14400000000
-5,2050,R1,2045,heatpump,22.14400000000
-5,2054,R1,2045,heatpump,22.14400000000
-5,2055,R1,2045,heatpump,22.14400000000
-5,2059,R1,2045,heatpump,22.14400000000
-6,2055,R1,2050,estove,29.28800000000
-6,2059,R1,2050,estove,29.28800000000
-6,2060,R1,2050,estove,29.28800000000
-6,2064,R1,2050,estove,29.28800000000
-7,2055,R1,2050,heatpump,29.28800000000
-7,2059,R1,2050,heatpump,29.28800000000
-7,2060,R1,2050,heatpump,29.28800000000
-7,2064,R1,2050,heatpump,29.28800000000
-10,2050,R2,2040,estove,29.28800000000
-10,2054,R2,2040,estove,29.28800000000
-11,2050,R2,2040,heatpump,29.28800000000
-11,2054,R2,2040,heatpump,29.28800000000
-12,2050,R2,2045,estove,22.14400000000
-12,2054,R2,2045,estove,22.14400000000
-12,2055,R2,2045,estove,22.14400000000
-12,2059,R2,2045,estove,22.14400000000
-13,2050,R2,2045,heatpump,22.14400000000
-13,2054,R2,2045,heatpump,22.14400000000
-13,2055,R2,2045,heatpump,22.14400000000
-13,2059,R2,2045,heatpump,22.14400000000
-14,2055,R2,2050,estove,29.28800000000
-14,2059,R2,2050,estove,29.28800000000
-14,2060,R2,2050,estove,29.28800000000
-14,2064,R2,2050,estove,29.28800000000
-15,2055,R2,2050,heatpump,29.28800000000
-15,2059,R2,2050,heatpump,29.28800000000
-15,2060,R2,2050,heatpump,29.28800000000
-15,2064,R2,2050,heatpump,29.28800000000
+asset,year,region,technology,installed,capacity
+1,2050,R1,estove,2040,29.28800000000
+1,2054,R1,estove,2040,29.28800000000
+2,2050,R1,estove,2045,22.14400000000
+2,2054,R1,estove,2045,22.14400000000
+2,2055,R1,estove,2045,22.14400000000
+2,2059,R1,estove,2045,22.14400000000
+3,2055,R1,estove,2050,29.28800000000
+3,2059,R1,estove,2050,29.28800000000
+3,2060,R1,estove,2050,29.28800000000
+3,2064,R1,estove,2050,29.28800000000
+5,2050,R1,heatpump,2040,29.28800000000
+5,2054,R1,heatpump,2040,29.28800000000
+6,2050,R1,heatpump,2045,22.14400000000
+6,2054,R1,heatpump,2045,22.14400000000
+6,2055,R1,heatpump,2045,22.14400000000
+6,2059,R1,heatpump,2045,22.14400000000
+7,2055,R1,heatpump,2050,29.28800000000
+7,2059,R1,heatpump,2050,29.28800000000
+7,2060,R1,heatpump,2050,29.28800000000
+7,2064,R1,heatpump,2050,29.28800000000
+9,2050,R2,estove,2040,29.28800000000
+9,2054,R2,estove,2040,29.28800000000
+10,2050,R2,estove,2045,22.14400000000
+10,2054,R2,estove,2045,22.14400000000
+10,2055,R2,estove,2045,22.14400000000
+10,2059,R2,estove,2045,22.14400000000
+11,2055,R2,estove,2050,29.28800000000
+11,2059,R2,estove,2050,29.28800000000
+11,2060,R2,estove,2050,29.28800000000
+11,2064,R2,estove,2050,29.28800000000
+13,2050,R2,heatpump,2040,29.28800000000
+13,2054,R2,heatpump,2040,29.28800000000
+14,2050,R2,heatpump,2045,22.14400000000
+14,2054,R2,heatpump,2045,22.14400000000
+14,2055,R2,heatpump,2045,22.14400000000
+14,2059,R2,heatpump,2045,22.14400000000
+15,2055,R2,heatpump,2050,29.28800000000
+15,2059,R2,heatpump,2050,29.28800000000
+15,2060,R2,heatpump,2050,29.28800000000
+15,2064,R2,heatpump,2050,29.28800000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2020.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2020.csv
index 0155957bc..f2ccd9971 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2020.csv
@@ -1,321 +1,321 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2020,4,gasboiler,2020,all-year,all-week,night,0.35700000000
-0,heat,R1,2020,5,gasboiler,2020,all-year,all-week,night,0.35700000000
-0,heat,R1,2025,4,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R1,2025,5,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R1,2025,6,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R1,2025,7,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R2,2020,4,gasboiler,2020,all-year,all-week,night,0.35700000000
-0,heat,R2,2020,5,gasboiler,2020,all-year,all-week,night,0.35700000000
-0,heat,R2,2025,4,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R2,2025,5,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R2,2025,6,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R2,2025,7,heatpump,2020,all-year,all-week,night,0.37190000000
-0,CO2f,R1,2020,2,gas_stove,2020,all-year,all-week,night,17.85000000000
-0,CO2f,R1,2020,3,gas_stove,2020,all-year,all-week,night,17.85000000000
-0,CO2f,R1,2020,4,gasboiler,2020,all-year,all-week,night,23.10150000000
-0,CO2f,R1,2020,5,gasboiler,2020,all-year,all-week,night,23.10150000000
-0,CO2f,R1,2025,2,gas_stove,2020,all-year,all-week,night,5.20590000000
-0,CO2f,R1,2025,3,gas_stove,2020,all-year,all-week,night,5.20590000000
-0,CO2f,R1,2025,4,gasboiler,2020,all-year,all-week,night,6.73750000000
-0,CO2f,R1,2025,5,gasboiler,2020,all-year,all-week,night,6.73750000000
-0,CO2f,R2,2020,2,gas_stove,2020,all-year,all-week,night,17.85000000000
-0,CO2f,R2,2020,3,gas_stove,2020,all-year,all-week,night,17.85000000000
-0,CO2f,R2,2020,4,gasboiler,2020,all-year,all-week,night,23.10150000000
-0,CO2f,R2,2020,5,gasboiler,2020,all-year,all-week,night,23.10150000000
-0,CO2f,R2,2025,2,gas_stove,2020,all-year,all-week,night,5.20590000000
-0,CO2f,R2,2025,3,gas_stove,2020,all-year,all-week,night,5.20590000000
-0,CO2f,R2,2025,4,gasboiler,2020,all-year,all-week,night,6.73750000000
-0,CO2f,R2,2025,5,gasboiler,2020,all-year,all-week,night,6.73750000000
-0,cook,R1,2020,2,gas_stove,2020,all-year,all-week,night,0.35700000000
-0,cook,R1,2020,3,gas_stove,2020,all-year,all-week,night,0.35700000000
-0,cook,R1,2025,0,estove,2020,all-year,all-week,night,0.37190000000
-0,cook,R1,2025,1,estove,2020,all-year,all-week,night,0.37190000000
-0,cook,R1,2025,2,gas_stove,2020,all-year,all-week,night,0.10410000000
-0,cook,R1,2025,3,gas_stove,2020,all-year,all-week,night,0.10410000000
-0,cook,R2,2020,2,gas_stove,2020,all-year,all-week,night,0.35700000000
-0,cook,R2,2020,3,gas_stove,2020,all-year,all-week,night,0.35700000000
-0,cook,R2,2025,0,estove,2020,all-year,all-week,night,0.37190000000
-0,cook,R2,2025,1,estove,2020,all-year,all-week,night,0.37190000000
-0,cook,R2,2025,2,gas_stove,2020,all-year,all-week,night,0.10410000000
-0,cook,R2,2025,3,gas_stove,2020,all-year,all-week,night,0.10410000000
-1,heat,R1,2020,4,gasboiler,2020,all-year,all-week,morning,0.53550000000
-1,heat,R1,2020,5,gasboiler,2020,all-year,all-week,morning,0.53550000000
-1,heat,R1,2025,4,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R1,2025,5,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R1,2025,6,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R1,2025,7,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R2,2020,4,gasboiler,2020,all-year,all-week,morning,0.53550000000
-1,heat,R2,2020,5,gasboiler,2020,all-year,all-week,morning,0.53550000000
-1,heat,R2,2025,4,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R2,2025,5,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R2,2025,6,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R2,2025,7,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,CO2f,R1,2020,2,gas_stove,2020,all-year,all-week,morning,26.77500000000
-1,CO2f,R1,2020,3,gas_stove,2020,all-year,all-week,morning,26.77500000000
-1,CO2f,R1,2020,4,gasboiler,2020,all-year,all-week,morning,34.65220000000
-1,CO2f,R1,2020,5,gasboiler,2020,all-year,all-week,morning,34.65220000000
-1,CO2f,R1,2025,2,gas_stove,2020,all-year,all-week,morning,7.80890000000
-1,CO2f,R1,2025,3,gas_stove,2020,all-year,all-week,morning,7.80890000000
-1,CO2f,R1,2025,4,gasboiler,2020,all-year,all-week,morning,10.10620000000
-1,CO2f,R1,2025,5,gasboiler,2020,all-year,all-week,morning,10.10620000000
-1,CO2f,R2,2020,2,gas_stove,2020,all-year,all-week,morning,26.77500000000
-1,CO2f,R2,2020,3,gas_stove,2020,all-year,all-week,morning,26.77500000000
-1,CO2f,R2,2020,4,gasboiler,2020,all-year,all-week,morning,34.65220000000
-1,CO2f,R2,2020,5,gasboiler,2020,all-year,all-week,morning,34.65220000000
-1,CO2f,R2,2025,2,gas_stove,2020,all-year,all-week,morning,7.80890000000
-1,CO2f,R2,2025,3,gas_stove,2020,all-year,all-week,morning,7.80890000000
-1,CO2f,R2,2025,4,gasboiler,2020,all-year,all-week,morning,10.10620000000
-1,CO2f,R2,2025,5,gasboiler,2020,all-year,all-week,morning,10.10620000000
-1,cook,R1,2020,2,gas_stove,2020,all-year,all-week,morning,0.53550000000
-1,cook,R1,2020,3,gas_stove,2020,all-year,all-week,morning,0.53550000000
-1,cook,R1,2025,0,estove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R1,2025,1,estove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R1,2025,2,gas_stove,2020,all-year,all-week,morning,0.15620000000
-1,cook,R1,2025,3,gas_stove,2020,all-year,all-week,morning,0.15620000000
-1,cook,R2,2020,2,gas_stove,2020,all-year,all-week,morning,0.53550000000
-1,cook,R2,2020,3,gas_stove,2020,all-year,all-week,morning,0.53550000000
-1,cook,R2,2025,0,estove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R2,2025,1,estove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R2,2025,2,gas_stove,2020,all-year,all-week,morning,0.15620000000
-1,cook,R2,2025,3,gas_stove,2020,all-year,all-week,morning,0.15620000000
-2,heat,R1,2020,4,gasboiler,2020,all-year,all-week,mid-afternoon,0.35700000000
-2,heat,R1,2020,5,gasboiler,2020,all-year,all-week,mid-afternoon,0.35700000000
-2,heat,R1,2025,4,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R1,2025,5,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R1,2025,6,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R1,2025,7,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R2,2020,4,gasboiler,2020,all-year,all-week,mid-afternoon,0.35700000000
-2,heat,R2,2020,5,gasboiler,2020,all-year,all-week,mid-afternoon,0.35700000000
-2,heat,R2,2025,4,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R2,2025,5,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R2,2025,6,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R2,2025,7,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,CO2f,R1,2020,2,gas_stove,2020,all-year,all-week,mid-afternoon,17.85000000000
-2,CO2f,R1,2020,3,gas_stove,2020,all-year,all-week,mid-afternoon,17.85000000000
-2,CO2f,R1,2020,4,gasboiler,2020,all-year,all-week,mid-afternoon,23.10150000000
-2,CO2f,R1,2020,5,gasboiler,2020,all-year,all-week,mid-afternoon,23.10150000000
-2,CO2f,R1,2025,2,gas_stove,2020,all-year,all-week,mid-afternoon,5.20590000000
-2,CO2f,R1,2025,3,gas_stove,2020,all-year,all-week,mid-afternoon,5.20590000000
-2,CO2f,R1,2025,4,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R1,2025,5,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R2,2020,2,gas_stove,2020,all-year,all-week,mid-afternoon,17.85000000000
-2,CO2f,R2,2020,3,gas_stove,2020,all-year,all-week,mid-afternoon,17.85000000000
-2,CO2f,R2,2020,4,gasboiler,2020,all-year,all-week,mid-afternoon,23.10150000000
-2,CO2f,R2,2020,5,gasboiler,2020,all-year,all-week,mid-afternoon,23.10150000000
-2,CO2f,R2,2025,2,gas_stove,2020,all-year,all-week,mid-afternoon,5.20590000000
-2,CO2f,R2,2025,3,gas_stove,2020,all-year,all-week,mid-afternoon,5.20590000000
-2,CO2f,R2,2025,4,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R2,2025,5,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-2,cook,R1,2020,2,gas_stove,2020,all-year,all-week,mid-afternoon,0.35700000000
-2,cook,R1,2020,3,gas_stove,2020,all-year,all-week,mid-afternoon,0.35700000000
-2,cook,R1,2025,0,estove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R1,2025,1,estove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R1,2025,2,gas_stove,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,cook,R1,2025,3,gas_stove,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,cook,R2,2020,2,gas_stove,2020,all-year,all-week,mid-afternoon,0.35700000000
-2,cook,R2,2020,3,gas_stove,2020,all-year,all-week,mid-afternoon,0.35700000000
-2,cook,R2,2025,0,estove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R2,2025,1,estove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R2,2025,2,gas_stove,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,cook,R2,2025,3,gas_stove,2020,all-year,all-week,mid-afternoon,0.10410000000
-3,heat,R1,2020,4,gasboiler,2020,all-year,all-week,early-peak,0.53550000000
-3,heat,R1,2020,5,gasboiler,2020,all-year,all-week,early-peak,0.53550000000
-3,heat,R1,2025,4,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R1,2025,5,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R1,2025,6,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R1,2025,7,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R2,2020,4,gasboiler,2020,all-year,all-week,early-peak,0.53550000000
-3,heat,R2,2020,5,gasboiler,2020,all-year,all-week,early-peak,0.53550000000
-3,heat,R2,2025,4,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R2,2025,5,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R2,2025,6,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R2,2025,7,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,CO2f,R1,2020,2,gas_stove,2020,all-year,all-week,early-peak,26.77500000000
-3,CO2f,R1,2020,3,gas_stove,2020,all-year,all-week,early-peak,26.77500000000
-3,CO2f,R1,2020,4,gasboiler,2020,all-year,all-week,early-peak,34.65220000000
-3,CO2f,R1,2020,5,gasboiler,2020,all-year,all-week,early-peak,34.65220000000
-3,CO2f,R1,2025,2,gas_stove,2020,all-year,all-week,early-peak,7.80890000000
-3,CO2f,R1,2025,3,gas_stove,2020,all-year,all-week,early-peak,7.80890000000
-3,CO2f,R1,2025,4,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R1,2025,5,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R2,2020,2,gas_stove,2020,all-year,all-week,early-peak,26.77500000000
-3,CO2f,R2,2020,3,gas_stove,2020,all-year,all-week,early-peak,26.77500000000
-3,CO2f,R2,2020,4,gasboiler,2020,all-year,all-week,early-peak,34.65220000000
-3,CO2f,R2,2020,5,gasboiler,2020,all-year,all-week,early-peak,34.65220000000
-3,CO2f,R2,2025,2,gas_stove,2020,all-year,all-week,early-peak,7.80890000000
-3,CO2f,R2,2025,3,gas_stove,2020,all-year,all-week,early-peak,7.80890000000
-3,CO2f,R2,2025,4,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R2,2025,5,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-3,cook,R1,2020,2,gas_stove,2020,all-year,all-week,early-peak,0.53550000000
-3,cook,R1,2020,3,gas_stove,2020,all-year,all-week,early-peak,0.53550000000
-3,cook,R1,2025,0,estove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R1,2025,1,estove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R1,2025,2,gas_stove,2020,all-year,all-week,early-peak,0.15620000000
-3,cook,R1,2025,3,gas_stove,2020,all-year,all-week,early-peak,0.15620000000
-3,cook,R2,2020,2,gas_stove,2020,all-year,all-week,early-peak,0.53550000000
-3,cook,R2,2020,3,gas_stove,2020,all-year,all-week,early-peak,0.53550000000
-3,cook,R2,2025,0,estove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R2,2025,1,estove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R2,2025,2,gas_stove,2020,all-year,all-week,early-peak,0.15620000000
-3,cook,R2,2025,3,gas_stove,2020,all-year,all-week,early-peak,0.15620000000
-4,heat,R1,2020,4,gasboiler,2020,all-year,all-week,late-peak,1.07150000000
-4,heat,R1,2020,5,gasboiler,2020,all-year,all-week,late-peak,1.07150000000
-4,heat,R1,2025,4,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R1,2025,5,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R1,2025,6,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R1,2025,7,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R2,2020,4,gasboiler,2020,all-year,all-week,late-peak,1.07150000000
-4,heat,R2,2020,5,gasboiler,2020,all-year,all-week,late-peak,1.07150000000
-4,heat,R2,2025,4,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R2,2025,5,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R2,2025,6,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R2,2025,7,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,CO2f,R1,2020,2,gas_stove,2020,all-year,all-week,late-peak,53.57500000000
-4,CO2f,R1,2020,3,gas_stove,2020,all-year,all-week,late-peak,53.57500000000
-4,CO2f,R1,2020,4,gasboiler,2020,all-year,all-week,late-peak,69.33680000000
-4,CO2f,R1,2020,5,gasboiler,2020,all-year,all-week,late-peak,69.33680000000
-4,CO2f,R1,2025,2,gas_stove,2020,all-year,all-week,late-peak,15.62500000000
-4,CO2f,R1,2025,3,gas_stove,2020,all-year,all-week,late-peak,15.62500000000
-4,CO2f,R1,2025,4,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R1,2025,5,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R2,2020,2,gas_stove,2020,all-year,all-week,late-peak,53.57500000000
-4,CO2f,R2,2020,3,gas_stove,2020,all-year,all-week,late-peak,53.57500000000
-4,CO2f,R2,2020,4,gasboiler,2020,all-year,all-week,late-peak,69.33680000000
-4,CO2f,R2,2020,5,gasboiler,2020,all-year,all-week,late-peak,69.33680000000
-4,CO2f,R2,2025,2,gas_stove,2020,all-year,all-week,late-peak,15.62500000000
-4,CO2f,R2,2025,3,gas_stove,2020,all-year,all-week,late-peak,15.62500000000
-4,CO2f,R2,2025,4,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R2,2025,5,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-4,cook,R1,2020,2,gas_stove,2020,all-year,all-week,late-peak,1.07150000000
-4,cook,R1,2020,3,gas_stove,2020,all-year,all-week,late-peak,1.07150000000
-4,cook,R1,2025,0,estove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R1,2025,1,estove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R1,2025,2,gas_stove,2020,all-year,all-week,late-peak,0.31250000000
-4,cook,R1,2025,3,gas_stove,2020,all-year,all-week,late-peak,0.31250000000
-4,cook,R2,2020,2,gas_stove,2020,all-year,all-week,late-peak,1.07150000000
-4,cook,R2,2020,3,gas_stove,2020,all-year,all-week,late-peak,1.07150000000
-4,cook,R2,2025,0,estove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R2,2025,1,estove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R2,2025,2,gas_stove,2020,all-year,all-week,late-peak,0.31250000000
-4,cook,R2,2025,3,gas_stove,2020,all-year,all-week,late-peak,0.31250000000
-5,heat,R1,2020,4,gasboiler,2020,all-year,all-week,evening,0.71450000000
-5,heat,R1,2020,5,gasboiler,2020,all-year,all-week,evening,0.71450000000
-5,heat,R1,2025,4,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R1,2025,5,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R1,2025,6,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R1,2025,7,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R2,2020,4,gasboiler,2020,all-year,all-week,evening,0.71450000000
-5,heat,R2,2020,5,gasboiler,2020,all-year,all-week,evening,0.71450000000
-5,heat,R2,2025,4,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R2,2025,5,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R2,2025,6,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R2,2025,7,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,CO2f,R1,2020,2,gas_stove,2020,all-year,all-week,evening,35.72500000000
-5,CO2f,R1,2020,3,gas_stove,2020,all-year,all-week,evening,35.72500000000
-5,CO2f,R1,2020,4,gasboiler,2020,all-year,all-week,evening,46.23530000000
-5,CO2f,R1,2020,5,gasboiler,2020,all-year,all-week,evening,46.23530000000
-5,CO2f,R1,2025,2,gas_stove,2020,all-year,all-week,evening,10.41910000000
-5,CO2f,R1,2025,3,gas_stove,2020,all-year,all-week,evening,10.41910000000
-5,CO2f,R1,2025,4,gasboiler,2020,all-year,all-week,evening,13.48440000000
-5,CO2f,R1,2025,5,gasboiler,2020,all-year,all-week,evening,13.48440000000
-5,CO2f,R2,2020,2,gas_stove,2020,all-year,all-week,evening,35.72500000000
-5,CO2f,R2,2020,3,gas_stove,2020,all-year,all-week,evening,35.72500000000
-5,CO2f,R2,2020,4,gasboiler,2020,all-year,all-week,evening,46.23530000000
-5,CO2f,R2,2020,5,gasboiler,2020,all-year,all-week,evening,46.23530000000
-5,CO2f,R2,2025,2,gas_stove,2020,all-year,all-week,evening,10.41910000000
-5,CO2f,R2,2025,3,gas_stove,2020,all-year,all-week,evening,10.41910000000
-5,CO2f,R2,2025,4,gasboiler,2020,all-year,all-week,evening,13.48440000000
-5,CO2f,R2,2025,5,gasboiler,2020,all-year,all-week,evening,13.48440000000
-5,cook,R1,2020,2,gas_stove,2020,all-year,all-week,evening,0.71450000000
-5,cook,R1,2020,3,gas_stove,2020,all-year,all-week,evening,0.71450000000
-5,cook,R1,2025,0,estove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R1,2025,1,estove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R1,2025,2,gas_stove,2020,all-year,all-week,evening,0.20840000000
-5,cook,R1,2025,3,gas_stove,2020,all-year,all-week,evening,0.20840000000
-5,cook,R2,2020,2,gas_stove,2020,all-year,all-week,evening,0.71450000000
-5,cook,R2,2020,3,gas_stove,2020,all-year,all-week,evening,0.71450000000
-5,cook,R2,2025,0,estove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R2,2025,1,estove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R2,2025,2,gas_stove,2020,all-year,all-week,evening,0.20840000000
-5,cook,R2,2025,3,gas_stove,2020,all-year,all-week,evening,0.20840000000
-6,heat,R1,2020,4,gasboiler,2020,all-year,all-week,early-morning,0.71450000000
-6,heat,R1,2020,5,gasboiler,2020,all-year,all-week,early-morning,0.71450000000
-6,heat,R1,2025,4,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R1,2025,5,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R1,2025,6,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R1,2025,7,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R2,2020,4,gasboiler,2020,all-year,all-week,early-morning,0.71450000000
-6,heat,R2,2020,5,gasboiler,2020,all-year,all-week,early-morning,0.71450000000
-6,heat,R2,2025,4,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R2,2025,5,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R2,2025,6,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R2,2025,7,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,CO2f,R1,2020,2,gas_stove,2020,all-year,all-week,early-morning,35.72500000000
-6,CO2f,R1,2020,3,gas_stove,2020,all-year,all-week,early-morning,35.72500000000
-6,CO2f,R1,2020,4,gasboiler,2020,all-year,all-week,early-morning,46.23530000000
-6,CO2f,R1,2020,5,gasboiler,2020,all-year,all-week,early-morning,46.23530000000
-6,CO2f,R1,2025,2,gas_stove,2020,all-year,all-week,early-morning,10.41910000000
-6,CO2f,R1,2025,3,gas_stove,2020,all-year,all-week,early-morning,10.41910000000
-6,CO2f,R1,2025,4,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R1,2025,5,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R2,2020,2,gas_stove,2020,all-year,all-week,early-morning,35.72500000000
-6,CO2f,R2,2020,3,gas_stove,2020,all-year,all-week,early-morning,35.72500000000
-6,CO2f,R2,2020,4,gasboiler,2020,all-year,all-week,early-morning,46.23530000000
-6,CO2f,R2,2020,5,gasboiler,2020,all-year,all-week,early-morning,46.23530000000
-6,CO2f,R2,2025,2,gas_stove,2020,all-year,all-week,early-morning,10.41910000000
-6,CO2f,R2,2025,3,gas_stove,2020,all-year,all-week,early-morning,10.41910000000
-6,CO2f,R2,2025,4,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R2,2025,5,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-6,cook,R1,2020,2,gas_stove,2020,all-year,all-week,early-morning,0.71450000000
-6,cook,R1,2020,3,gas_stove,2020,all-year,all-week,early-morning,0.71450000000
-6,cook,R1,2025,0,estove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R1,2025,1,estove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R1,2025,2,gas_stove,2020,all-year,all-week,early-morning,0.20840000000
-6,cook,R1,2025,3,gas_stove,2020,all-year,all-week,early-morning,0.20840000000
-6,cook,R2,2020,2,gas_stove,2020,all-year,all-week,early-morning,0.71450000000
-6,cook,R2,2020,3,gas_stove,2020,all-year,all-week,early-morning,0.71450000000
-6,cook,R2,2025,0,estove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R2,2025,1,estove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R2,2025,2,gas_stove,2020,all-year,all-week,early-morning,0.20840000000
-6,cook,R2,2025,3,gas_stove,2020,all-year,all-week,early-morning,0.20840000000
-7,heat,R1,2020,4,gasboiler,2020,all-year,all-week,late-afternoon,0.71450000000
-7,heat,R1,2020,5,gasboiler,2020,all-year,all-week,late-afternoon,0.71450000000
-7,heat,R1,2025,4,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R1,2025,5,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R1,2025,6,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R1,2025,7,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R2,2020,4,gasboiler,2020,all-year,all-week,late-afternoon,0.71450000000
-7,heat,R2,2020,5,gasboiler,2020,all-year,all-week,late-afternoon,0.71450000000
-7,heat,R2,2025,4,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R2,2025,5,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R2,2025,6,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R2,2025,7,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,CO2f,R1,2020,2,gas_stove,2020,all-year,all-week,late-afternoon,35.72500000000
-7,CO2f,R1,2020,3,gas_stove,2020,all-year,all-week,late-afternoon,35.72500000000
-7,CO2f,R1,2020,4,gasboiler,2020,all-year,all-week,late-afternoon,46.23530000000
-7,CO2f,R1,2020,5,gasboiler,2020,all-year,all-week,late-afternoon,46.23530000000
-7,CO2f,R1,2025,2,gas_stove,2020,all-year,all-week,late-afternoon,10.41910000000
-7,CO2f,R1,2025,3,gas_stove,2020,all-year,all-week,late-afternoon,10.41910000000
-7,CO2f,R1,2025,4,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R1,2025,5,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R2,2020,2,gas_stove,2020,all-year,all-week,late-afternoon,35.72500000000
-7,CO2f,R2,2020,3,gas_stove,2020,all-year,all-week,late-afternoon,35.72500000000
-7,CO2f,R2,2020,4,gasboiler,2020,all-year,all-week,late-afternoon,46.23530000000
-7,CO2f,R2,2020,5,gasboiler,2020,all-year,all-week,late-afternoon,46.23530000000
-7,CO2f,R2,2025,2,gas_stove,2020,all-year,all-week,late-afternoon,10.41910000000
-7,CO2f,R2,2025,3,gas_stove,2020,all-year,all-week,late-afternoon,10.41910000000
-7,CO2f,R2,2025,4,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R2,2025,5,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
-7,cook,R1,2020,2,gas_stove,2020,all-year,all-week,late-afternoon,0.71450000000
-7,cook,R1,2020,3,gas_stove,2020,all-year,all-week,late-afternoon,0.71450000000
-7,cook,R1,2025,0,estove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R1,2025,1,estove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R1,2025,2,gas_stove,2020,all-year,all-week,late-afternoon,0.20840000000
-7,cook,R1,2025,3,gas_stove,2020,all-year,all-week,late-afternoon,0.20840000000
-7,cook,R2,2020,2,gas_stove,2020,all-year,all-week,late-afternoon,0.71450000000
-7,cook,R2,2020,3,gas_stove,2020,all-year,all-week,late-afternoon,0.71450000000
-7,cook,R2,2025,0,estove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R2,2025,1,estove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R2,2025,2,gas_stove,2020,all-year,all-week,late-afternoon,0.20840000000
-7,cook,R2,2025,3,gas_stove,2020,all-year,all-week,late-afternoon,0.20840000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2020,4,all-year,all-week,night,gasboiler,2020,0.35700000000
+0,heat,R1,2020,5,all-year,all-week,night,gasboiler,2020,0.35700000000
+0,heat,R1,2025,4,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R1,2025,5,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R1,2025,6,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R1,2025,7,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R2,2020,4,all-year,all-week,night,gasboiler,2020,0.35700000000
+0,heat,R2,2020,5,all-year,all-week,night,gasboiler,2020,0.35700000000
+0,heat,R2,2025,4,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R2,2025,5,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R2,2025,6,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R2,2025,7,all-year,all-week,night,heatpump,2020,0.37190000000
+0,CO2f,R1,2020,2,all-year,all-week,night,gas_stove,2020,17.85000000000
+0,CO2f,R1,2020,3,all-year,all-week,night,gas_stove,2020,17.85000000000
+0,CO2f,R1,2020,4,all-year,all-week,night,gasboiler,2020,23.10150000000
+0,CO2f,R1,2020,5,all-year,all-week,night,gasboiler,2020,23.10150000000
+0,CO2f,R1,2025,2,all-year,all-week,night,gas_stove,2020,5.20590000000
+0,CO2f,R1,2025,3,all-year,all-week,night,gas_stove,2020,5.20590000000
+0,CO2f,R1,2025,4,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R1,2025,5,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R2,2020,2,all-year,all-week,night,gas_stove,2020,17.85000000000
+0,CO2f,R2,2020,3,all-year,all-week,night,gas_stove,2020,17.85000000000
+0,CO2f,R2,2020,4,all-year,all-week,night,gasboiler,2020,23.10150000000
+0,CO2f,R2,2020,5,all-year,all-week,night,gasboiler,2020,23.10150000000
+0,CO2f,R2,2025,2,all-year,all-week,night,gas_stove,2020,5.20590000000
+0,CO2f,R2,2025,3,all-year,all-week,night,gas_stove,2020,5.20590000000
+0,CO2f,R2,2025,4,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R2,2025,5,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,cook,R1,2020,2,all-year,all-week,night,gas_stove,2020,0.35700000000
+0,cook,R1,2020,3,all-year,all-week,night,gas_stove,2020,0.35700000000
+0,cook,R1,2025,0,all-year,all-week,night,estove,2020,0.37190000000
+0,cook,R1,2025,1,all-year,all-week,night,estove,2020,0.37190000000
+0,cook,R1,2025,2,all-year,all-week,night,gas_stove,2020,0.10410000000
+0,cook,R1,2025,3,all-year,all-week,night,gas_stove,2020,0.10410000000
+0,cook,R2,2020,2,all-year,all-week,night,gas_stove,2020,0.35700000000
+0,cook,R2,2020,3,all-year,all-week,night,gas_stove,2020,0.35700000000
+0,cook,R2,2025,0,all-year,all-week,night,estove,2020,0.37190000000
+0,cook,R2,2025,1,all-year,all-week,night,estove,2020,0.37190000000
+0,cook,R2,2025,2,all-year,all-week,night,gas_stove,2020,0.10410000000
+0,cook,R2,2025,3,all-year,all-week,night,gas_stove,2020,0.10410000000
+1,heat,R1,2020,4,all-year,all-week,morning,gasboiler,2020,0.53550000000
+1,heat,R1,2020,5,all-year,all-week,morning,gasboiler,2020,0.53550000000
+1,heat,R1,2025,4,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R1,2025,5,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R1,2025,6,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R1,2025,7,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R2,2020,4,all-year,all-week,morning,gasboiler,2020,0.53550000000
+1,heat,R2,2020,5,all-year,all-week,morning,gasboiler,2020,0.53550000000
+1,heat,R2,2025,4,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R2,2025,5,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R2,2025,6,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R2,2025,7,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,CO2f,R1,2020,2,all-year,all-week,morning,gas_stove,2020,26.77500000000
+1,CO2f,R1,2020,3,all-year,all-week,morning,gas_stove,2020,26.77500000000
+1,CO2f,R1,2020,4,all-year,all-week,morning,gasboiler,2020,34.65220000000
+1,CO2f,R1,2020,5,all-year,all-week,morning,gasboiler,2020,34.65220000000
+1,CO2f,R1,2025,2,all-year,all-week,morning,gas_stove,2020,7.80890000000
+1,CO2f,R1,2025,3,all-year,all-week,morning,gas_stove,2020,7.80890000000
+1,CO2f,R1,2025,4,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R1,2025,5,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R2,2020,2,all-year,all-week,morning,gas_stove,2020,26.77500000000
+1,CO2f,R2,2020,3,all-year,all-week,morning,gas_stove,2020,26.77500000000
+1,CO2f,R2,2020,4,all-year,all-week,morning,gasboiler,2020,34.65220000000
+1,CO2f,R2,2020,5,all-year,all-week,morning,gasboiler,2020,34.65220000000
+1,CO2f,R2,2025,2,all-year,all-week,morning,gas_stove,2020,7.80890000000
+1,CO2f,R2,2025,3,all-year,all-week,morning,gas_stove,2020,7.80890000000
+1,CO2f,R2,2025,4,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R2,2025,5,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,cook,R1,2020,2,all-year,all-week,morning,gas_stove,2020,0.53550000000
+1,cook,R1,2020,3,all-year,all-week,morning,gas_stove,2020,0.53550000000
+1,cook,R1,2025,0,all-year,all-week,morning,estove,2020,0.55780000000
+1,cook,R1,2025,1,all-year,all-week,morning,estove,2020,0.55780000000
+1,cook,R1,2025,2,all-year,all-week,morning,gas_stove,2020,0.15620000000
+1,cook,R1,2025,3,all-year,all-week,morning,gas_stove,2020,0.15620000000
+1,cook,R2,2020,2,all-year,all-week,morning,gas_stove,2020,0.53550000000
+1,cook,R2,2020,3,all-year,all-week,morning,gas_stove,2020,0.53550000000
+1,cook,R2,2025,0,all-year,all-week,morning,estove,2020,0.55780000000
+1,cook,R2,2025,1,all-year,all-week,morning,estove,2020,0.55780000000
+1,cook,R2,2025,2,all-year,all-week,morning,gas_stove,2020,0.15620000000
+1,cook,R2,2025,3,all-year,all-week,morning,gas_stove,2020,0.15620000000
+2,heat,R1,2020,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.35700000000
+2,heat,R1,2020,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.35700000000
+2,heat,R1,2025,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R1,2025,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R1,2025,6,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R1,2025,7,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R2,2020,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.35700000000
+2,heat,R2,2020,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.35700000000
+2,heat,R2,2025,4,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R2,2025,5,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R2,2025,6,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R2,2025,7,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,CO2f,R1,2020,2,all-year,all-week,mid-afternoon,gas_stove,2020,17.85000000000
+2,CO2f,R1,2020,3,all-year,all-week,mid-afternoon,gas_stove,2020,17.85000000000
+2,CO2f,R1,2020,4,all-year,all-week,mid-afternoon,gasboiler,2020,23.10150000000
+2,CO2f,R1,2020,5,all-year,all-week,mid-afternoon,gasboiler,2020,23.10150000000
+2,CO2f,R1,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,5.20590000000
+2,CO2f,R1,2025,3,all-year,all-week,mid-afternoon,gas_stove,2020,5.20590000000
+2,CO2f,R1,2025,4,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R1,2025,5,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R2,2020,2,all-year,all-week,mid-afternoon,gas_stove,2020,17.85000000000
+2,CO2f,R2,2020,3,all-year,all-week,mid-afternoon,gas_stove,2020,17.85000000000
+2,CO2f,R2,2020,4,all-year,all-week,mid-afternoon,gasboiler,2020,23.10150000000
+2,CO2f,R2,2020,5,all-year,all-week,mid-afternoon,gasboiler,2020,23.10150000000
+2,CO2f,R2,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,5.20590000000
+2,CO2f,R2,2025,3,all-year,all-week,mid-afternoon,gas_stove,2020,5.20590000000
+2,CO2f,R2,2025,4,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R2,2025,5,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,cook,R1,2020,2,all-year,all-week,mid-afternoon,gas_stove,2020,0.35700000000
+2,cook,R1,2020,3,all-year,all-week,mid-afternoon,gas_stove,2020,0.35700000000
+2,cook,R1,2025,0,all-year,all-week,mid-afternoon,estove,2020,0.37190000000
+2,cook,R1,2025,1,all-year,all-week,mid-afternoon,estove,2020,0.37190000000
+2,cook,R1,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,0.10410000000
+2,cook,R1,2025,3,all-year,all-week,mid-afternoon,gas_stove,2020,0.10410000000
+2,cook,R2,2020,2,all-year,all-week,mid-afternoon,gas_stove,2020,0.35700000000
+2,cook,R2,2020,3,all-year,all-week,mid-afternoon,gas_stove,2020,0.35700000000
+2,cook,R2,2025,0,all-year,all-week,mid-afternoon,estove,2020,0.37190000000
+2,cook,R2,2025,1,all-year,all-week,mid-afternoon,estove,2020,0.37190000000
+2,cook,R2,2025,2,all-year,all-week,mid-afternoon,gas_stove,2020,0.10410000000
+2,cook,R2,2025,3,all-year,all-week,mid-afternoon,gas_stove,2020,0.10410000000
+3,heat,R1,2020,4,all-year,all-week,early-peak,gasboiler,2020,0.53550000000
+3,heat,R1,2020,5,all-year,all-week,early-peak,gasboiler,2020,0.53550000000
+3,heat,R1,2025,4,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R1,2025,5,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R1,2025,6,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R1,2025,7,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R2,2020,4,all-year,all-week,early-peak,gasboiler,2020,0.53550000000
+3,heat,R2,2020,5,all-year,all-week,early-peak,gasboiler,2020,0.53550000000
+3,heat,R2,2025,4,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R2,2025,5,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R2,2025,6,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R2,2025,7,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,CO2f,R1,2020,2,all-year,all-week,early-peak,gas_stove,2020,26.77500000000
+3,CO2f,R1,2020,3,all-year,all-week,early-peak,gas_stove,2020,26.77500000000
+3,CO2f,R1,2020,4,all-year,all-week,early-peak,gasboiler,2020,34.65220000000
+3,CO2f,R1,2020,5,all-year,all-week,early-peak,gasboiler,2020,34.65220000000
+3,CO2f,R1,2025,2,all-year,all-week,early-peak,gas_stove,2020,7.80890000000
+3,CO2f,R1,2025,3,all-year,all-week,early-peak,gas_stove,2020,7.80890000000
+3,CO2f,R1,2025,4,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R1,2025,5,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R2,2020,2,all-year,all-week,early-peak,gas_stove,2020,26.77500000000
+3,CO2f,R2,2020,3,all-year,all-week,early-peak,gas_stove,2020,26.77500000000
+3,CO2f,R2,2020,4,all-year,all-week,early-peak,gasboiler,2020,34.65220000000
+3,CO2f,R2,2020,5,all-year,all-week,early-peak,gasboiler,2020,34.65220000000
+3,CO2f,R2,2025,2,all-year,all-week,early-peak,gas_stove,2020,7.80890000000
+3,CO2f,R2,2025,3,all-year,all-week,early-peak,gas_stove,2020,7.80890000000
+3,CO2f,R2,2025,4,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R2,2025,5,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,cook,R1,2020,2,all-year,all-week,early-peak,gas_stove,2020,0.53550000000
+3,cook,R1,2020,3,all-year,all-week,early-peak,gas_stove,2020,0.53550000000
+3,cook,R1,2025,0,all-year,all-week,early-peak,estove,2020,0.55780000000
+3,cook,R1,2025,1,all-year,all-week,early-peak,estove,2020,0.55780000000
+3,cook,R1,2025,2,all-year,all-week,early-peak,gas_stove,2020,0.15620000000
+3,cook,R1,2025,3,all-year,all-week,early-peak,gas_stove,2020,0.15620000000
+3,cook,R2,2020,2,all-year,all-week,early-peak,gas_stove,2020,0.53550000000
+3,cook,R2,2020,3,all-year,all-week,early-peak,gas_stove,2020,0.53550000000
+3,cook,R2,2025,0,all-year,all-week,early-peak,estove,2020,0.55780000000
+3,cook,R2,2025,1,all-year,all-week,early-peak,estove,2020,0.55780000000
+3,cook,R2,2025,2,all-year,all-week,early-peak,gas_stove,2020,0.15620000000
+3,cook,R2,2025,3,all-year,all-week,early-peak,gas_stove,2020,0.15620000000
+4,heat,R1,2020,4,all-year,all-week,late-peak,gasboiler,2020,1.07150000000
+4,heat,R1,2020,5,all-year,all-week,late-peak,gasboiler,2020,1.07150000000
+4,heat,R1,2025,4,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R1,2025,5,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R1,2025,6,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R1,2025,7,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R2,2020,4,all-year,all-week,late-peak,gasboiler,2020,1.07150000000
+4,heat,R2,2020,5,all-year,all-week,late-peak,gasboiler,2020,1.07150000000
+4,heat,R2,2025,4,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R2,2025,5,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R2,2025,6,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R2,2025,7,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,CO2f,R1,2020,2,all-year,all-week,late-peak,gas_stove,2020,53.57500000000
+4,CO2f,R1,2020,3,all-year,all-week,late-peak,gas_stove,2020,53.57500000000
+4,CO2f,R1,2020,4,all-year,all-week,late-peak,gasboiler,2020,69.33680000000
+4,CO2f,R1,2020,5,all-year,all-week,late-peak,gasboiler,2020,69.33680000000
+4,CO2f,R1,2025,2,all-year,all-week,late-peak,gas_stove,2020,15.62500000000
+4,CO2f,R1,2025,3,all-year,all-week,late-peak,gas_stove,2020,15.62500000000
+4,CO2f,R1,2025,4,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R1,2025,5,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R2,2020,2,all-year,all-week,late-peak,gas_stove,2020,53.57500000000
+4,CO2f,R2,2020,3,all-year,all-week,late-peak,gas_stove,2020,53.57500000000
+4,CO2f,R2,2020,4,all-year,all-week,late-peak,gasboiler,2020,69.33680000000
+4,CO2f,R2,2020,5,all-year,all-week,late-peak,gasboiler,2020,69.33680000000
+4,CO2f,R2,2025,2,all-year,all-week,late-peak,gas_stove,2020,15.62500000000
+4,CO2f,R2,2025,3,all-year,all-week,late-peak,gas_stove,2020,15.62500000000
+4,CO2f,R2,2025,4,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R2,2025,5,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,cook,R1,2020,2,all-year,all-week,late-peak,gas_stove,2020,1.07150000000
+4,cook,R1,2020,3,all-year,all-week,late-peak,gas_stove,2020,1.07150000000
+4,cook,R1,2025,0,all-year,all-week,late-peak,estove,2020,1.11620000000
+4,cook,R1,2025,1,all-year,all-week,late-peak,estove,2020,1.11620000000
+4,cook,R1,2025,2,all-year,all-week,late-peak,gas_stove,2020,0.31250000000
+4,cook,R1,2025,3,all-year,all-week,late-peak,gas_stove,2020,0.31250000000
+4,cook,R2,2020,2,all-year,all-week,late-peak,gas_stove,2020,1.07150000000
+4,cook,R2,2020,3,all-year,all-week,late-peak,gas_stove,2020,1.07150000000
+4,cook,R2,2025,0,all-year,all-week,late-peak,estove,2020,1.11620000000
+4,cook,R2,2025,1,all-year,all-week,late-peak,estove,2020,1.11620000000
+4,cook,R2,2025,2,all-year,all-week,late-peak,gas_stove,2020,0.31250000000
+4,cook,R2,2025,3,all-year,all-week,late-peak,gas_stove,2020,0.31250000000
+5,heat,R1,2020,4,all-year,all-week,evening,gasboiler,2020,0.71450000000
+5,heat,R1,2020,5,all-year,all-week,evening,gasboiler,2020,0.71450000000
+5,heat,R1,2025,4,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R1,2025,5,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R1,2025,6,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R1,2025,7,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R2,2020,4,all-year,all-week,evening,gasboiler,2020,0.71450000000
+5,heat,R2,2020,5,all-year,all-week,evening,gasboiler,2020,0.71450000000
+5,heat,R2,2025,4,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R2,2025,5,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R2,2025,6,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R2,2025,7,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,CO2f,R1,2020,2,all-year,all-week,evening,gas_stove,2020,35.72500000000
+5,CO2f,R1,2020,3,all-year,all-week,evening,gas_stove,2020,35.72500000000
+5,CO2f,R1,2020,4,all-year,all-week,evening,gasboiler,2020,46.23530000000
+5,CO2f,R1,2020,5,all-year,all-week,evening,gasboiler,2020,46.23530000000
+5,CO2f,R1,2025,2,all-year,all-week,evening,gas_stove,2020,10.41910000000
+5,CO2f,R1,2025,3,all-year,all-week,evening,gas_stove,2020,10.41910000000
+5,CO2f,R1,2025,4,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R1,2025,5,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R2,2020,2,all-year,all-week,evening,gas_stove,2020,35.72500000000
+5,CO2f,R2,2020,3,all-year,all-week,evening,gas_stove,2020,35.72500000000
+5,CO2f,R2,2020,4,all-year,all-week,evening,gasboiler,2020,46.23530000000
+5,CO2f,R2,2020,5,all-year,all-week,evening,gasboiler,2020,46.23530000000
+5,CO2f,R2,2025,2,all-year,all-week,evening,gas_stove,2020,10.41910000000
+5,CO2f,R2,2025,3,all-year,all-week,evening,gas_stove,2020,10.41910000000
+5,CO2f,R2,2025,4,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R2,2025,5,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,cook,R1,2020,2,all-year,all-week,evening,gas_stove,2020,0.71450000000
+5,cook,R1,2020,3,all-year,all-week,evening,gas_stove,2020,0.71450000000
+5,cook,R1,2025,0,all-year,all-week,evening,estove,2020,0.74430000000
+5,cook,R1,2025,1,all-year,all-week,evening,estove,2020,0.74430000000
+5,cook,R1,2025,2,all-year,all-week,evening,gas_stove,2020,0.20840000000
+5,cook,R1,2025,3,all-year,all-week,evening,gas_stove,2020,0.20840000000
+5,cook,R2,2020,2,all-year,all-week,evening,gas_stove,2020,0.71450000000
+5,cook,R2,2020,3,all-year,all-week,evening,gas_stove,2020,0.71450000000
+5,cook,R2,2025,0,all-year,all-week,evening,estove,2020,0.74430000000
+5,cook,R2,2025,1,all-year,all-week,evening,estove,2020,0.74430000000
+5,cook,R2,2025,2,all-year,all-week,evening,gas_stove,2020,0.20840000000
+5,cook,R2,2025,3,all-year,all-week,evening,gas_stove,2020,0.20840000000
+6,heat,R1,2020,4,all-year,all-week,early-morning,gasboiler,2020,0.71450000000
+6,heat,R1,2020,5,all-year,all-week,early-morning,gasboiler,2020,0.71450000000
+6,heat,R1,2025,4,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R1,2025,5,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R1,2025,6,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R1,2025,7,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R2,2020,4,all-year,all-week,early-morning,gasboiler,2020,0.71450000000
+6,heat,R2,2020,5,all-year,all-week,early-morning,gasboiler,2020,0.71450000000
+6,heat,R2,2025,4,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R2,2025,5,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R2,2025,6,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R2,2025,7,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,CO2f,R1,2020,2,all-year,all-week,early-morning,gas_stove,2020,35.72500000000
+6,CO2f,R1,2020,3,all-year,all-week,early-morning,gas_stove,2020,35.72500000000
+6,CO2f,R1,2020,4,all-year,all-week,early-morning,gasboiler,2020,46.23530000000
+6,CO2f,R1,2020,5,all-year,all-week,early-morning,gasboiler,2020,46.23530000000
+6,CO2f,R1,2025,2,all-year,all-week,early-morning,gas_stove,2020,10.41910000000
+6,CO2f,R1,2025,3,all-year,all-week,early-morning,gas_stove,2020,10.41910000000
+6,CO2f,R1,2025,4,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R1,2025,5,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R2,2020,2,all-year,all-week,early-morning,gas_stove,2020,35.72500000000
+6,CO2f,R2,2020,3,all-year,all-week,early-morning,gas_stove,2020,35.72500000000
+6,CO2f,R2,2020,4,all-year,all-week,early-morning,gasboiler,2020,46.23530000000
+6,CO2f,R2,2020,5,all-year,all-week,early-morning,gasboiler,2020,46.23530000000
+6,CO2f,R2,2025,2,all-year,all-week,early-morning,gas_stove,2020,10.41910000000
+6,CO2f,R2,2025,3,all-year,all-week,early-morning,gas_stove,2020,10.41910000000
+6,CO2f,R2,2025,4,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R2,2025,5,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,cook,R1,2020,2,all-year,all-week,early-morning,gas_stove,2020,0.71450000000
+6,cook,R1,2020,3,all-year,all-week,early-morning,gas_stove,2020,0.71450000000
+6,cook,R1,2025,0,all-year,all-week,early-morning,estove,2020,0.74430000000
+6,cook,R1,2025,1,all-year,all-week,early-morning,estove,2020,0.74430000000
+6,cook,R1,2025,2,all-year,all-week,early-morning,gas_stove,2020,0.20840000000
+6,cook,R1,2025,3,all-year,all-week,early-morning,gas_stove,2020,0.20840000000
+6,cook,R2,2020,2,all-year,all-week,early-morning,gas_stove,2020,0.71450000000
+6,cook,R2,2020,3,all-year,all-week,early-morning,gas_stove,2020,0.71450000000
+6,cook,R2,2025,0,all-year,all-week,early-morning,estove,2020,0.74430000000
+6,cook,R2,2025,1,all-year,all-week,early-morning,estove,2020,0.74430000000
+6,cook,R2,2025,2,all-year,all-week,early-morning,gas_stove,2020,0.20840000000
+6,cook,R2,2025,3,all-year,all-week,early-morning,gas_stove,2020,0.20840000000
+7,heat,R1,2020,4,all-year,all-week,late-afternoon,gasboiler,2020,0.71450000000
+7,heat,R1,2020,5,all-year,all-week,late-afternoon,gasboiler,2020,0.71450000000
+7,heat,R1,2025,4,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R1,2025,5,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R1,2025,6,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R1,2025,7,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R2,2020,4,all-year,all-week,late-afternoon,gasboiler,2020,0.71450000000
+7,heat,R2,2020,5,all-year,all-week,late-afternoon,gasboiler,2020,0.71450000000
+7,heat,R2,2025,4,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R2,2025,5,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R2,2025,6,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R2,2025,7,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,CO2f,R1,2020,2,all-year,all-week,late-afternoon,gas_stove,2020,35.72500000000
+7,CO2f,R1,2020,3,all-year,all-week,late-afternoon,gas_stove,2020,35.72500000000
+7,CO2f,R1,2020,4,all-year,all-week,late-afternoon,gasboiler,2020,46.23530000000
+7,CO2f,R1,2020,5,all-year,all-week,late-afternoon,gasboiler,2020,46.23530000000
+7,CO2f,R1,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,10.41910000000
+7,CO2f,R1,2025,3,all-year,all-week,late-afternoon,gas_stove,2020,10.41910000000
+7,CO2f,R1,2025,4,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R1,2025,5,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R2,2020,2,all-year,all-week,late-afternoon,gas_stove,2020,35.72500000000
+7,CO2f,R2,2020,3,all-year,all-week,late-afternoon,gas_stove,2020,35.72500000000
+7,CO2f,R2,2020,4,all-year,all-week,late-afternoon,gasboiler,2020,46.23530000000
+7,CO2f,R2,2020,5,all-year,all-week,late-afternoon,gasboiler,2020,46.23530000000
+7,CO2f,R2,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,10.41910000000
+7,CO2f,R2,2025,3,all-year,all-week,late-afternoon,gas_stove,2020,10.41910000000
+7,CO2f,R2,2025,4,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R2,2025,5,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,cook,R1,2020,2,all-year,all-week,late-afternoon,gas_stove,2020,0.71450000000
+7,cook,R1,2020,3,all-year,all-week,late-afternoon,gas_stove,2020,0.71450000000
+7,cook,R1,2025,0,all-year,all-week,late-afternoon,estove,2020,0.74430000000
+7,cook,R1,2025,1,all-year,all-week,late-afternoon,estove,2020,0.74430000000
+7,cook,R1,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,0.20840000000
+7,cook,R1,2025,3,all-year,all-week,late-afternoon,gas_stove,2020,0.20840000000
+7,cook,R2,2020,2,all-year,all-week,late-afternoon,gas_stove,2020,0.71450000000
+7,cook,R2,2020,3,all-year,all-week,late-afternoon,gas_stove,2020,0.71450000000
+7,cook,R2,2025,0,all-year,all-week,late-afternoon,estove,2020,0.74430000000
+7,cook,R2,2025,1,all-year,all-week,late-afternoon,estove,2020,0.74430000000
+7,cook,R2,2025,2,all-year,all-week,late-afternoon,gas_stove,2020,0.20840000000
+7,cook,R2,2025,3,all-year,all-week,late-afternoon,gas_stove,2020,0.20840000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2025.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2025.csv
index a0be87adc..7a3d489c8 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2025.csv
@@ -1,449 +1,449 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2025,8,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R1,2025,10,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R1,2025,12,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R1,2025,14,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R1,2030,9,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R1,2030,11,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R1,2030,12,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R1,2030,13,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R1,2030,14,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R1,2030,15,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R2,2025,8,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R2,2025,10,gasboiler,2020,all-year,all-week,night,0.10410000000
-0,heat,R2,2025,12,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R2,2025,14,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R2,2030,9,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R2,2030,11,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R2,2030,12,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R2,2030,13,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R2,2030,14,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R2,2030,15,heatpump,2025,all-year,all-week,night,0.17850000000
-0,CO2f,R1,2025,4,gas_stove,2020,all-year,all-week,night,5.20590000000
-0,CO2f,R1,2025,6,gas_stove,2020,all-year,all-week,night,5.20590000000
-0,CO2f,R1,2025,8,gasboiler,2020,all-year,all-week,night,6.73750000000
-0,CO2f,R1,2025,10,gasboiler,2020,all-year,all-week,night,6.73750000000
-0,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,night,2.23120000000
-0,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,night,2.23120000000
-0,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R2,2025,4,gas_stove,2020,all-year,all-week,night,5.20590000000
-0,CO2f,R2,2025,6,gas_stove,2020,all-year,all-week,night,5.20590000000
-0,CO2f,R2,2025,8,gasboiler,2020,all-year,all-week,night,6.73750000000
-0,CO2f,R2,2025,10,gasboiler,2020,all-year,all-week,night,6.73750000000
-0,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,night,2.23120000000
-0,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,night,2.23120000000
-0,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,cook,R1,2025,0,estove,2020,all-year,all-week,night,0.37190000000
-0,cook,R1,2025,2,estove,2020,all-year,all-week,night,0.37190000000
-0,cook,R1,2025,4,gas_stove,2020,all-year,all-week,night,0.10410000000
-0,cook,R1,2025,6,gas_stove,2020,all-year,all-week,night,0.10410000000
-0,cook,R1,2030,0,estove,2020,all-year,all-week,night,0.37190000000
-0,cook,R1,2030,1,estove,2025,all-year,all-week,night,0.17850000000
-0,cook,R1,2030,2,estove,2020,all-year,all-week,night,0.37190000000
-0,cook,R1,2030,3,estove,2025,all-year,all-week,night,0.17850000000
-0,cook,R1,2030,5,gas_stove,2025,all-year,all-week,night,0.04460000000
-0,cook,R1,2030,7,gas_stove,2025,all-year,all-week,night,0.04460000000
-0,cook,R2,2025,0,estove,2020,all-year,all-week,night,0.37190000000
-0,cook,R2,2025,2,estove,2020,all-year,all-week,night,0.37190000000
-0,cook,R2,2025,4,gas_stove,2020,all-year,all-week,night,0.10410000000
-0,cook,R2,2025,6,gas_stove,2020,all-year,all-week,night,0.10410000000
-0,cook,R2,2030,0,estove,2020,all-year,all-week,night,0.37190000000
-0,cook,R2,2030,1,estove,2025,all-year,all-week,night,0.17850000000
-0,cook,R2,2030,2,estove,2020,all-year,all-week,night,0.37190000000
-0,cook,R2,2030,3,estove,2025,all-year,all-week,night,0.17850000000
-0,cook,R2,2030,5,gas_stove,2025,all-year,all-week,night,0.04460000000
-0,cook,R2,2030,7,gas_stove,2025,all-year,all-week,night,0.04460000000
-1,heat,R1,2025,8,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R1,2025,10,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R1,2025,12,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R1,2025,14,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R1,2030,9,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R1,2030,11,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R1,2030,12,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R1,2030,13,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R1,2030,14,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R1,2030,15,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R2,2025,8,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R2,2025,10,gasboiler,2020,all-year,all-week,morning,0.15620000000
-1,heat,R2,2025,12,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R2,2025,14,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R2,2030,9,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R2,2030,11,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R2,2030,12,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R2,2030,13,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R2,2030,14,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R2,2030,15,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,CO2f,R1,2025,4,gas_stove,2020,all-year,all-week,morning,7.80890000000
-1,CO2f,R1,2025,6,gas_stove,2020,all-year,all-week,morning,7.80890000000
-1,CO2f,R1,2025,8,gasboiler,2020,all-year,all-week,morning,10.10620000000
-1,CO2f,R1,2025,10,gasboiler,2020,all-year,all-week,morning,10.10620000000
-1,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,morning,3.34680000000
-1,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,morning,3.34680000000
-1,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R2,2025,4,gas_stove,2020,all-year,all-week,morning,7.80890000000
-1,CO2f,R2,2025,6,gas_stove,2020,all-year,all-week,morning,7.80890000000
-1,CO2f,R2,2025,8,gasboiler,2020,all-year,all-week,morning,10.10620000000
-1,CO2f,R2,2025,10,gasboiler,2020,all-year,all-week,morning,10.10620000000
-1,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,morning,3.34680000000
-1,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,morning,3.34680000000
-1,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,cook,R1,2025,0,estove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R1,2025,2,estove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R1,2025,4,gas_stove,2020,all-year,all-week,morning,0.15620000000
-1,cook,R1,2025,6,gas_stove,2020,all-year,all-week,morning,0.15620000000
-1,cook,R1,2030,0,estove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R1,2030,1,estove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R1,2030,2,estove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R1,2030,3,estove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R1,2030,5,gas_stove,2025,all-year,all-week,morning,0.06690000000
-1,cook,R1,2030,7,gas_stove,2025,all-year,all-week,morning,0.06690000000
-1,cook,R2,2025,0,estove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R2,2025,2,estove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R2,2025,4,gas_stove,2020,all-year,all-week,morning,0.15620000000
-1,cook,R2,2025,6,gas_stove,2020,all-year,all-week,morning,0.15620000000
-1,cook,R2,2030,0,estove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R2,2030,1,estove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R2,2030,2,estove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R2,2030,3,estove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R2,2030,5,gas_stove,2025,all-year,all-week,morning,0.06690000000
-1,cook,R2,2030,7,gas_stove,2025,all-year,all-week,morning,0.06690000000
-2,heat,R1,2025,8,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R1,2025,10,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R1,2025,12,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R1,2025,14,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R1,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R1,2030,11,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R1,2030,12,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R1,2030,13,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R1,2030,14,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R1,2030,15,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R2,2025,8,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R2,2025,10,gasboiler,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,heat,R2,2025,12,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R2,2025,14,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R2,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R2,2030,11,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R2,2030,12,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R2,2030,13,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R2,2030,14,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R2,2030,15,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,CO2f,R1,2025,4,gas_stove,2020,all-year,all-week,mid-afternoon,5.20590000000
-2,CO2f,R1,2025,6,gas_stove,2020,all-year,all-week,mid-afternoon,5.20590000000
-2,CO2f,R1,2025,8,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R1,2025,10,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,mid-afternoon,2.23120000000
-2,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.23120000000
-2,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R2,2025,4,gas_stove,2020,all-year,all-week,mid-afternoon,5.20590000000
-2,CO2f,R2,2025,6,gas_stove,2020,all-year,all-week,mid-afternoon,5.20590000000
-2,CO2f,R2,2025,8,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R2,2025,10,gasboiler,2020,all-year,all-week,mid-afternoon,6.73750000000
-2,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,mid-afternoon,2.23120000000
-2,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.23120000000
-2,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,cook,R1,2025,0,estove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R1,2025,2,estove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R1,2025,4,gas_stove,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,cook,R1,2025,6,gas_stove,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,cook,R1,2030,0,estove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R1,2030,1,estove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R1,2030,2,estove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R1,2030,3,estove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R1,2030,5,gas_stove,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,cook,R1,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,cook,R2,2025,0,estove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R2,2025,2,estove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R2,2025,4,gas_stove,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,cook,R2,2025,6,gas_stove,2020,all-year,all-week,mid-afternoon,0.10410000000
-2,cook,R2,2030,0,estove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R2,2030,1,estove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R2,2030,2,estove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R2,2030,3,estove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R2,2030,5,gas_stove,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,cook,R2,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04460000000
-3,heat,R1,2025,8,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R1,2025,10,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R1,2025,12,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R1,2025,14,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R1,2030,9,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R1,2030,11,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R1,2030,12,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R1,2030,13,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R1,2030,14,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R1,2030,15,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R2,2025,8,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R2,2025,10,gasboiler,2020,all-year,all-week,early-peak,0.15620000000
-3,heat,R2,2025,12,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R2,2025,14,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R2,2030,9,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R2,2030,11,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R2,2030,12,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R2,2030,13,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R2,2030,14,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R2,2030,15,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,CO2f,R1,2025,4,gas_stove,2020,all-year,all-week,early-peak,7.80890000000
-3,CO2f,R1,2025,6,gas_stove,2020,all-year,all-week,early-peak,7.80890000000
-3,CO2f,R1,2025,8,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R1,2025,10,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,early-peak,3.34680000000
-3,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,early-peak,3.34680000000
-3,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R2,2025,4,gas_stove,2020,all-year,all-week,early-peak,7.80890000000
-3,CO2f,R2,2025,6,gas_stove,2020,all-year,all-week,early-peak,7.80890000000
-3,CO2f,R2,2025,8,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R2,2025,10,gasboiler,2020,all-year,all-week,early-peak,10.10620000000
-3,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,early-peak,3.34680000000
-3,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,early-peak,3.34680000000
-3,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,cook,R1,2025,0,estove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R1,2025,2,estove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R1,2025,4,gas_stove,2020,all-year,all-week,early-peak,0.15620000000
-3,cook,R1,2025,6,gas_stove,2020,all-year,all-week,early-peak,0.15620000000
-3,cook,R1,2030,0,estove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R1,2030,1,estove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R1,2030,2,estove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R1,2030,3,estove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R1,2030,5,gas_stove,2025,all-year,all-week,early-peak,0.06690000000
-3,cook,R1,2030,7,gas_stove,2025,all-year,all-week,early-peak,0.06690000000
-3,cook,R2,2025,0,estove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R2,2025,2,estove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R2,2025,4,gas_stove,2020,all-year,all-week,early-peak,0.15620000000
-3,cook,R2,2025,6,gas_stove,2020,all-year,all-week,early-peak,0.15620000000
-3,cook,R2,2030,0,estove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R2,2030,1,estove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R2,2030,2,estove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R2,2030,3,estove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R2,2030,5,gas_stove,2025,all-year,all-week,early-peak,0.06690000000
-3,cook,R2,2030,7,gas_stove,2025,all-year,all-week,early-peak,0.06690000000
-4,heat,R1,2025,8,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R1,2025,10,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R1,2025,12,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R1,2025,14,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R1,2030,9,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R1,2030,11,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R1,2030,12,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R1,2030,13,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R1,2030,14,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R1,2030,15,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R2,2025,8,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R2,2025,10,gasboiler,2020,all-year,all-week,late-peak,0.31250000000
-4,heat,R2,2025,12,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R2,2025,14,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R2,2030,9,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R2,2030,11,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R2,2030,12,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R2,2030,13,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R2,2030,14,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R2,2030,15,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,CO2f,R1,2025,4,gas_stove,2020,all-year,all-week,late-peak,15.62500000000
-4,CO2f,R1,2025,6,gas_stove,2020,all-year,all-week,late-peak,15.62500000000
-4,CO2f,R1,2025,8,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R1,2025,10,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,late-peak,6.69670000000
-4,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,late-peak,6.69670000000
-4,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R2,2025,4,gas_stove,2020,all-year,all-week,late-peak,15.62500000000
-4,CO2f,R2,2025,6,gas_stove,2020,all-year,all-week,late-peak,15.62500000000
-4,CO2f,R2,2025,8,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R2,2025,10,gasboiler,2020,all-year,all-week,late-peak,20.22190000000
-4,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,late-peak,6.69670000000
-4,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,late-peak,6.69670000000
-4,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,cook,R1,2025,0,estove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R1,2025,2,estove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R1,2025,4,gas_stove,2020,all-year,all-week,late-peak,0.31250000000
-4,cook,R1,2025,6,gas_stove,2020,all-year,all-week,late-peak,0.31250000000
-4,cook,R1,2030,0,estove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R1,2030,1,estove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R1,2030,2,estove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R1,2030,3,estove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R1,2030,5,gas_stove,2025,all-year,all-week,late-peak,0.13390000000
-4,cook,R1,2030,7,gas_stove,2025,all-year,all-week,late-peak,0.13390000000
-4,cook,R2,2025,0,estove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R2,2025,2,estove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R2,2025,4,gas_stove,2020,all-year,all-week,late-peak,0.31250000000
-4,cook,R2,2025,6,gas_stove,2020,all-year,all-week,late-peak,0.31250000000
-4,cook,R2,2030,0,estove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R2,2030,1,estove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R2,2030,2,estove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R2,2030,3,estove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R2,2030,5,gas_stove,2025,all-year,all-week,late-peak,0.13390000000
-4,cook,R2,2030,7,gas_stove,2025,all-year,all-week,late-peak,0.13390000000
-5,heat,R1,2025,8,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R1,2025,10,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R1,2025,12,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R1,2025,14,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R1,2030,9,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R1,2030,11,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R1,2030,12,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R1,2030,13,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R1,2030,14,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R1,2030,15,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R2,2025,8,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R2,2025,10,gasboiler,2020,all-year,all-week,evening,0.20840000000
-5,heat,R2,2025,12,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R2,2025,14,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R2,2030,9,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R2,2030,11,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R2,2030,12,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R2,2030,13,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R2,2030,14,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R2,2030,15,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,CO2f,R1,2025,4,gas_stove,2020,all-year,all-week,evening,10.41910000000
-5,CO2f,R1,2025,6,gas_stove,2020,all-year,all-week,evening,10.41910000000
-5,CO2f,R1,2025,8,gasboiler,2020,all-year,all-week,evening,13.48440000000
-5,CO2f,R1,2025,10,gasboiler,2020,all-year,all-week,evening,13.48440000000
-5,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,evening,4.46550000000
-5,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,evening,4.46550000000
-5,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R2,2025,4,gas_stove,2020,all-year,all-week,evening,10.41910000000
-5,CO2f,R2,2025,6,gas_stove,2020,all-year,all-week,evening,10.41910000000
-5,CO2f,R2,2025,8,gasboiler,2020,all-year,all-week,evening,13.48440000000
-5,CO2f,R2,2025,10,gasboiler,2020,all-year,all-week,evening,13.48440000000
-5,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,evening,4.46550000000
-5,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,evening,4.46550000000
-5,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,cook,R1,2025,0,estove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R1,2025,2,estove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R1,2025,4,gas_stove,2020,all-year,all-week,evening,0.20840000000
-5,cook,R1,2025,6,gas_stove,2020,all-year,all-week,evening,0.20840000000
-5,cook,R1,2030,0,estove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R1,2030,1,estove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R1,2030,2,estove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R1,2030,3,estove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R1,2030,5,gas_stove,2025,all-year,all-week,evening,0.08930000000
-5,cook,R1,2030,7,gas_stove,2025,all-year,all-week,evening,0.08930000000
-5,cook,R2,2025,0,estove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R2,2025,2,estove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R2,2025,4,gas_stove,2020,all-year,all-week,evening,0.20840000000
-5,cook,R2,2025,6,gas_stove,2020,all-year,all-week,evening,0.20840000000
-5,cook,R2,2030,0,estove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R2,2030,1,estove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R2,2030,2,estove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R2,2030,3,estove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R2,2030,5,gas_stove,2025,all-year,all-week,evening,0.08930000000
-5,cook,R2,2030,7,gas_stove,2025,all-year,all-week,evening,0.08930000000
-6,heat,R1,2025,8,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R1,2025,10,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R1,2025,12,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R1,2025,14,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R1,2030,9,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R1,2030,11,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R1,2030,12,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R1,2030,13,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R1,2030,14,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R1,2030,15,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R2,2025,8,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R2,2025,10,gasboiler,2020,all-year,all-week,early-morning,0.20840000000
-6,heat,R2,2025,12,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R2,2025,14,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R2,2030,9,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R2,2030,11,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R2,2030,12,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R2,2030,13,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R2,2030,14,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R2,2030,15,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,CO2f,R1,2025,4,gas_stove,2020,all-year,all-week,early-morning,10.41910000000
-6,CO2f,R1,2025,6,gas_stove,2020,all-year,all-week,early-morning,10.41910000000
-6,CO2f,R1,2025,8,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R1,2025,10,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,early-morning,4.46550000000
-6,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,early-morning,4.46550000000
-6,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R2,2025,4,gas_stove,2020,all-year,all-week,early-morning,10.41910000000
-6,CO2f,R2,2025,6,gas_stove,2020,all-year,all-week,early-morning,10.41910000000
-6,CO2f,R2,2025,8,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R2,2025,10,gasboiler,2020,all-year,all-week,early-morning,13.48440000000
-6,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,early-morning,4.46550000000
-6,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,early-morning,4.46550000000
-6,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,cook,R1,2025,0,estove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R1,2025,2,estove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R1,2025,4,gas_stove,2020,all-year,all-week,early-morning,0.20840000000
-6,cook,R1,2025,6,gas_stove,2020,all-year,all-week,early-morning,0.20840000000
-6,cook,R1,2030,0,estove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R1,2030,1,estove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R1,2030,2,estove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R1,2030,3,estove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R1,2030,5,gas_stove,2025,all-year,all-week,early-morning,0.08930000000
-6,cook,R1,2030,7,gas_stove,2025,all-year,all-week,early-morning,0.08930000000
-6,cook,R2,2025,0,estove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R2,2025,2,estove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R2,2025,4,gas_stove,2020,all-year,all-week,early-morning,0.20840000000
-6,cook,R2,2025,6,gas_stove,2020,all-year,all-week,early-morning,0.20840000000
-6,cook,R2,2030,0,estove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R2,2030,1,estove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R2,2030,2,estove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R2,2030,3,estove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R2,2030,5,gas_stove,2025,all-year,all-week,early-morning,0.08930000000
-6,cook,R2,2030,7,gas_stove,2025,all-year,all-week,early-morning,0.08930000000
-7,heat,R1,2025,8,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R1,2025,10,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R1,2025,12,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R1,2025,14,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R1,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R1,2030,11,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R1,2030,12,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R1,2030,13,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R1,2030,14,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R1,2030,15,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R2,2025,8,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R2,2025,10,gasboiler,2020,all-year,all-week,late-afternoon,0.20840000000
-7,heat,R2,2025,12,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R2,2025,14,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R2,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R2,2030,11,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R2,2030,12,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R2,2030,13,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R2,2030,14,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R2,2030,15,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,CO2f,R1,2025,4,gas_stove,2020,all-year,all-week,late-afternoon,10.41910000000
-7,CO2f,R1,2025,6,gas_stove,2020,all-year,all-week,late-afternoon,10.41910000000
-7,CO2f,R1,2025,8,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R1,2025,10,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R1,2030,5,gas_stove,2025,all-year,all-week,late-afternoon,4.46550000000
-7,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,4.46550000000
-7,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R1,2030,11,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R2,2025,4,gas_stove,2020,all-year,all-week,late-afternoon,10.41910000000
-7,CO2f,R2,2025,6,gas_stove,2020,all-year,all-week,late-afternoon,10.41910000000
-7,CO2f,R2,2025,8,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R2,2025,10,gasboiler,2020,all-year,all-week,late-afternoon,13.48440000000
-7,CO2f,R2,2030,5,gas_stove,2025,all-year,all-week,late-afternoon,4.46550000000
-7,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,4.46550000000
-7,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R2,2030,11,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,cook,R1,2025,0,estove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R1,2025,2,estove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R1,2025,4,gas_stove,2020,all-year,all-week,late-afternoon,0.20840000000
-7,cook,R1,2025,6,gas_stove,2020,all-year,all-week,late-afternoon,0.20840000000
-7,cook,R1,2030,0,estove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R1,2030,1,estove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R1,2030,2,estove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R1,2030,3,estove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R1,2030,5,gas_stove,2025,all-year,all-week,late-afternoon,0.08930000000
-7,cook,R1,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08930000000
-7,cook,R2,2025,0,estove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R2,2025,2,estove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R2,2025,4,gas_stove,2020,all-year,all-week,late-afternoon,0.20840000000
-7,cook,R2,2025,6,gas_stove,2020,all-year,all-week,late-afternoon,0.20840000000
-7,cook,R2,2030,0,estove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R2,2030,1,estove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R2,2030,2,estove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R2,2030,3,estove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R2,2030,5,gas_stove,2025,all-year,all-week,late-afternoon,0.08930000000
-7,cook,R2,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08930000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2025,8,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R1,2025,10,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R1,2025,12,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R1,2025,14,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R1,2030,9,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R1,2030,11,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R1,2030,12,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R1,2030,13,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R1,2030,14,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R1,2030,15,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R2,2025,8,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R2,2025,10,all-year,all-week,night,gasboiler,2020,0.10410000000
+0,heat,R2,2025,12,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R2,2025,14,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R2,2030,9,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R2,2030,11,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R2,2030,12,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R2,2030,13,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R2,2030,14,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R2,2030,15,all-year,all-week,night,heatpump,2025,0.17850000000
+0,CO2f,R1,2025,4,all-year,all-week,night,gas_stove,2020,5.20590000000
+0,CO2f,R1,2025,6,all-year,all-week,night,gas_stove,2020,5.20590000000
+0,CO2f,R1,2025,8,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R1,2025,10,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R1,2030,5,all-year,all-week,night,gas_stove,2025,2.23120000000
+0,CO2f,R1,2030,7,all-year,all-week,night,gas_stove,2025,2.23120000000
+0,CO2f,R1,2030,9,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R1,2030,11,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R2,2025,4,all-year,all-week,night,gas_stove,2020,5.20590000000
+0,CO2f,R2,2025,6,all-year,all-week,night,gas_stove,2020,5.20590000000
+0,CO2f,R2,2025,8,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R2,2025,10,all-year,all-week,night,gasboiler,2020,6.73750000000
+0,CO2f,R2,2030,5,all-year,all-week,night,gas_stove,2025,2.23120000000
+0,CO2f,R2,2030,7,all-year,all-week,night,gas_stove,2025,2.23120000000
+0,CO2f,R2,2030,9,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R2,2030,11,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,cook,R1,2025,0,all-year,all-week,night,estove,2020,0.37190000000
+0,cook,R1,2025,2,all-year,all-week,night,estove,2020,0.37190000000
+0,cook,R1,2025,4,all-year,all-week,night,gas_stove,2020,0.10410000000
+0,cook,R1,2025,6,all-year,all-week,night,gas_stove,2020,0.10410000000
+0,cook,R1,2030,0,all-year,all-week,night,estove,2020,0.37190000000
+0,cook,R1,2030,1,all-year,all-week,night,estove,2025,0.17850000000
+0,cook,R1,2030,2,all-year,all-week,night,estove,2020,0.37190000000
+0,cook,R1,2030,3,all-year,all-week,night,estove,2025,0.17850000000
+0,cook,R1,2030,5,all-year,all-week,night,gas_stove,2025,0.04460000000
+0,cook,R1,2030,7,all-year,all-week,night,gas_stove,2025,0.04460000000
+0,cook,R2,2025,0,all-year,all-week,night,estove,2020,0.37190000000
+0,cook,R2,2025,2,all-year,all-week,night,estove,2020,0.37190000000
+0,cook,R2,2025,4,all-year,all-week,night,gas_stove,2020,0.10410000000
+0,cook,R2,2025,6,all-year,all-week,night,gas_stove,2020,0.10410000000
+0,cook,R2,2030,0,all-year,all-week,night,estove,2020,0.37190000000
+0,cook,R2,2030,1,all-year,all-week,night,estove,2025,0.17850000000
+0,cook,R2,2030,2,all-year,all-week,night,estove,2020,0.37190000000
+0,cook,R2,2030,3,all-year,all-week,night,estove,2025,0.17850000000
+0,cook,R2,2030,5,all-year,all-week,night,gas_stove,2025,0.04460000000
+0,cook,R2,2030,7,all-year,all-week,night,gas_stove,2025,0.04460000000
+1,heat,R1,2025,8,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R1,2025,10,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R1,2025,12,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R1,2025,14,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R1,2030,9,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R1,2030,11,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R1,2030,12,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R1,2030,13,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R1,2030,14,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R1,2030,15,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R2,2025,8,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R2,2025,10,all-year,all-week,morning,gasboiler,2020,0.15620000000
+1,heat,R2,2025,12,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R2,2025,14,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R2,2030,9,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R2,2030,11,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R2,2030,12,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R2,2030,13,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R2,2030,14,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R2,2030,15,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,CO2f,R1,2025,4,all-year,all-week,morning,gas_stove,2020,7.80890000000
+1,CO2f,R1,2025,6,all-year,all-week,morning,gas_stove,2020,7.80890000000
+1,CO2f,R1,2025,8,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R1,2025,10,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R1,2030,5,all-year,all-week,morning,gas_stove,2025,3.34680000000
+1,CO2f,R1,2030,7,all-year,all-week,morning,gas_stove,2025,3.34680000000
+1,CO2f,R1,2030,9,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R1,2030,11,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R2,2025,4,all-year,all-week,morning,gas_stove,2020,7.80890000000
+1,CO2f,R2,2025,6,all-year,all-week,morning,gas_stove,2020,7.80890000000
+1,CO2f,R2,2025,8,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R2,2025,10,all-year,all-week,morning,gasboiler,2020,10.10620000000
+1,CO2f,R2,2030,5,all-year,all-week,morning,gas_stove,2025,3.34680000000
+1,CO2f,R2,2030,7,all-year,all-week,morning,gas_stove,2025,3.34680000000
+1,CO2f,R2,2030,9,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R2,2030,11,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,cook,R1,2025,0,all-year,all-week,morning,estove,2020,0.55780000000
+1,cook,R1,2025,2,all-year,all-week,morning,estove,2020,0.55780000000
+1,cook,R1,2025,4,all-year,all-week,morning,gas_stove,2020,0.15620000000
+1,cook,R1,2025,6,all-year,all-week,morning,gas_stove,2020,0.15620000000
+1,cook,R1,2030,0,all-year,all-week,morning,estove,2020,0.55780000000
+1,cook,R1,2030,1,all-year,all-week,morning,estove,2025,0.26770000000
+1,cook,R1,2030,2,all-year,all-week,morning,estove,2020,0.55780000000
+1,cook,R1,2030,3,all-year,all-week,morning,estove,2025,0.26770000000
+1,cook,R1,2030,5,all-year,all-week,morning,gas_stove,2025,0.06690000000
+1,cook,R1,2030,7,all-year,all-week,morning,gas_stove,2025,0.06690000000
+1,cook,R2,2025,0,all-year,all-week,morning,estove,2020,0.55780000000
+1,cook,R2,2025,2,all-year,all-week,morning,estove,2020,0.55780000000
+1,cook,R2,2025,4,all-year,all-week,morning,gas_stove,2020,0.15620000000
+1,cook,R2,2025,6,all-year,all-week,morning,gas_stove,2020,0.15620000000
+1,cook,R2,2030,0,all-year,all-week,morning,estove,2020,0.55780000000
+1,cook,R2,2030,1,all-year,all-week,morning,estove,2025,0.26770000000
+1,cook,R2,2030,2,all-year,all-week,morning,estove,2020,0.55780000000
+1,cook,R2,2030,3,all-year,all-week,morning,estove,2025,0.26770000000
+1,cook,R2,2030,5,all-year,all-week,morning,gas_stove,2025,0.06690000000
+1,cook,R2,2030,7,all-year,all-week,morning,gas_stove,2025,0.06690000000
+2,heat,R1,2025,8,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R1,2025,10,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R1,2025,12,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R1,2025,14,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R1,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R1,2030,11,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R1,2030,12,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R1,2030,13,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R1,2030,14,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R1,2030,15,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R2,2025,8,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R2,2025,10,all-year,all-week,mid-afternoon,gasboiler,2020,0.10410000000
+2,heat,R2,2025,12,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R2,2025,14,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R2,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R2,2030,11,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R2,2030,12,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R2,2030,13,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R2,2030,14,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R2,2030,15,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,CO2f,R1,2025,4,all-year,all-week,mid-afternoon,gas_stove,2020,5.20590000000
+2,CO2f,R1,2025,6,all-year,all-week,mid-afternoon,gas_stove,2020,5.20590000000
+2,CO2f,R1,2025,8,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R1,2025,10,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R1,2030,5,all-year,all-week,mid-afternoon,gas_stove,2025,2.23120000000
+2,CO2f,R1,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,2.23120000000
+2,CO2f,R1,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R1,2030,11,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R2,2025,4,all-year,all-week,mid-afternoon,gas_stove,2020,5.20590000000
+2,CO2f,R2,2025,6,all-year,all-week,mid-afternoon,gas_stove,2020,5.20590000000
+2,CO2f,R2,2025,8,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R2,2025,10,all-year,all-week,mid-afternoon,gasboiler,2020,6.73750000000
+2,CO2f,R2,2030,5,all-year,all-week,mid-afternoon,gas_stove,2025,2.23120000000
+2,CO2f,R2,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,2.23120000000
+2,CO2f,R2,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R2,2030,11,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,cook,R1,2025,0,all-year,all-week,mid-afternoon,estove,2020,0.37190000000
+2,cook,R1,2025,2,all-year,all-week,mid-afternoon,estove,2020,0.37190000000
+2,cook,R1,2025,4,all-year,all-week,mid-afternoon,gas_stove,2020,0.10410000000
+2,cook,R1,2025,6,all-year,all-week,mid-afternoon,gas_stove,2020,0.10410000000
+2,cook,R1,2030,0,all-year,all-week,mid-afternoon,estove,2020,0.37190000000
+2,cook,R1,2030,1,all-year,all-week,mid-afternoon,estove,2025,0.17850000000
+2,cook,R1,2030,2,all-year,all-week,mid-afternoon,estove,2020,0.37190000000
+2,cook,R1,2030,3,all-year,all-week,mid-afternoon,estove,2025,0.17850000000
+2,cook,R1,2030,5,all-year,all-week,mid-afternoon,gas_stove,2025,0.04460000000
+2,cook,R1,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,0.04460000000
+2,cook,R2,2025,0,all-year,all-week,mid-afternoon,estove,2020,0.37190000000
+2,cook,R2,2025,2,all-year,all-week,mid-afternoon,estove,2020,0.37190000000
+2,cook,R2,2025,4,all-year,all-week,mid-afternoon,gas_stove,2020,0.10410000000
+2,cook,R2,2025,6,all-year,all-week,mid-afternoon,gas_stove,2020,0.10410000000
+2,cook,R2,2030,0,all-year,all-week,mid-afternoon,estove,2020,0.37190000000
+2,cook,R2,2030,1,all-year,all-week,mid-afternoon,estove,2025,0.17850000000
+2,cook,R2,2030,2,all-year,all-week,mid-afternoon,estove,2020,0.37190000000
+2,cook,R2,2030,3,all-year,all-week,mid-afternoon,estove,2025,0.17850000000
+2,cook,R2,2030,5,all-year,all-week,mid-afternoon,gas_stove,2025,0.04460000000
+2,cook,R2,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,0.04460000000
+3,heat,R1,2025,8,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R1,2025,10,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R1,2025,12,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R1,2025,14,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R1,2030,9,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R1,2030,11,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R1,2030,12,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R1,2030,13,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R1,2030,14,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R1,2030,15,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R2,2025,8,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R2,2025,10,all-year,all-week,early-peak,gasboiler,2020,0.15620000000
+3,heat,R2,2025,12,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R2,2025,14,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R2,2030,9,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R2,2030,11,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R2,2030,12,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R2,2030,13,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R2,2030,14,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R2,2030,15,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,CO2f,R1,2025,4,all-year,all-week,early-peak,gas_stove,2020,7.80890000000
+3,CO2f,R1,2025,6,all-year,all-week,early-peak,gas_stove,2020,7.80890000000
+3,CO2f,R1,2025,8,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R1,2025,10,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R1,2030,5,all-year,all-week,early-peak,gas_stove,2025,3.34680000000
+3,CO2f,R1,2030,7,all-year,all-week,early-peak,gas_stove,2025,3.34680000000
+3,CO2f,R1,2030,9,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R1,2030,11,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R2,2025,4,all-year,all-week,early-peak,gas_stove,2020,7.80890000000
+3,CO2f,R2,2025,6,all-year,all-week,early-peak,gas_stove,2020,7.80890000000
+3,CO2f,R2,2025,8,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R2,2025,10,all-year,all-week,early-peak,gasboiler,2020,10.10620000000
+3,CO2f,R2,2030,5,all-year,all-week,early-peak,gas_stove,2025,3.34680000000
+3,CO2f,R2,2030,7,all-year,all-week,early-peak,gas_stove,2025,3.34680000000
+3,CO2f,R2,2030,9,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R2,2030,11,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,cook,R1,2025,0,all-year,all-week,early-peak,estove,2020,0.55780000000
+3,cook,R1,2025,2,all-year,all-week,early-peak,estove,2020,0.55780000000
+3,cook,R1,2025,4,all-year,all-week,early-peak,gas_stove,2020,0.15620000000
+3,cook,R1,2025,6,all-year,all-week,early-peak,gas_stove,2020,0.15620000000
+3,cook,R1,2030,0,all-year,all-week,early-peak,estove,2020,0.55780000000
+3,cook,R1,2030,1,all-year,all-week,early-peak,estove,2025,0.26770000000
+3,cook,R1,2030,2,all-year,all-week,early-peak,estove,2020,0.55780000000
+3,cook,R1,2030,3,all-year,all-week,early-peak,estove,2025,0.26770000000
+3,cook,R1,2030,5,all-year,all-week,early-peak,gas_stove,2025,0.06690000000
+3,cook,R1,2030,7,all-year,all-week,early-peak,gas_stove,2025,0.06690000000
+3,cook,R2,2025,0,all-year,all-week,early-peak,estove,2020,0.55780000000
+3,cook,R2,2025,2,all-year,all-week,early-peak,estove,2020,0.55780000000
+3,cook,R2,2025,4,all-year,all-week,early-peak,gas_stove,2020,0.15620000000
+3,cook,R2,2025,6,all-year,all-week,early-peak,gas_stove,2020,0.15620000000
+3,cook,R2,2030,0,all-year,all-week,early-peak,estove,2020,0.55780000000
+3,cook,R2,2030,1,all-year,all-week,early-peak,estove,2025,0.26770000000
+3,cook,R2,2030,2,all-year,all-week,early-peak,estove,2020,0.55780000000
+3,cook,R2,2030,3,all-year,all-week,early-peak,estove,2025,0.26770000000
+3,cook,R2,2030,5,all-year,all-week,early-peak,gas_stove,2025,0.06690000000
+3,cook,R2,2030,7,all-year,all-week,early-peak,gas_stove,2025,0.06690000000
+4,heat,R1,2025,8,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R1,2025,10,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R1,2025,12,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R1,2025,14,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R1,2030,9,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R1,2030,11,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R1,2030,12,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R1,2030,13,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R1,2030,14,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R1,2030,15,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R2,2025,8,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R2,2025,10,all-year,all-week,late-peak,gasboiler,2020,0.31250000000
+4,heat,R2,2025,12,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R2,2025,14,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R2,2030,9,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R2,2030,11,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R2,2030,12,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R2,2030,13,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R2,2030,14,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R2,2030,15,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,CO2f,R1,2025,4,all-year,all-week,late-peak,gas_stove,2020,15.62500000000
+4,CO2f,R1,2025,6,all-year,all-week,late-peak,gas_stove,2020,15.62500000000
+4,CO2f,R1,2025,8,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R1,2025,10,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R1,2030,5,all-year,all-week,late-peak,gas_stove,2025,6.69670000000
+4,CO2f,R1,2030,7,all-year,all-week,late-peak,gas_stove,2025,6.69670000000
+4,CO2f,R1,2030,9,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R1,2030,11,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R2,2025,4,all-year,all-week,late-peak,gas_stove,2020,15.62500000000
+4,CO2f,R2,2025,6,all-year,all-week,late-peak,gas_stove,2020,15.62500000000
+4,CO2f,R2,2025,8,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R2,2025,10,all-year,all-week,late-peak,gasboiler,2020,20.22190000000
+4,CO2f,R2,2030,5,all-year,all-week,late-peak,gas_stove,2025,6.69670000000
+4,CO2f,R2,2030,7,all-year,all-week,late-peak,gas_stove,2025,6.69670000000
+4,CO2f,R2,2030,9,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R2,2030,11,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,cook,R1,2025,0,all-year,all-week,late-peak,estove,2020,1.11620000000
+4,cook,R1,2025,2,all-year,all-week,late-peak,estove,2020,1.11620000000
+4,cook,R1,2025,4,all-year,all-week,late-peak,gas_stove,2020,0.31250000000
+4,cook,R1,2025,6,all-year,all-week,late-peak,gas_stove,2020,0.31250000000
+4,cook,R1,2030,0,all-year,all-week,late-peak,estove,2020,1.11620000000
+4,cook,R1,2030,1,all-year,all-week,late-peak,estove,2025,0.53570000000
+4,cook,R1,2030,2,all-year,all-week,late-peak,estove,2020,1.11620000000
+4,cook,R1,2030,3,all-year,all-week,late-peak,estove,2025,0.53570000000
+4,cook,R1,2030,5,all-year,all-week,late-peak,gas_stove,2025,0.13390000000
+4,cook,R1,2030,7,all-year,all-week,late-peak,gas_stove,2025,0.13390000000
+4,cook,R2,2025,0,all-year,all-week,late-peak,estove,2020,1.11620000000
+4,cook,R2,2025,2,all-year,all-week,late-peak,estove,2020,1.11620000000
+4,cook,R2,2025,4,all-year,all-week,late-peak,gas_stove,2020,0.31250000000
+4,cook,R2,2025,6,all-year,all-week,late-peak,gas_stove,2020,0.31250000000
+4,cook,R2,2030,0,all-year,all-week,late-peak,estove,2020,1.11620000000
+4,cook,R2,2030,1,all-year,all-week,late-peak,estove,2025,0.53570000000
+4,cook,R2,2030,2,all-year,all-week,late-peak,estove,2020,1.11620000000
+4,cook,R2,2030,3,all-year,all-week,late-peak,estove,2025,0.53570000000
+4,cook,R2,2030,5,all-year,all-week,late-peak,gas_stove,2025,0.13390000000
+4,cook,R2,2030,7,all-year,all-week,late-peak,gas_stove,2025,0.13390000000
+5,heat,R1,2025,8,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R1,2025,10,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R1,2025,12,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R1,2025,14,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R1,2030,9,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R1,2030,11,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R1,2030,12,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R1,2030,13,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R1,2030,14,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R1,2030,15,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R2,2025,8,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R2,2025,10,all-year,all-week,evening,gasboiler,2020,0.20840000000
+5,heat,R2,2025,12,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R2,2025,14,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R2,2030,9,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R2,2030,11,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R2,2030,12,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R2,2030,13,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R2,2030,14,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R2,2030,15,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,CO2f,R1,2025,4,all-year,all-week,evening,gas_stove,2020,10.41910000000
+5,CO2f,R1,2025,6,all-year,all-week,evening,gas_stove,2020,10.41910000000
+5,CO2f,R1,2025,8,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R1,2025,10,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R1,2030,5,all-year,all-week,evening,gas_stove,2025,4.46550000000
+5,CO2f,R1,2030,7,all-year,all-week,evening,gas_stove,2025,4.46550000000
+5,CO2f,R1,2030,9,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R1,2030,11,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R2,2025,4,all-year,all-week,evening,gas_stove,2020,10.41910000000
+5,CO2f,R2,2025,6,all-year,all-week,evening,gas_stove,2020,10.41910000000
+5,CO2f,R2,2025,8,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R2,2025,10,all-year,all-week,evening,gasboiler,2020,13.48440000000
+5,CO2f,R2,2030,5,all-year,all-week,evening,gas_stove,2025,4.46550000000
+5,CO2f,R2,2030,7,all-year,all-week,evening,gas_stove,2025,4.46550000000
+5,CO2f,R2,2030,9,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R2,2030,11,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,cook,R1,2025,0,all-year,all-week,evening,estove,2020,0.74430000000
+5,cook,R1,2025,2,all-year,all-week,evening,estove,2020,0.74430000000
+5,cook,R1,2025,4,all-year,all-week,evening,gas_stove,2020,0.20840000000
+5,cook,R1,2025,6,all-year,all-week,evening,gas_stove,2020,0.20840000000
+5,cook,R1,2030,0,all-year,all-week,evening,estove,2020,0.74430000000
+5,cook,R1,2030,1,all-year,all-week,evening,estove,2025,0.35720000000
+5,cook,R1,2030,2,all-year,all-week,evening,estove,2020,0.74430000000
+5,cook,R1,2030,3,all-year,all-week,evening,estove,2025,0.35720000000
+5,cook,R1,2030,5,all-year,all-week,evening,gas_stove,2025,0.08930000000
+5,cook,R1,2030,7,all-year,all-week,evening,gas_stove,2025,0.08930000000
+5,cook,R2,2025,0,all-year,all-week,evening,estove,2020,0.74430000000
+5,cook,R2,2025,2,all-year,all-week,evening,estove,2020,0.74430000000
+5,cook,R2,2025,4,all-year,all-week,evening,gas_stove,2020,0.20840000000
+5,cook,R2,2025,6,all-year,all-week,evening,gas_stove,2020,0.20840000000
+5,cook,R2,2030,0,all-year,all-week,evening,estove,2020,0.74430000000
+5,cook,R2,2030,1,all-year,all-week,evening,estove,2025,0.35720000000
+5,cook,R2,2030,2,all-year,all-week,evening,estove,2020,0.74430000000
+5,cook,R2,2030,3,all-year,all-week,evening,estove,2025,0.35720000000
+5,cook,R2,2030,5,all-year,all-week,evening,gas_stove,2025,0.08930000000
+5,cook,R2,2030,7,all-year,all-week,evening,gas_stove,2025,0.08930000000
+6,heat,R1,2025,8,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R1,2025,10,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R1,2025,12,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R1,2025,14,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R1,2030,9,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R1,2030,11,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R1,2030,12,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R1,2030,13,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R1,2030,14,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R1,2030,15,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R2,2025,8,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R2,2025,10,all-year,all-week,early-morning,gasboiler,2020,0.20840000000
+6,heat,R2,2025,12,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R2,2025,14,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R2,2030,9,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R2,2030,11,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R2,2030,12,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R2,2030,13,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R2,2030,14,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R2,2030,15,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,CO2f,R1,2025,4,all-year,all-week,early-morning,gas_stove,2020,10.41910000000
+6,CO2f,R1,2025,6,all-year,all-week,early-morning,gas_stove,2020,10.41910000000
+6,CO2f,R1,2025,8,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R1,2025,10,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R1,2030,5,all-year,all-week,early-morning,gas_stove,2025,4.46550000000
+6,CO2f,R1,2030,7,all-year,all-week,early-morning,gas_stove,2025,4.46550000000
+6,CO2f,R1,2030,9,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R1,2030,11,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R2,2025,4,all-year,all-week,early-morning,gas_stove,2020,10.41910000000
+6,CO2f,R2,2025,6,all-year,all-week,early-morning,gas_stove,2020,10.41910000000
+6,CO2f,R2,2025,8,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R2,2025,10,all-year,all-week,early-morning,gasboiler,2020,13.48440000000
+6,CO2f,R2,2030,5,all-year,all-week,early-morning,gas_stove,2025,4.46550000000
+6,CO2f,R2,2030,7,all-year,all-week,early-morning,gas_stove,2025,4.46550000000
+6,CO2f,R2,2030,9,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R2,2030,11,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,cook,R1,2025,0,all-year,all-week,early-morning,estove,2020,0.74430000000
+6,cook,R1,2025,2,all-year,all-week,early-morning,estove,2020,0.74430000000
+6,cook,R1,2025,4,all-year,all-week,early-morning,gas_stove,2020,0.20840000000
+6,cook,R1,2025,6,all-year,all-week,early-morning,gas_stove,2020,0.20840000000
+6,cook,R1,2030,0,all-year,all-week,early-morning,estove,2020,0.74430000000
+6,cook,R1,2030,1,all-year,all-week,early-morning,estove,2025,0.35720000000
+6,cook,R1,2030,2,all-year,all-week,early-morning,estove,2020,0.74430000000
+6,cook,R1,2030,3,all-year,all-week,early-morning,estove,2025,0.35720000000
+6,cook,R1,2030,5,all-year,all-week,early-morning,gas_stove,2025,0.08930000000
+6,cook,R1,2030,7,all-year,all-week,early-morning,gas_stove,2025,0.08930000000
+6,cook,R2,2025,0,all-year,all-week,early-morning,estove,2020,0.74430000000
+6,cook,R2,2025,2,all-year,all-week,early-morning,estove,2020,0.74430000000
+6,cook,R2,2025,4,all-year,all-week,early-morning,gas_stove,2020,0.20840000000
+6,cook,R2,2025,6,all-year,all-week,early-morning,gas_stove,2020,0.20840000000
+6,cook,R2,2030,0,all-year,all-week,early-morning,estove,2020,0.74430000000
+6,cook,R2,2030,1,all-year,all-week,early-morning,estove,2025,0.35720000000
+6,cook,R2,2030,2,all-year,all-week,early-morning,estove,2020,0.74430000000
+6,cook,R2,2030,3,all-year,all-week,early-morning,estove,2025,0.35720000000
+6,cook,R2,2030,5,all-year,all-week,early-morning,gas_stove,2025,0.08930000000
+6,cook,R2,2030,7,all-year,all-week,early-morning,gas_stove,2025,0.08930000000
+7,heat,R1,2025,8,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R1,2025,10,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R1,2025,12,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R1,2025,14,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R1,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R1,2030,11,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R1,2030,12,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R1,2030,13,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R1,2030,14,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R1,2030,15,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R2,2025,8,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R2,2025,10,all-year,all-week,late-afternoon,gasboiler,2020,0.20840000000
+7,heat,R2,2025,12,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R2,2025,14,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R2,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R2,2030,11,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R2,2030,12,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R2,2030,13,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R2,2030,14,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R2,2030,15,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,CO2f,R1,2025,4,all-year,all-week,late-afternoon,gas_stove,2020,10.41910000000
+7,CO2f,R1,2025,6,all-year,all-week,late-afternoon,gas_stove,2020,10.41910000000
+7,CO2f,R1,2025,8,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R1,2025,10,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R1,2030,5,all-year,all-week,late-afternoon,gas_stove,2025,4.46550000000
+7,CO2f,R1,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,4.46550000000
+7,CO2f,R1,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R1,2030,11,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R2,2025,4,all-year,all-week,late-afternoon,gas_stove,2020,10.41910000000
+7,CO2f,R2,2025,6,all-year,all-week,late-afternoon,gas_stove,2020,10.41910000000
+7,CO2f,R2,2025,8,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R2,2025,10,all-year,all-week,late-afternoon,gasboiler,2020,13.48440000000
+7,CO2f,R2,2030,5,all-year,all-week,late-afternoon,gas_stove,2025,4.46550000000
+7,CO2f,R2,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,4.46550000000
+7,CO2f,R2,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R2,2030,11,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,cook,R1,2025,0,all-year,all-week,late-afternoon,estove,2020,0.74430000000
+7,cook,R1,2025,2,all-year,all-week,late-afternoon,estove,2020,0.74430000000
+7,cook,R1,2025,4,all-year,all-week,late-afternoon,gas_stove,2020,0.20840000000
+7,cook,R1,2025,6,all-year,all-week,late-afternoon,gas_stove,2020,0.20840000000
+7,cook,R1,2030,0,all-year,all-week,late-afternoon,estove,2020,0.74430000000
+7,cook,R1,2030,1,all-year,all-week,late-afternoon,estove,2025,0.35720000000
+7,cook,R1,2030,2,all-year,all-week,late-afternoon,estove,2020,0.74430000000
+7,cook,R1,2030,3,all-year,all-week,late-afternoon,estove,2025,0.35720000000
+7,cook,R1,2030,5,all-year,all-week,late-afternoon,gas_stove,2025,0.08930000000
+7,cook,R1,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,0.08930000000
+7,cook,R2,2025,0,all-year,all-week,late-afternoon,estove,2020,0.74430000000
+7,cook,R2,2025,2,all-year,all-week,late-afternoon,estove,2020,0.74430000000
+7,cook,R2,2025,4,all-year,all-week,late-afternoon,gas_stove,2020,0.20840000000
+7,cook,R2,2025,6,all-year,all-week,late-afternoon,gas_stove,2020,0.20840000000
+7,cook,R2,2030,0,all-year,all-week,late-afternoon,estove,2020,0.74430000000
+7,cook,R2,2030,1,all-year,all-week,late-afternoon,estove,2025,0.35720000000
+7,cook,R2,2030,2,all-year,all-week,late-afternoon,estove,2020,0.74430000000
+7,cook,R2,2030,3,all-year,all-week,late-afternoon,estove,2025,0.35720000000
+7,cook,R2,2030,5,all-year,all-week,late-afternoon,gas_stove,2025,0.08930000000
+7,cook,R2,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,0.08930000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2030.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2030.csv
index 683124bd6..fac0c6379 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2030.csv
@@ -1,513 +1,513 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2030,8,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R1,2030,9,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R1,2030,10,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R1,2030,11,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R1,2030,13,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R1,2030,14,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R1,2035,8,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R1,2035,9,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R1,2035,11,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R1,2035,12,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R1,2035,14,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R1,2035,15,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R2,2030,8,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R2,2030,9,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R2,2030,10,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R2,2030,11,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R2,2030,13,heatpump,2020,all-year,all-week,night,0.37190000000
-0,heat,R2,2030,14,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R2,2035,8,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R2,2035,9,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R2,2035,11,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R2,2035,12,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R2,2035,14,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R2,2035,15,heatpump,2030,all-year,all-week,night,0.49090000000
-0,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,night,2.23120000000
-0,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,night,2.23120000000
-0,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,night,2.23120000000
-0,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,night,2.23120000000
-0,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,night,2.23120000000
-0,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,night,2.23120000000
-0,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,night,2.23120000000
-0,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,night,2.23120000000
-0,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,cook,R1,2030,0,estove,2020,all-year,all-week,night,0.37190000000
-0,cook,R1,2030,1,estove,2025,all-year,all-week,night,0.17850000000
-0,cook,R1,2030,3,estove,2020,all-year,all-week,night,0.37190000000
-0,cook,R1,2030,4,estove,2025,all-year,all-week,night,0.17850000000
-0,cook,R1,2030,6,gas_stove,2025,all-year,all-week,night,0.04460000000
-0,cook,R1,2030,7,gas_stove,2025,all-year,all-week,night,0.04460000000
-0,cook,R1,2035,1,estove,2025,all-year,all-week,night,0.17850000000
-0,cook,R1,2035,2,estove,2030,all-year,all-week,night,0.49090000000
-0,cook,R1,2035,4,estove,2025,all-year,all-week,night,0.17850000000
-0,cook,R1,2035,5,estove,2030,all-year,all-week,night,0.49090000000
-0,cook,R1,2035,6,gas_stove,2025,all-year,all-week,night,0.04460000000
-0,cook,R1,2035,7,gas_stove,2025,all-year,all-week,night,0.04460000000
-0,cook,R2,2030,0,estove,2020,all-year,all-week,night,0.37190000000
-0,cook,R2,2030,1,estove,2025,all-year,all-week,night,0.17850000000
-0,cook,R2,2030,3,estove,2020,all-year,all-week,night,0.37190000000
-0,cook,R2,2030,4,estove,2025,all-year,all-week,night,0.17850000000
-0,cook,R2,2030,6,gas_stove,2025,all-year,all-week,night,0.04460000000
-0,cook,R2,2030,7,gas_stove,2025,all-year,all-week,night,0.04460000000
-0,cook,R2,2035,1,estove,2025,all-year,all-week,night,0.17850000000
-0,cook,R2,2035,2,estove,2030,all-year,all-week,night,0.49090000000
-0,cook,R2,2035,4,estove,2025,all-year,all-week,night,0.17850000000
-0,cook,R2,2035,5,estove,2030,all-year,all-week,night,0.49090000000
-0,cook,R2,2035,6,gas_stove,2025,all-year,all-week,night,0.04460000000
-0,cook,R2,2035,7,gas_stove,2025,all-year,all-week,night,0.04460000000
-1,heat,R1,2030,8,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R1,2030,9,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R1,2030,10,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R1,2030,11,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R1,2030,13,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R1,2030,14,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R1,2035,8,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R1,2035,9,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R1,2035,11,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R1,2035,12,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R1,2035,14,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R1,2035,15,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R2,2030,8,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R2,2030,9,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R2,2030,10,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R2,2030,11,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R2,2030,13,heatpump,2020,all-year,all-week,morning,0.55780000000
-1,heat,R2,2030,14,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R2,2035,8,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R2,2035,9,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R2,2035,11,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R2,2035,12,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R2,2035,14,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R2,2035,15,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,morning,3.34680000000
-1,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,morning,3.34680000000
-1,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,morning,3.34680000000
-1,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,morning,3.34680000000
-1,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,morning,3.34680000000
-1,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,morning,3.34680000000
-1,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,morning,3.34680000000
-1,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,morning,3.34680000000
-1,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,cook,R1,2030,0,estove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R1,2030,1,estove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R1,2030,3,estove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R1,2030,4,estove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R1,2030,6,gas_stove,2025,all-year,all-week,morning,0.06690000000
-1,cook,R1,2030,7,gas_stove,2025,all-year,all-week,morning,0.06690000000
-1,cook,R1,2035,1,estove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R1,2035,2,estove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R1,2035,4,estove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R1,2035,5,estove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R1,2035,6,gas_stove,2025,all-year,all-week,morning,0.06690000000
-1,cook,R1,2035,7,gas_stove,2025,all-year,all-week,morning,0.06690000000
-1,cook,R2,2030,0,estove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R2,2030,1,estove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R2,2030,3,estove,2020,all-year,all-week,morning,0.55780000000
-1,cook,R2,2030,4,estove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R2,2030,6,gas_stove,2025,all-year,all-week,morning,0.06690000000
-1,cook,R2,2030,7,gas_stove,2025,all-year,all-week,morning,0.06690000000
-1,cook,R2,2035,1,estove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R2,2035,2,estove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R2,2035,4,estove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R2,2035,5,estove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R2,2035,6,gas_stove,2025,all-year,all-week,morning,0.06690000000
-1,cook,R2,2035,7,gas_stove,2025,all-year,all-week,morning,0.06690000000
-2,heat,R1,2030,8,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R1,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R1,2030,10,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R1,2030,11,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R1,2030,13,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R1,2030,14,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R1,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R1,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R1,2035,11,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R1,2035,12,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R1,2035,14,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R1,2035,15,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R2,2030,8,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R2,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R2,2030,10,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R2,2030,11,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R2,2030,13,heatpump,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,heat,R2,2030,14,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R2,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R2,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R2,2035,11,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R2,2035,12,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R2,2035,14,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R2,2035,15,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,mid-afternoon,2.23120000000
-2,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.23120000000
-2,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,2.23120000000
-2,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.23120000000
-2,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,mid-afternoon,2.23120000000
-2,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.23120000000
-2,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,2.23120000000
-2,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.23120000000
-2,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,cook,R1,2030,0,estove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R1,2030,1,estove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R1,2030,3,estove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R1,2030,4,estove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R1,2030,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,cook,R1,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,cook,R1,2035,1,estove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R1,2035,2,estove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R1,2035,4,estove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R1,2035,5,estove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R1,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,cook,R1,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,cook,R2,2030,0,estove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R2,2030,1,estove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R2,2030,3,estove,2020,all-year,all-week,mid-afternoon,0.37190000000
-2,cook,R2,2030,4,estove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R2,2030,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,cook,R2,2030,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,cook,R2,2035,1,estove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R2,2035,2,estove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R2,2035,4,estove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R2,2035,5,estove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R2,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,cook,R2,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04460000000
-3,heat,R1,2030,8,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R1,2030,9,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R1,2030,10,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R1,2030,11,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R1,2030,13,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R1,2030,14,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R1,2035,8,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R1,2035,9,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R1,2035,11,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R1,2035,12,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R1,2035,14,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R1,2035,15,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R2,2030,8,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R2,2030,9,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R2,2030,10,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R2,2030,11,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R2,2030,13,heatpump,2020,all-year,all-week,early-peak,0.55780000000
-3,heat,R2,2030,14,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R2,2035,8,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R2,2035,9,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R2,2035,11,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R2,2035,12,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R2,2035,14,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R2,2035,15,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,early-peak,3.34680000000
-3,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,early-peak,3.34680000000
-3,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,early-peak,3.34680000000
-3,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,early-peak,3.34680000000
-3,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,early-peak,3.34680000000
-3,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,early-peak,3.34680000000
-3,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,early-peak,3.34680000000
-3,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,early-peak,3.34680000000
-3,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,cook,R1,2030,0,estove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R1,2030,1,estove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R1,2030,3,estove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R1,2030,4,estove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R1,2030,6,gas_stove,2025,all-year,all-week,early-peak,0.06690000000
-3,cook,R1,2030,7,gas_stove,2025,all-year,all-week,early-peak,0.06690000000
-3,cook,R1,2035,1,estove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R1,2035,2,estove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R1,2035,4,estove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R1,2035,5,estove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R1,2035,6,gas_stove,2025,all-year,all-week,early-peak,0.06690000000
-3,cook,R1,2035,7,gas_stove,2025,all-year,all-week,early-peak,0.06690000000
-3,cook,R2,2030,0,estove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R2,2030,1,estove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R2,2030,3,estove,2020,all-year,all-week,early-peak,0.55780000000
-3,cook,R2,2030,4,estove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R2,2030,6,gas_stove,2025,all-year,all-week,early-peak,0.06690000000
-3,cook,R2,2030,7,gas_stove,2025,all-year,all-week,early-peak,0.06690000000
-3,cook,R2,2035,1,estove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R2,2035,2,estove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R2,2035,4,estove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R2,2035,5,estove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R2,2035,6,gas_stove,2025,all-year,all-week,early-peak,0.06690000000
-3,cook,R2,2035,7,gas_stove,2025,all-year,all-week,early-peak,0.06690000000
-4,heat,R1,2030,8,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R1,2030,9,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R1,2030,10,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R1,2030,11,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R1,2030,13,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R1,2030,14,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R1,2035,8,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R1,2035,9,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R1,2035,11,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R1,2035,12,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R1,2035,14,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R1,2035,15,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R2,2030,8,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R2,2030,9,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R2,2030,10,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R2,2030,11,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R2,2030,13,heatpump,2020,all-year,all-week,late-peak,1.11620000000
-4,heat,R2,2030,14,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R2,2035,8,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R2,2035,9,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R2,2035,11,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R2,2035,12,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R2,2035,14,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R2,2035,15,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,late-peak,6.69670000000
-4,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,late-peak,6.69670000000
-4,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,late-peak,6.69670000000
-4,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,late-peak,6.69670000000
-4,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,late-peak,6.69670000000
-4,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,late-peak,6.69670000000
-4,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,late-peak,6.69670000000
-4,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,late-peak,6.69670000000
-4,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,cook,R1,2030,0,estove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R1,2030,1,estove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R1,2030,3,estove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R1,2030,4,estove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R1,2030,6,gas_stove,2025,all-year,all-week,late-peak,0.13390000000
-4,cook,R1,2030,7,gas_stove,2025,all-year,all-week,late-peak,0.13390000000
-4,cook,R1,2035,1,estove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R1,2035,2,estove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R1,2035,4,estove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R1,2035,5,estove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R1,2035,6,gas_stove,2025,all-year,all-week,late-peak,0.13390000000
-4,cook,R1,2035,7,gas_stove,2025,all-year,all-week,late-peak,0.13390000000
-4,cook,R2,2030,0,estove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R2,2030,1,estove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R2,2030,3,estove,2020,all-year,all-week,late-peak,1.11620000000
-4,cook,R2,2030,4,estove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R2,2030,6,gas_stove,2025,all-year,all-week,late-peak,0.13390000000
-4,cook,R2,2030,7,gas_stove,2025,all-year,all-week,late-peak,0.13390000000
-4,cook,R2,2035,1,estove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R2,2035,2,estove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R2,2035,4,estove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R2,2035,5,estove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R2,2035,6,gas_stove,2025,all-year,all-week,late-peak,0.13390000000
-4,cook,R2,2035,7,gas_stove,2025,all-year,all-week,late-peak,0.13390000000
-5,heat,R1,2030,8,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R1,2030,9,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R1,2030,10,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R1,2030,11,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R1,2030,13,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R1,2030,14,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R1,2035,8,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R1,2035,9,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R1,2035,11,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R1,2035,12,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R1,2035,14,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R1,2035,15,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R2,2030,8,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R2,2030,9,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R2,2030,10,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R2,2030,11,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R2,2030,13,heatpump,2020,all-year,all-week,evening,0.74430000000
-5,heat,R2,2030,14,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R2,2035,8,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R2,2035,9,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R2,2035,11,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R2,2035,12,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R2,2035,14,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R2,2035,15,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,evening,4.46550000000
-5,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,evening,4.46550000000
-5,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,evening,4.46550000000
-5,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,evening,4.46550000000
-5,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,evening,4.46550000000
-5,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,evening,4.46550000000
-5,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,evening,4.46550000000
-5,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,evening,4.46550000000
-5,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,cook,R1,2030,0,estove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R1,2030,1,estove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R1,2030,3,estove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R1,2030,4,estove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R1,2030,6,gas_stove,2025,all-year,all-week,evening,0.08930000000
-5,cook,R1,2030,7,gas_stove,2025,all-year,all-week,evening,0.08930000000
-5,cook,R1,2035,1,estove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R1,2035,2,estove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R1,2035,4,estove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R1,2035,5,estove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R1,2035,6,gas_stove,2025,all-year,all-week,evening,0.08930000000
-5,cook,R1,2035,7,gas_stove,2025,all-year,all-week,evening,0.08930000000
-5,cook,R2,2030,0,estove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R2,2030,1,estove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R2,2030,3,estove,2020,all-year,all-week,evening,0.74430000000
-5,cook,R2,2030,4,estove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R2,2030,6,gas_stove,2025,all-year,all-week,evening,0.08930000000
-5,cook,R2,2030,7,gas_stove,2025,all-year,all-week,evening,0.08930000000
-5,cook,R2,2035,1,estove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R2,2035,2,estove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R2,2035,4,estove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R2,2035,5,estove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R2,2035,6,gas_stove,2025,all-year,all-week,evening,0.08930000000
-5,cook,R2,2035,7,gas_stove,2025,all-year,all-week,evening,0.08930000000
-6,heat,R1,2030,8,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R1,2030,9,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R1,2030,10,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R1,2030,11,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R1,2030,13,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R1,2030,14,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R1,2035,8,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R1,2035,9,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R1,2035,11,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R1,2035,12,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R1,2035,14,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R1,2035,15,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R2,2030,8,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R2,2030,9,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R2,2030,10,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R2,2030,11,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R2,2030,13,heatpump,2020,all-year,all-week,early-morning,0.74430000000
-6,heat,R2,2030,14,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R2,2035,8,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R2,2035,9,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R2,2035,11,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R2,2035,12,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R2,2035,14,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R2,2035,15,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,early-morning,4.46550000000
-6,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,early-morning,4.46550000000
-6,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,early-morning,4.46550000000
-6,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,early-morning,4.46550000000
-6,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,early-morning,4.46550000000
-6,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,early-morning,4.46550000000
-6,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,early-morning,4.46550000000
-6,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,early-morning,4.46550000000
-6,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,cook,R1,2030,0,estove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R1,2030,1,estove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R1,2030,3,estove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R1,2030,4,estove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R1,2030,6,gas_stove,2025,all-year,all-week,early-morning,0.08930000000
-6,cook,R1,2030,7,gas_stove,2025,all-year,all-week,early-morning,0.08930000000
-6,cook,R1,2035,1,estove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R1,2035,2,estove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R1,2035,4,estove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R1,2035,5,estove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R1,2035,6,gas_stove,2025,all-year,all-week,early-morning,0.08930000000
-6,cook,R1,2035,7,gas_stove,2025,all-year,all-week,early-morning,0.08930000000
-6,cook,R2,2030,0,estove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R2,2030,1,estove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R2,2030,3,estove,2020,all-year,all-week,early-morning,0.74430000000
-6,cook,R2,2030,4,estove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R2,2030,6,gas_stove,2025,all-year,all-week,early-morning,0.08930000000
-6,cook,R2,2030,7,gas_stove,2025,all-year,all-week,early-morning,0.08930000000
-6,cook,R2,2035,1,estove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R2,2035,2,estove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R2,2035,4,estove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R2,2035,5,estove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R2,2035,6,gas_stove,2025,all-year,all-week,early-morning,0.08930000000
-6,cook,R2,2035,7,gas_stove,2025,all-year,all-week,early-morning,0.08930000000
-7,heat,R1,2030,8,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R1,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R1,2030,10,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R1,2030,11,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R1,2030,13,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R1,2030,14,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R1,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R1,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R1,2035,11,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R1,2035,12,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R1,2035,14,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R1,2035,15,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R2,2030,8,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R2,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R2,2030,10,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R2,2030,11,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R2,2030,13,heatpump,2020,all-year,all-week,late-afternoon,0.74430000000
-7,heat,R2,2030,14,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R2,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R2,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R2,2035,11,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R2,2035,12,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R2,2035,14,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R2,2035,15,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,CO2f,R1,2030,6,gas_stove,2025,all-year,all-week,late-afternoon,4.46550000000
-7,CO2f,R1,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,4.46550000000
-7,CO2f,R1,2030,8,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R1,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,4.46550000000
-7,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,4.46550000000
-7,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R2,2030,6,gas_stove,2025,all-year,all-week,late-afternoon,4.46550000000
-7,CO2f,R2,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,4.46550000000
-7,CO2f,R2,2030,8,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R2,2030,9,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,4.46550000000
-7,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,4.46550000000
-7,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,cook,R1,2030,0,estove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R1,2030,1,estove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R1,2030,3,estove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R1,2030,4,estove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R1,2030,6,gas_stove,2025,all-year,all-week,late-afternoon,0.08930000000
-7,cook,R1,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08930000000
-7,cook,R1,2035,1,estove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R1,2035,2,estove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R1,2035,4,estove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R1,2035,5,estove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R1,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,0.08930000000
-7,cook,R1,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08930000000
-7,cook,R2,2030,0,estove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R2,2030,1,estove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R2,2030,3,estove,2020,all-year,all-week,late-afternoon,0.74430000000
-7,cook,R2,2030,4,estove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R2,2030,6,gas_stove,2025,all-year,all-week,late-afternoon,0.08930000000
-7,cook,R2,2030,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08930000000
-7,cook,R2,2035,1,estove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R2,2035,2,estove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R2,2035,4,estove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R2,2035,5,estove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R2,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,0.08930000000
-7,cook,R2,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08930000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2030,8,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R1,2030,9,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R1,2030,10,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R1,2030,11,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R1,2030,13,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R1,2030,14,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R1,2035,8,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R1,2035,9,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R1,2035,11,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R1,2035,12,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R1,2035,14,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R1,2035,15,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R2,2030,8,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R2,2030,9,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R2,2030,10,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R2,2030,11,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R2,2030,13,all-year,all-week,night,heatpump,2020,0.37190000000
+0,heat,R2,2030,14,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R2,2035,8,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R2,2035,9,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R2,2035,11,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R2,2035,12,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R2,2035,14,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R2,2035,15,all-year,all-week,night,heatpump,2030,0.49090000000
+0,CO2f,R1,2030,6,all-year,all-week,night,gas_stove,2025,2.23120000000
+0,CO2f,R1,2030,7,all-year,all-week,night,gas_stove,2025,2.23120000000
+0,CO2f,R1,2030,8,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R1,2030,9,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R1,2035,6,all-year,all-week,night,gas_stove,2025,2.23120000000
+0,CO2f,R1,2035,7,all-year,all-week,night,gas_stove,2025,2.23120000000
+0,CO2f,R1,2035,8,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R1,2035,9,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R2,2030,6,all-year,all-week,night,gas_stove,2025,2.23120000000
+0,CO2f,R2,2030,7,all-year,all-week,night,gas_stove,2025,2.23120000000
+0,CO2f,R2,2030,8,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R2,2030,9,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R2,2035,6,all-year,all-week,night,gas_stove,2025,2.23120000000
+0,CO2f,R2,2035,7,all-year,all-week,night,gas_stove,2025,2.23120000000
+0,CO2f,R2,2035,8,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R2,2035,9,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,cook,R1,2030,0,all-year,all-week,night,estove,2020,0.37190000000
+0,cook,R1,2030,1,all-year,all-week,night,estove,2025,0.17850000000
+0,cook,R1,2030,3,all-year,all-week,night,estove,2020,0.37190000000
+0,cook,R1,2030,4,all-year,all-week,night,estove,2025,0.17850000000
+0,cook,R1,2030,6,all-year,all-week,night,gas_stove,2025,0.04460000000
+0,cook,R1,2030,7,all-year,all-week,night,gas_stove,2025,0.04460000000
+0,cook,R1,2035,1,all-year,all-week,night,estove,2025,0.17850000000
+0,cook,R1,2035,2,all-year,all-week,night,estove,2030,0.49090000000
+0,cook,R1,2035,4,all-year,all-week,night,estove,2025,0.17850000000
+0,cook,R1,2035,5,all-year,all-week,night,estove,2030,0.49090000000
+0,cook,R1,2035,6,all-year,all-week,night,gas_stove,2025,0.04460000000
+0,cook,R1,2035,7,all-year,all-week,night,gas_stove,2025,0.04460000000
+0,cook,R2,2030,0,all-year,all-week,night,estove,2020,0.37190000000
+0,cook,R2,2030,1,all-year,all-week,night,estove,2025,0.17850000000
+0,cook,R2,2030,3,all-year,all-week,night,estove,2020,0.37190000000
+0,cook,R2,2030,4,all-year,all-week,night,estove,2025,0.17850000000
+0,cook,R2,2030,6,all-year,all-week,night,gas_stove,2025,0.04460000000
+0,cook,R2,2030,7,all-year,all-week,night,gas_stove,2025,0.04460000000
+0,cook,R2,2035,1,all-year,all-week,night,estove,2025,0.17850000000
+0,cook,R2,2035,2,all-year,all-week,night,estove,2030,0.49090000000
+0,cook,R2,2035,4,all-year,all-week,night,estove,2025,0.17850000000
+0,cook,R2,2035,5,all-year,all-week,night,estove,2030,0.49090000000
+0,cook,R2,2035,6,all-year,all-week,night,gas_stove,2025,0.04460000000
+0,cook,R2,2035,7,all-year,all-week,night,gas_stove,2025,0.04460000000
+1,heat,R1,2030,8,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R1,2030,9,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R1,2030,10,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R1,2030,11,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R1,2030,13,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R1,2030,14,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R1,2035,8,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R1,2035,9,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R1,2035,11,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R1,2035,12,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R1,2035,14,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R1,2035,15,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R2,2030,8,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R2,2030,9,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R2,2030,10,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R2,2030,11,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R2,2030,13,all-year,all-week,morning,heatpump,2020,0.55780000000
+1,heat,R2,2030,14,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R2,2035,8,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R2,2035,9,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R2,2035,11,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R2,2035,12,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R2,2035,14,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R2,2035,15,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,CO2f,R1,2030,6,all-year,all-week,morning,gas_stove,2025,3.34680000000
+1,CO2f,R1,2030,7,all-year,all-week,morning,gas_stove,2025,3.34680000000
+1,CO2f,R1,2030,8,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R1,2030,9,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R1,2035,6,all-year,all-week,morning,gas_stove,2025,3.34680000000
+1,CO2f,R1,2035,7,all-year,all-week,morning,gas_stove,2025,3.34680000000
+1,CO2f,R1,2035,8,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R1,2035,9,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R2,2030,6,all-year,all-week,morning,gas_stove,2025,3.34680000000
+1,CO2f,R2,2030,7,all-year,all-week,morning,gas_stove,2025,3.34680000000
+1,CO2f,R2,2030,8,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R2,2030,9,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R2,2035,6,all-year,all-week,morning,gas_stove,2025,3.34680000000
+1,CO2f,R2,2035,7,all-year,all-week,morning,gas_stove,2025,3.34680000000
+1,CO2f,R2,2035,8,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R2,2035,9,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,cook,R1,2030,0,all-year,all-week,morning,estove,2020,0.55780000000
+1,cook,R1,2030,1,all-year,all-week,morning,estove,2025,0.26770000000
+1,cook,R1,2030,3,all-year,all-week,morning,estove,2020,0.55780000000
+1,cook,R1,2030,4,all-year,all-week,morning,estove,2025,0.26770000000
+1,cook,R1,2030,6,all-year,all-week,morning,gas_stove,2025,0.06690000000
+1,cook,R1,2030,7,all-year,all-week,morning,gas_stove,2025,0.06690000000
+1,cook,R1,2035,1,all-year,all-week,morning,estove,2025,0.26770000000
+1,cook,R1,2035,2,all-year,all-week,morning,estove,2030,0.73630000000
+1,cook,R1,2035,4,all-year,all-week,morning,estove,2025,0.26770000000
+1,cook,R1,2035,5,all-year,all-week,morning,estove,2030,0.73630000000
+1,cook,R1,2035,6,all-year,all-week,morning,gas_stove,2025,0.06690000000
+1,cook,R1,2035,7,all-year,all-week,morning,gas_stove,2025,0.06690000000
+1,cook,R2,2030,0,all-year,all-week,morning,estove,2020,0.55780000000
+1,cook,R2,2030,1,all-year,all-week,morning,estove,2025,0.26770000000
+1,cook,R2,2030,3,all-year,all-week,morning,estove,2020,0.55780000000
+1,cook,R2,2030,4,all-year,all-week,morning,estove,2025,0.26770000000
+1,cook,R2,2030,6,all-year,all-week,morning,gas_stove,2025,0.06690000000
+1,cook,R2,2030,7,all-year,all-week,morning,gas_stove,2025,0.06690000000
+1,cook,R2,2035,1,all-year,all-week,morning,estove,2025,0.26770000000
+1,cook,R2,2035,2,all-year,all-week,morning,estove,2030,0.73630000000
+1,cook,R2,2035,4,all-year,all-week,morning,estove,2025,0.26770000000
+1,cook,R2,2035,5,all-year,all-week,morning,estove,2030,0.73630000000
+1,cook,R2,2035,6,all-year,all-week,morning,gas_stove,2025,0.06690000000
+1,cook,R2,2035,7,all-year,all-week,morning,gas_stove,2025,0.06690000000
+2,heat,R1,2030,8,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R1,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R1,2030,10,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R1,2030,11,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R1,2030,13,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R1,2030,14,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R1,2035,8,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R1,2035,9,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R1,2035,11,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R1,2035,12,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R1,2035,14,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R1,2035,15,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R2,2030,8,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R2,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R2,2030,10,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R2,2030,11,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R2,2030,13,all-year,all-week,mid-afternoon,heatpump,2020,0.37190000000
+2,heat,R2,2030,14,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R2,2035,8,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R2,2035,9,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R2,2035,11,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R2,2035,12,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R2,2035,14,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R2,2035,15,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,CO2f,R1,2030,6,all-year,all-week,mid-afternoon,gas_stove,2025,2.23120000000
+2,CO2f,R1,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,2.23120000000
+2,CO2f,R1,2030,8,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R1,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R1,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,2.23120000000
+2,CO2f,R1,2035,7,all-year,all-week,mid-afternoon,gas_stove,2025,2.23120000000
+2,CO2f,R1,2035,8,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R1,2035,9,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R2,2030,6,all-year,all-week,mid-afternoon,gas_stove,2025,2.23120000000
+2,CO2f,R2,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,2.23120000000
+2,CO2f,R2,2030,8,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R2,2030,9,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R2,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,2.23120000000
+2,CO2f,R2,2035,7,all-year,all-week,mid-afternoon,gas_stove,2025,2.23120000000
+2,CO2f,R2,2035,8,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R2,2035,9,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,cook,R1,2030,0,all-year,all-week,mid-afternoon,estove,2020,0.37190000000
+2,cook,R1,2030,1,all-year,all-week,mid-afternoon,estove,2025,0.17850000000
+2,cook,R1,2030,3,all-year,all-week,mid-afternoon,estove,2020,0.37190000000
+2,cook,R1,2030,4,all-year,all-week,mid-afternoon,estove,2025,0.17850000000
+2,cook,R1,2030,6,all-year,all-week,mid-afternoon,gas_stove,2025,0.04460000000
+2,cook,R1,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,0.04460000000
+2,cook,R1,2035,1,all-year,all-week,mid-afternoon,estove,2025,0.17850000000
+2,cook,R1,2035,2,all-year,all-week,mid-afternoon,estove,2030,0.49090000000
+2,cook,R1,2035,4,all-year,all-week,mid-afternoon,estove,2025,0.17850000000
+2,cook,R1,2035,5,all-year,all-week,mid-afternoon,estove,2030,0.49090000000
+2,cook,R1,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,0.04460000000
+2,cook,R1,2035,7,all-year,all-week,mid-afternoon,gas_stove,2025,0.04460000000
+2,cook,R2,2030,0,all-year,all-week,mid-afternoon,estove,2020,0.37190000000
+2,cook,R2,2030,1,all-year,all-week,mid-afternoon,estove,2025,0.17850000000
+2,cook,R2,2030,3,all-year,all-week,mid-afternoon,estove,2020,0.37190000000
+2,cook,R2,2030,4,all-year,all-week,mid-afternoon,estove,2025,0.17850000000
+2,cook,R2,2030,6,all-year,all-week,mid-afternoon,gas_stove,2025,0.04460000000
+2,cook,R2,2030,7,all-year,all-week,mid-afternoon,gas_stove,2025,0.04460000000
+2,cook,R2,2035,1,all-year,all-week,mid-afternoon,estove,2025,0.17850000000
+2,cook,R2,2035,2,all-year,all-week,mid-afternoon,estove,2030,0.49090000000
+2,cook,R2,2035,4,all-year,all-week,mid-afternoon,estove,2025,0.17850000000
+2,cook,R2,2035,5,all-year,all-week,mid-afternoon,estove,2030,0.49090000000
+2,cook,R2,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,0.04460000000
+2,cook,R2,2035,7,all-year,all-week,mid-afternoon,gas_stove,2025,0.04460000000
+3,heat,R1,2030,8,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R1,2030,9,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R1,2030,10,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R1,2030,11,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R1,2030,13,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R1,2030,14,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R1,2035,8,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R1,2035,9,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R1,2035,11,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R1,2035,12,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R1,2035,14,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R1,2035,15,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R2,2030,8,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R2,2030,9,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R2,2030,10,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R2,2030,11,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R2,2030,13,all-year,all-week,early-peak,heatpump,2020,0.55780000000
+3,heat,R2,2030,14,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R2,2035,8,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R2,2035,9,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R2,2035,11,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R2,2035,12,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R2,2035,14,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R2,2035,15,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,CO2f,R1,2030,6,all-year,all-week,early-peak,gas_stove,2025,3.34680000000
+3,CO2f,R1,2030,7,all-year,all-week,early-peak,gas_stove,2025,3.34680000000
+3,CO2f,R1,2030,8,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R1,2030,9,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R1,2035,6,all-year,all-week,early-peak,gas_stove,2025,3.34680000000
+3,CO2f,R1,2035,7,all-year,all-week,early-peak,gas_stove,2025,3.34680000000
+3,CO2f,R1,2035,8,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R1,2035,9,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R2,2030,6,all-year,all-week,early-peak,gas_stove,2025,3.34680000000
+3,CO2f,R2,2030,7,all-year,all-week,early-peak,gas_stove,2025,3.34680000000
+3,CO2f,R2,2030,8,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R2,2030,9,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R2,2035,6,all-year,all-week,early-peak,gas_stove,2025,3.34680000000
+3,CO2f,R2,2035,7,all-year,all-week,early-peak,gas_stove,2025,3.34680000000
+3,CO2f,R2,2035,8,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R2,2035,9,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,cook,R1,2030,0,all-year,all-week,early-peak,estove,2020,0.55780000000
+3,cook,R1,2030,1,all-year,all-week,early-peak,estove,2025,0.26770000000
+3,cook,R1,2030,3,all-year,all-week,early-peak,estove,2020,0.55780000000
+3,cook,R1,2030,4,all-year,all-week,early-peak,estove,2025,0.26770000000
+3,cook,R1,2030,6,all-year,all-week,early-peak,gas_stove,2025,0.06690000000
+3,cook,R1,2030,7,all-year,all-week,early-peak,gas_stove,2025,0.06690000000
+3,cook,R1,2035,1,all-year,all-week,early-peak,estove,2025,0.26770000000
+3,cook,R1,2035,2,all-year,all-week,early-peak,estove,2030,0.73630000000
+3,cook,R1,2035,4,all-year,all-week,early-peak,estove,2025,0.26770000000
+3,cook,R1,2035,5,all-year,all-week,early-peak,estove,2030,0.73630000000
+3,cook,R1,2035,6,all-year,all-week,early-peak,gas_stove,2025,0.06690000000
+3,cook,R1,2035,7,all-year,all-week,early-peak,gas_stove,2025,0.06690000000
+3,cook,R2,2030,0,all-year,all-week,early-peak,estove,2020,0.55780000000
+3,cook,R2,2030,1,all-year,all-week,early-peak,estove,2025,0.26770000000
+3,cook,R2,2030,3,all-year,all-week,early-peak,estove,2020,0.55780000000
+3,cook,R2,2030,4,all-year,all-week,early-peak,estove,2025,0.26770000000
+3,cook,R2,2030,6,all-year,all-week,early-peak,gas_stove,2025,0.06690000000
+3,cook,R2,2030,7,all-year,all-week,early-peak,gas_stove,2025,0.06690000000
+3,cook,R2,2035,1,all-year,all-week,early-peak,estove,2025,0.26770000000
+3,cook,R2,2035,2,all-year,all-week,early-peak,estove,2030,0.73630000000
+3,cook,R2,2035,4,all-year,all-week,early-peak,estove,2025,0.26770000000
+3,cook,R2,2035,5,all-year,all-week,early-peak,estove,2030,0.73630000000
+3,cook,R2,2035,6,all-year,all-week,early-peak,gas_stove,2025,0.06690000000
+3,cook,R2,2035,7,all-year,all-week,early-peak,gas_stove,2025,0.06690000000
+4,heat,R1,2030,8,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R1,2030,9,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R1,2030,10,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R1,2030,11,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R1,2030,13,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R1,2030,14,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R1,2035,8,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R1,2035,9,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R1,2035,11,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R1,2035,12,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R1,2035,14,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R1,2035,15,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R2,2030,8,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R2,2030,9,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R2,2030,10,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R2,2030,11,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R2,2030,13,all-year,all-week,late-peak,heatpump,2020,1.11620000000
+4,heat,R2,2030,14,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R2,2035,8,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R2,2035,9,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R2,2035,11,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R2,2035,12,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R2,2035,14,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R2,2035,15,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,CO2f,R1,2030,6,all-year,all-week,late-peak,gas_stove,2025,6.69670000000
+4,CO2f,R1,2030,7,all-year,all-week,late-peak,gas_stove,2025,6.69670000000
+4,CO2f,R1,2030,8,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R1,2030,9,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R1,2035,6,all-year,all-week,late-peak,gas_stove,2025,6.69670000000
+4,CO2f,R1,2035,7,all-year,all-week,late-peak,gas_stove,2025,6.69670000000
+4,CO2f,R1,2035,8,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R1,2035,9,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R2,2030,6,all-year,all-week,late-peak,gas_stove,2025,6.69670000000
+4,CO2f,R2,2030,7,all-year,all-week,late-peak,gas_stove,2025,6.69670000000
+4,CO2f,R2,2030,8,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R2,2030,9,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R2,2035,6,all-year,all-week,late-peak,gas_stove,2025,6.69670000000
+4,CO2f,R2,2035,7,all-year,all-week,late-peak,gas_stove,2025,6.69670000000
+4,CO2f,R2,2035,8,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R2,2035,9,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,cook,R1,2030,0,all-year,all-week,late-peak,estove,2020,1.11620000000
+4,cook,R1,2030,1,all-year,all-week,late-peak,estove,2025,0.53570000000
+4,cook,R1,2030,3,all-year,all-week,late-peak,estove,2020,1.11620000000
+4,cook,R1,2030,4,all-year,all-week,late-peak,estove,2025,0.53570000000
+4,cook,R1,2030,6,all-year,all-week,late-peak,gas_stove,2025,0.13390000000
+4,cook,R1,2030,7,all-year,all-week,late-peak,gas_stove,2025,0.13390000000
+4,cook,R1,2035,1,all-year,all-week,late-peak,estove,2025,0.53570000000
+4,cook,R1,2035,2,all-year,all-week,late-peak,estove,2030,1.47330000000
+4,cook,R1,2035,4,all-year,all-week,late-peak,estove,2025,0.53570000000
+4,cook,R1,2035,5,all-year,all-week,late-peak,estove,2030,1.47330000000
+4,cook,R1,2035,6,all-year,all-week,late-peak,gas_stove,2025,0.13390000000
+4,cook,R1,2035,7,all-year,all-week,late-peak,gas_stove,2025,0.13390000000
+4,cook,R2,2030,0,all-year,all-week,late-peak,estove,2020,1.11620000000
+4,cook,R2,2030,1,all-year,all-week,late-peak,estove,2025,0.53570000000
+4,cook,R2,2030,3,all-year,all-week,late-peak,estove,2020,1.11620000000
+4,cook,R2,2030,4,all-year,all-week,late-peak,estove,2025,0.53570000000
+4,cook,R2,2030,6,all-year,all-week,late-peak,gas_stove,2025,0.13390000000
+4,cook,R2,2030,7,all-year,all-week,late-peak,gas_stove,2025,0.13390000000
+4,cook,R2,2035,1,all-year,all-week,late-peak,estove,2025,0.53570000000
+4,cook,R2,2035,2,all-year,all-week,late-peak,estove,2030,1.47330000000
+4,cook,R2,2035,4,all-year,all-week,late-peak,estove,2025,0.53570000000
+4,cook,R2,2035,5,all-year,all-week,late-peak,estove,2030,1.47330000000
+4,cook,R2,2035,6,all-year,all-week,late-peak,gas_stove,2025,0.13390000000
+4,cook,R2,2035,7,all-year,all-week,late-peak,gas_stove,2025,0.13390000000
+5,heat,R1,2030,8,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R1,2030,9,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R1,2030,10,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R1,2030,11,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R1,2030,13,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R1,2030,14,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R1,2035,8,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R1,2035,9,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R1,2035,11,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R1,2035,12,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R1,2035,14,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R1,2035,15,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R2,2030,8,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R2,2030,9,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R2,2030,10,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R2,2030,11,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R2,2030,13,all-year,all-week,evening,heatpump,2020,0.74430000000
+5,heat,R2,2030,14,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R2,2035,8,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R2,2035,9,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R2,2035,11,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R2,2035,12,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R2,2035,14,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R2,2035,15,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,CO2f,R1,2030,6,all-year,all-week,evening,gas_stove,2025,4.46550000000
+5,CO2f,R1,2030,7,all-year,all-week,evening,gas_stove,2025,4.46550000000
+5,CO2f,R1,2030,8,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R1,2030,9,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R1,2035,6,all-year,all-week,evening,gas_stove,2025,4.46550000000
+5,CO2f,R1,2035,7,all-year,all-week,evening,gas_stove,2025,4.46550000000
+5,CO2f,R1,2035,8,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R1,2035,9,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R2,2030,6,all-year,all-week,evening,gas_stove,2025,4.46550000000
+5,CO2f,R2,2030,7,all-year,all-week,evening,gas_stove,2025,4.46550000000
+5,CO2f,R2,2030,8,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R2,2030,9,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R2,2035,6,all-year,all-week,evening,gas_stove,2025,4.46550000000
+5,CO2f,R2,2035,7,all-year,all-week,evening,gas_stove,2025,4.46550000000
+5,CO2f,R2,2035,8,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R2,2035,9,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,cook,R1,2030,0,all-year,all-week,evening,estove,2020,0.74430000000
+5,cook,R1,2030,1,all-year,all-week,evening,estove,2025,0.35720000000
+5,cook,R1,2030,3,all-year,all-week,evening,estove,2020,0.74430000000
+5,cook,R1,2030,4,all-year,all-week,evening,estove,2025,0.35720000000
+5,cook,R1,2030,6,all-year,all-week,evening,gas_stove,2025,0.08930000000
+5,cook,R1,2030,7,all-year,all-week,evening,gas_stove,2025,0.08930000000
+5,cook,R1,2035,1,all-year,all-week,evening,estove,2025,0.35720000000
+5,cook,R1,2035,2,all-year,all-week,evening,estove,2030,0.98250000000
+5,cook,R1,2035,4,all-year,all-week,evening,estove,2025,0.35720000000
+5,cook,R1,2035,5,all-year,all-week,evening,estove,2030,0.98250000000
+5,cook,R1,2035,6,all-year,all-week,evening,gas_stove,2025,0.08930000000
+5,cook,R1,2035,7,all-year,all-week,evening,gas_stove,2025,0.08930000000
+5,cook,R2,2030,0,all-year,all-week,evening,estove,2020,0.74430000000
+5,cook,R2,2030,1,all-year,all-week,evening,estove,2025,0.35720000000
+5,cook,R2,2030,3,all-year,all-week,evening,estove,2020,0.74430000000
+5,cook,R2,2030,4,all-year,all-week,evening,estove,2025,0.35720000000
+5,cook,R2,2030,6,all-year,all-week,evening,gas_stove,2025,0.08930000000
+5,cook,R2,2030,7,all-year,all-week,evening,gas_stove,2025,0.08930000000
+5,cook,R2,2035,1,all-year,all-week,evening,estove,2025,0.35720000000
+5,cook,R2,2035,2,all-year,all-week,evening,estove,2030,0.98250000000
+5,cook,R2,2035,4,all-year,all-week,evening,estove,2025,0.35720000000
+5,cook,R2,2035,5,all-year,all-week,evening,estove,2030,0.98250000000
+5,cook,R2,2035,6,all-year,all-week,evening,gas_stove,2025,0.08930000000
+5,cook,R2,2035,7,all-year,all-week,evening,gas_stove,2025,0.08930000000
+6,heat,R1,2030,8,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R1,2030,9,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R1,2030,10,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R1,2030,11,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R1,2030,13,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R1,2030,14,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R1,2035,8,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R1,2035,9,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R1,2035,11,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R1,2035,12,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R1,2035,14,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R1,2035,15,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R2,2030,8,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R2,2030,9,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R2,2030,10,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R2,2030,11,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R2,2030,13,all-year,all-week,early-morning,heatpump,2020,0.74430000000
+6,heat,R2,2030,14,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R2,2035,8,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R2,2035,9,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R2,2035,11,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R2,2035,12,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R2,2035,14,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R2,2035,15,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,CO2f,R1,2030,6,all-year,all-week,early-morning,gas_stove,2025,4.46550000000
+6,CO2f,R1,2030,7,all-year,all-week,early-morning,gas_stove,2025,4.46550000000
+6,CO2f,R1,2030,8,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R1,2030,9,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R1,2035,6,all-year,all-week,early-morning,gas_stove,2025,4.46550000000
+6,CO2f,R1,2035,7,all-year,all-week,early-morning,gas_stove,2025,4.46550000000
+6,CO2f,R1,2035,8,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R1,2035,9,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R2,2030,6,all-year,all-week,early-morning,gas_stove,2025,4.46550000000
+6,CO2f,R2,2030,7,all-year,all-week,early-morning,gas_stove,2025,4.46550000000
+6,CO2f,R2,2030,8,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R2,2030,9,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R2,2035,6,all-year,all-week,early-morning,gas_stove,2025,4.46550000000
+6,CO2f,R2,2035,7,all-year,all-week,early-morning,gas_stove,2025,4.46550000000
+6,CO2f,R2,2035,8,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R2,2035,9,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,cook,R1,2030,0,all-year,all-week,early-morning,estove,2020,0.74430000000
+6,cook,R1,2030,1,all-year,all-week,early-morning,estove,2025,0.35720000000
+6,cook,R1,2030,3,all-year,all-week,early-morning,estove,2020,0.74430000000
+6,cook,R1,2030,4,all-year,all-week,early-morning,estove,2025,0.35720000000
+6,cook,R1,2030,6,all-year,all-week,early-morning,gas_stove,2025,0.08930000000
+6,cook,R1,2030,7,all-year,all-week,early-morning,gas_stove,2025,0.08930000000
+6,cook,R1,2035,1,all-year,all-week,early-morning,estove,2025,0.35720000000
+6,cook,R1,2035,2,all-year,all-week,early-morning,estove,2030,0.98250000000
+6,cook,R1,2035,4,all-year,all-week,early-morning,estove,2025,0.35720000000
+6,cook,R1,2035,5,all-year,all-week,early-morning,estove,2030,0.98250000000
+6,cook,R1,2035,6,all-year,all-week,early-morning,gas_stove,2025,0.08930000000
+6,cook,R1,2035,7,all-year,all-week,early-morning,gas_stove,2025,0.08930000000
+6,cook,R2,2030,0,all-year,all-week,early-morning,estove,2020,0.74430000000
+6,cook,R2,2030,1,all-year,all-week,early-morning,estove,2025,0.35720000000
+6,cook,R2,2030,3,all-year,all-week,early-morning,estove,2020,0.74430000000
+6,cook,R2,2030,4,all-year,all-week,early-morning,estove,2025,0.35720000000
+6,cook,R2,2030,6,all-year,all-week,early-morning,gas_stove,2025,0.08930000000
+6,cook,R2,2030,7,all-year,all-week,early-morning,gas_stove,2025,0.08930000000
+6,cook,R2,2035,1,all-year,all-week,early-morning,estove,2025,0.35720000000
+6,cook,R2,2035,2,all-year,all-week,early-morning,estove,2030,0.98250000000
+6,cook,R2,2035,4,all-year,all-week,early-morning,estove,2025,0.35720000000
+6,cook,R2,2035,5,all-year,all-week,early-morning,estove,2030,0.98250000000
+6,cook,R2,2035,6,all-year,all-week,early-morning,gas_stove,2025,0.08930000000
+6,cook,R2,2035,7,all-year,all-week,early-morning,gas_stove,2025,0.08930000000
+7,heat,R1,2030,8,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R1,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R1,2030,10,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R1,2030,11,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R1,2030,13,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R1,2030,14,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R1,2035,8,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R1,2035,9,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R1,2035,11,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R1,2035,12,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R1,2035,14,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R1,2035,15,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R2,2030,8,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R2,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R2,2030,10,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R2,2030,11,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R2,2030,13,all-year,all-week,late-afternoon,heatpump,2020,0.74430000000
+7,heat,R2,2030,14,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R2,2035,8,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R2,2035,9,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R2,2035,11,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R2,2035,12,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R2,2035,14,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R2,2035,15,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,CO2f,R1,2030,6,all-year,all-week,late-afternoon,gas_stove,2025,4.46550000000
+7,CO2f,R1,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,4.46550000000
+7,CO2f,R1,2030,8,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R1,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R1,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,4.46550000000
+7,CO2f,R1,2035,7,all-year,all-week,late-afternoon,gas_stove,2025,4.46550000000
+7,CO2f,R1,2035,8,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R1,2035,9,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R2,2030,6,all-year,all-week,late-afternoon,gas_stove,2025,4.46550000000
+7,CO2f,R2,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,4.46550000000
+7,CO2f,R2,2030,8,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R2,2030,9,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R2,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,4.46550000000
+7,CO2f,R2,2035,7,all-year,all-week,late-afternoon,gas_stove,2025,4.46550000000
+7,CO2f,R2,2035,8,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R2,2035,9,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,cook,R1,2030,0,all-year,all-week,late-afternoon,estove,2020,0.74430000000
+7,cook,R1,2030,1,all-year,all-week,late-afternoon,estove,2025,0.35720000000
+7,cook,R1,2030,3,all-year,all-week,late-afternoon,estove,2020,0.74430000000
+7,cook,R1,2030,4,all-year,all-week,late-afternoon,estove,2025,0.35720000000
+7,cook,R1,2030,6,all-year,all-week,late-afternoon,gas_stove,2025,0.08930000000
+7,cook,R1,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,0.08930000000
+7,cook,R1,2035,1,all-year,all-week,late-afternoon,estove,2025,0.35720000000
+7,cook,R1,2035,2,all-year,all-week,late-afternoon,estove,2030,0.98250000000
+7,cook,R1,2035,4,all-year,all-week,late-afternoon,estove,2025,0.35720000000
+7,cook,R1,2035,5,all-year,all-week,late-afternoon,estove,2030,0.98250000000
+7,cook,R1,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,0.08930000000
+7,cook,R1,2035,7,all-year,all-week,late-afternoon,gas_stove,2025,0.08930000000
+7,cook,R2,2030,0,all-year,all-week,late-afternoon,estove,2020,0.74430000000
+7,cook,R2,2030,1,all-year,all-week,late-afternoon,estove,2025,0.35720000000
+7,cook,R2,2030,3,all-year,all-week,late-afternoon,estove,2020,0.74430000000
+7,cook,R2,2030,4,all-year,all-week,late-afternoon,estove,2025,0.35720000000
+7,cook,R2,2030,6,all-year,all-week,late-afternoon,gas_stove,2025,0.08930000000
+7,cook,R2,2030,7,all-year,all-week,late-afternoon,gas_stove,2025,0.08930000000
+7,cook,R2,2035,1,all-year,all-week,late-afternoon,estove,2025,0.35720000000
+7,cook,R2,2035,2,all-year,all-week,late-afternoon,estove,2030,0.98250000000
+7,cook,R2,2035,4,all-year,all-week,late-afternoon,estove,2025,0.35720000000
+7,cook,R2,2035,5,all-year,all-week,late-afternoon,estove,2030,0.98250000000
+7,cook,R2,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,0.08930000000
+7,cook,R2,2035,7,all-year,all-week,late-afternoon,gas_stove,2025,0.08930000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2035.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2035.csv
index b2e9f5556..bd809a20d 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2035.csv
@@ -1,385 +1,385 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2035,8,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R1,2035,9,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R1,2035,10,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R1,2035,11,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R1,2035,13,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R1,2035,14,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R1,2040,11,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R1,2040,12,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R1,2040,14,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R1,2040,15,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R2,2035,8,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R2,2035,9,gasboiler,2025,all-year,all-week,night,0.04460000000
-0,heat,R2,2035,10,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R2,2035,11,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R2,2035,13,heatpump,2025,all-year,all-week,night,0.17850000000
-0,heat,R2,2035,14,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R2,2040,11,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R2,2040,12,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R2,2040,14,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R2,2040,15,heatpump,2035,all-year,all-week,night,0.34210000000
-0,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,night,2.23120000000
-0,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,night,2.23120000000
-0,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,night,2.23120000000
-0,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,night,2.23120000000
-0,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,night,2.88760000000
-0,cook,R1,2035,0,estove,2025,all-year,all-week,night,0.17850000000
-0,cook,R1,2035,1,estove,2030,all-year,all-week,night,0.49090000000
-0,cook,R1,2035,3,estove,2025,all-year,all-week,night,0.17850000000
-0,cook,R1,2035,4,estove,2030,all-year,all-week,night,0.49090000000
-0,cook,R1,2035,6,gas_stove,2025,all-year,all-week,night,0.04460000000
-0,cook,R1,2035,7,gas_stove,2025,all-year,all-week,night,0.04460000000
-0,cook,R1,2040,1,estove,2030,all-year,all-week,night,0.49090000000
-0,cook,R1,2040,2,estove,2035,all-year,all-week,night,0.34210000000
-0,cook,R1,2040,4,estove,2030,all-year,all-week,night,0.49090000000
-0,cook,R1,2040,5,estove,2035,all-year,all-week,night,0.34210000000
-0,cook,R2,2035,0,estove,2025,all-year,all-week,night,0.17850000000
-0,cook,R2,2035,1,estove,2030,all-year,all-week,night,0.49090000000
-0,cook,R2,2035,3,estove,2025,all-year,all-week,night,0.17850000000
-0,cook,R2,2035,4,estove,2030,all-year,all-week,night,0.49090000000
-0,cook,R2,2035,6,gas_stove,2025,all-year,all-week,night,0.04460000000
-0,cook,R2,2035,7,gas_stove,2025,all-year,all-week,night,0.04460000000
-0,cook,R2,2040,1,estove,2030,all-year,all-week,night,0.49090000000
-0,cook,R2,2040,2,estove,2035,all-year,all-week,night,0.34210000000
-0,cook,R2,2040,4,estove,2030,all-year,all-week,night,0.49090000000
-0,cook,R2,2040,5,estove,2035,all-year,all-week,night,0.34210000000
-1,heat,R1,2035,8,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R1,2035,9,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R1,2035,10,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R1,2035,11,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R1,2035,13,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R1,2035,14,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R1,2040,11,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R1,2040,12,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R1,2040,14,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R1,2040,15,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R2,2035,8,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R2,2035,9,gasboiler,2025,all-year,all-week,morning,0.06690000000
-1,heat,R2,2035,10,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R2,2035,11,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R2,2035,13,heatpump,2025,all-year,all-week,morning,0.26770000000
-1,heat,R2,2035,14,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R2,2040,11,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R2,2040,12,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R2,2040,14,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R2,2040,15,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,morning,3.34680000000
-1,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,morning,3.34680000000
-1,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,morning,3.34680000000
-1,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,morning,3.34680000000
-1,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,morning,4.33140000000
-1,cook,R1,2035,0,estove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R1,2035,1,estove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R1,2035,3,estove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R1,2035,4,estove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R1,2035,6,gas_stove,2025,all-year,all-week,morning,0.06690000000
-1,cook,R1,2035,7,gas_stove,2025,all-year,all-week,morning,0.06690000000
-1,cook,R1,2040,1,estove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R1,2040,2,estove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R1,2040,4,estove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R1,2040,5,estove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R2,2035,0,estove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R2,2035,1,estove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R2,2035,3,estove,2025,all-year,all-week,morning,0.26770000000
-1,cook,R2,2035,4,estove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R2,2035,6,gas_stove,2025,all-year,all-week,morning,0.06690000000
-1,cook,R2,2035,7,gas_stove,2025,all-year,all-week,morning,0.06690000000
-1,cook,R2,2040,1,estove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R2,2040,2,estove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R2,2040,4,estove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R2,2040,5,estove,2035,all-year,all-week,morning,0.51320000000
-2,heat,R1,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R1,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R1,2035,10,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R1,2035,11,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R1,2035,13,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R1,2035,14,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R1,2040,11,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R1,2040,12,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R1,2040,14,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R1,2040,15,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R2,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R2,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,heat,R2,2035,10,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R2,2035,11,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R2,2035,13,heatpump,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,heat,R2,2035,14,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R2,2040,11,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R2,2040,12,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R2,2040,14,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R2,2040,15,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,2.23120000000
-2,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.23120000000
-2,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,2.23120000000
-2,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,2.23120000000
-2,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,mid-afternoon,2.88760000000
-2,cook,R1,2035,0,estove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R1,2035,1,estove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R1,2035,3,estove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R1,2035,4,estove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R1,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,cook,R1,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,cook,R1,2040,1,estove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R1,2040,2,estove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R1,2040,4,estove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R1,2040,5,estove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R2,2035,0,estove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R2,2035,1,estove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R2,2035,3,estove,2025,all-year,all-week,mid-afternoon,0.17850000000
-2,cook,R2,2035,4,estove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R2,2035,6,gas_stove,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,cook,R2,2035,7,gas_stove,2025,all-year,all-week,mid-afternoon,0.04460000000
-2,cook,R2,2040,1,estove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R2,2040,2,estove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R2,2040,4,estove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R2,2040,5,estove,2035,all-year,all-week,mid-afternoon,0.34210000000
-3,heat,R1,2035,8,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R1,2035,9,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R1,2035,10,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R1,2035,11,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R1,2035,13,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R1,2035,14,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R1,2040,11,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R1,2040,12,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R1,2040,14,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R1,2040,15,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R2,2035,8,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R2,2035,9,gasboiler,2025,all-year,all-week,early-peak,0.06690000000
-3,heat,R2,2035,10,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R2,2035,11,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R2,2035,13,heatpump,2025,all-year,all-week,early-peak,0.26770000000
-3,heat,R2,2035,14,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R2,2040,11,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R2,2040,12,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R2,2040,14,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R2,2040,15,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,early-peak,3.34680000000
-3,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,early-peak,3.34680000000
-3,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,early-peak,3.34680000000
-3,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,early-peak,3.34680000000
-3,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,early-peak,4.33140000000
-3,cook,R1,2035,0,estove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R1,2035,1,estove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R1,2035,3,estove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R1,2035,4,estove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R1,2035,6,gas_stove,2025,all-year,all-week,early-peak,0.06690000000
-3,cook,R1,2035,7,gas_stove,2025,all-year,all-week,early-peak,0.06690000000
-3,cook,R1,2040,1,estove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R1,2040,2,estove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R1,2040,4,estove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R1,2040,5,estove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R2,2035,0,estove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R2,2035,1,estove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R2,2035,3,estove,2025,all-year,all-week,early-peak,0.26770000000
-3,cook,R2,2035,4,estove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R2,2035,6,gas_stove,2025,all-year,all-week,early-peak,0.06690000000
-3,cook,R2,2035,7,gas_stove,2025,all-year,all-week,early-peak,0.06690000000
-3,cook,R2,2040,1,estove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R2,2040,2,estove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R2,2040,4,estove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R2,2040,5,estove,2035,all-year,all-week,early-peak,0.51320000000
-4,heat,R1,2035,8,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R1,2035,9,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R1,2035,10,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R1,2035,11,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R1,2035,13,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R1,2035,14,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R1,2040,11,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R1,2040,12,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R1,2040,14,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R1,2040,15,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R2,2035,8,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R2,2035,9,gasboiler,2025,all-year,all-week,late-peak,0.13390000000
-4,heat,R2,2035,10,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R2,2035,11,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R2,2035,13,heatpump,2025,all-year,all-week,late-peak,0.53570000000
-4,heat,R2,2035,14,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R2,2040,11,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R2,2040,12,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R2,2040,14,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R2,2040,15,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,late-peak,6.69670000000
-4,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,late-peak,6.69670000000
-4,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,late-peak,6.69670000000
-4,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,late-peak,6.69670000000
-4,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,late-peak,8.66680000000
-4,cook,R1,2035,0,estove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R1,2035,1,estove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R1,2035,3,estove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R1,2035,4,estove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R1,2035,6,gas_stove,2025,all-year,all-week,late-peak,0.13390000000
-4,cook,R1,2035,7,gas_stove,2025,all-year,all-week,late-peak,0.13390000000
-4,cook,R1,2040,1,estove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R1,2040,2,estove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R1,2040,4,estove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R1,2040,5,estove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R2,2035,0,estove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R2,2035,1,estove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R2,2035,3,estove,2025,all-year,all-week,late-peak,0.53570000000
-4,cook,R2,2035,4,estove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R2,2035,6,gas_stove,2025,all-year,all-week,late-peak,0.13390000000
-4,cook,R2,2035,7,gas_stove,2025,all-year,all-week,late-peak,0.13390000000
-4,cook,R2,2040,1,estove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R2,2040,2,estove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R2,2040,4,estove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R2,2040,5,estove,2035,all-year,all-week,late-peak,1.02680000000
-5,heat,R1,2035,8,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R1,2035,9,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R1,2035,10,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R1,2035,11,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R1,2035,13,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R1,2035,14,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R1,2040,11,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R1,2040,12,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R1,2040,14,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R1,2040,15,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R2,2035,8,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R2,2035,9,gasboiler,2025,all-year,all-week,evening,0.08930000000
-5,heat,R2,2035,10,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R2,2035,11,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R2,2035,13,heatpump,2025,all-year,all-week,evening,0.35720000000
-5,heat,R2,2035,14,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R2,2040,11,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R2,2040,12,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R2,2040,14,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R2,2040,15,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,evening,4.46550000000
-5,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,evening,4.46550000000
-5,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,evening,4.46550000000
-5,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,evening,4.46550000000
-5,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,evening,5.77920000000
-5,cook,R1,2035,0,estove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R1,2035,1,estove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R1,2035,3,estove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R1,2035,4,estove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R1,2035,6,gas_stove,2025,all-year,all-week,evening,0.08930000000
-5,cook,R1,2035,7,gas_stove,2025,all-year,all-week,evening,0.08930000000
-5,cook,R1,2040,1,estove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R1,2040,2,estove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R1,2040,4,estove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R1,2040,5,estove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R2,2035,0,estove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R2,2035,1,estove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R2,2035,3,estove,2025,all-year,all-week,evening,0.35720000000
-5,cook,R2,2035,4,estove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R2,2035,6,gas_stove,2025,all-year,all-week,evening,0.08930000000
-5,cook,R2,2035,7,gas_stove,2025,all-year,all-week,evening,0.08930000000
-5,cook,R2,2040,1,estove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R2,2040,2,estove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R2,2040,4,estove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R2,2040,5,estove,2035,all-year,all-week,evening,0.68470000000
-6,heat,R1,2035,8,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R1,2035,9,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R1,2035,10,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R1,2035,11,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R1,2035,13,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R1,2035,14,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R1,2040,11,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R1,2040,12,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R1,2040,14,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R1,2040,15,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R2,2035,8,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R2,2035,9,gasboiler,2025,all-year,all-week,early-morning,0.08930000000
-6,heat,R2,2035,10,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R2,2035,11,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R2,2035,13,heatpump,2025,all-year,all-week,early-morning,0.35720000000
-6,heat,R2,2035,14,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R2,2040,11,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R2,2040,12,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R2,2040,14,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R2,2040,15,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,early-morning,4.46550000000
-6,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,early-morning,4.46550000000
-6,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,early-morning,4.46550000000
-6,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,early-morning,4.46550000000
-6,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,early-morning,5.77920000000
-6,cook,R1,2035,0,estove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R1,2035,1,estove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R1,2035,3,estove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R1,2035,4,estove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R1,2035,6,gas_stove,2025,all-year,all-week,early-morning,0.08930000000
-6,cook,R1,2035,7,gas_stove,2025,all-year,all-week,early-morning,0.08930000000
-6,cook,R1,2040,1,estove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R1,2040,2,estove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R1,2040,4,estove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R1,2040,5,estove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R2,2035,0,estove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R2,2035,1,estove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R2,2035,3,estove,2025,all-year,all-week,early-morning,0.35720000000
-6,cook,R2,2035,4,estove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R2,2035,6,gas_stove,2025,all-year,all-week,early-morning,0.08930000000
-6,cook,R2,2035,7,gas_stove,2025,all-year,all-week,early-morning,0.08930000000
-6,cook,R2,2040,1,estove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R2,2040,2,estove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R2,2040,4,estove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R2,2040,5,estove,2035,all-year,all-week,early-morning,0.68470000000
-7,heat,R1,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R1,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R1,2035,10,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R1,2035,11,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R1,2035,13,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R1,2035,14,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R1,2040,11,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R1,2040,12,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R1,2040,14,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R1,2040,15,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R2,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R2,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,0.08930000000
-7,heat,R2,2035,10,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R2,2035,11,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R2,2035,13,heatpump,2025,all-year,all-week,late-afternoon,0.35720000000
-7,heat,R2,2035,14,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R2,2040,11,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R2,2040,12,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R2,2040,14,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R2,2040,15,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,CO2f,R1,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,4.46550000000
-7,CO2f,R1,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,4.46550000000
-7,CO2f,R1,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R1,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R2,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,4.46550000000
-7,CO2f,R2,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,4.46550000000
-7,CO2f,R2,2035,8,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,CO2f,R2,2035,9,gasboiler,2025,all-year,all-week,late-afternoon,5.77920000000
-7,cook,R1,2035,0,estove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R1,2035,1,estove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R1,2035,3,estove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R1,2035,4,estove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R1,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,0.08930000000
-7,cook,R1,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08930000000
-7,cook,R1,2040,1,estove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R1,2040,2,estove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R1,2040,4,estove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R1,2040,5,estove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R2,2035,0,estove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R2,2035,1,estove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R2,2035,3,estove,2025,all-year,all-week,late-afternoon,0.35720000000
-7,cook,R2,2035,4,estove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R2,2035,6,gas_stove,2025,all-year,all-week,late-afternoon,0.08930000000
-7,cook,R2,2035,7,gas_stove,2025,all-year,all-week,late-afternoon,0.08930000000
-7,cook,R2,2040,1,estove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R2,2040,2,estove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R2,2040,4,estove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R2,2040,5,estove,2035,all-year,all-week,late-afternoon,0.68470000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2035,8,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R1,2035,9,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R1,2035,10,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R1,2035,11,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R1,2035,13,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R1,2035,14,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R1,2040,11,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R1,2040,12,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R1,2040,14,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R1,2040,15,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R2,2035,8,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R2,2035,9,all-year,all-week,night,gasboiler,2025,0.04460000000
+0,heat,R2,2035,10,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R2,2035,11,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R2,2035,13,all-year,all-week,night,heatpump,2025,0.17850000000
+0,heat,R2,2035,14,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R2,2040,11,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R2,2040,12,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R2,2040,14,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R2,2040,15,all-year,all-week,night,heatpump,2035,0.34210000000
+0,CO2f,R1,2035,6,all-year,all-week,night,gas_stove,2025,2.23120000000
+0,CO2f,R1,2035,7,all-year,all-week,night,gas_stove,2025,2.23120000000
+0,CO2f,R1,2035,8,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R1,2035,9,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R2,2035,6,all-year,all-week,night,gas_stove,2025,2.23120000000
+0,CO2f,R2,2035,7,all-year,all-week,night,gas_stove,2025,2.23120000000
+0,CO2f,R2,2035,8,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,CO2f,R2,2035,9,all-year,all-week,night,gasboiler,2025,2.88760000000
+0,cook,R1,2035,0,all-year,all-week,night,estove,2025,0.17850000000
+0,cook,R1,2035,1,all-year,all-week,night,estove,2030,0.49090000000
+0,cook,R1,2035,3,all-year,all-week,night,estove,2025,0.17850000000
+0,cook,R1,2035,4,all-year,all-week,night,estove,2030,0.49090000000
+0,cook,R1,2035,6,all-year,all-week,night,gas_stove,2025,0.04460000000
+0,cook,R1,2035,7,all-year,all-week,night,gas_stove,2025,0.04460000000
+0,cook,R1,2040,1,all-year,all-week,night,estove,2030,0.49090000000
+0,cook,R1,2040,2,all-year,all-week,night,estove,2035,0.34210000000
+0,cook,R1,2040,4,all-year,all-week,night,estove,2030,0.49090000000
+0,cook,R1,2040,5,all-year,all-week,night,estove,2035,0.34210000000
+0,cook,R2,2035,0,all-year,all-week,night,estove,2025,0.17850000000
+0,cook,R2,2035,1,all-year,all-week,night,estove,2030,0.49090000000
+0,cook,R2,2035,3,all-year,all-week,night,estove,2025,0.17850000000
+0,cook,R2,2035,4,all-year,all-week,night,estove,2030,0.49090000000
+0,cook,R2,2035,6,all-year,all-week,night,gas_stove,2025,0.04460000000
+0,cook,R2,2035,7,all-year,all-week,night,gas_stove,2025,0.04460000000
+0,cook,R2,2040,1,all-year,all-week,night,estove,2030,0.49090000000
+0,cook,R2,2040,2,all-year,all-week,night,estove,2035,0.34210000000
+0,cook,R2,2040,4,all-year,all-week,night,estove,2030,0.49090000000
+0,cook,R2,2040,5,all-year,all-week,night,estove,2035,0.34210000000
+1,heat,R1,2035,8,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R1,2035,9,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R1,2035,10,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R1,2035,11,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R1,2035,13,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R1,2035,14,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R1,2040,11,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R1,2040,12,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R1,2040,14,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R1,2040,15,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R2,2035,8,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R2,2035,9,all-year,all-week,morning,gasboiler,2025,0.06690000000
+1,heat,R2,2035,10,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R2,2035,11,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R2,2035,13,all-year,all-week,morning,heatpump,2025,0.26770000000
+1,heat,R2,2035,14,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R2,2040,11,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R2,2040,12,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R2,2040,14,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R2,2040,15,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,CO2f,R1,2035,6,all-year,all-week,morning,gas_stove,2025,3.34680000000
+1,CO2f,R1,2035,7,all-year,all-week,morning,gas_stove,2025,3.34680000000
+1,CO2f,R1,2035,8,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R1,2035,9,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R2,2035,6,all-year,all-week,morning,gas_stove,2025,3.34680000000
+1,CO2f,R2,2035,7,all-year,all-week,morning,gas_stove,2025,3.34680000000
+1,CO2f,R2,2035,8,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,CO2f,R2,2035,9,all-year,all-week,morning,gasboiler,2025,4.33140000000
+1,cook,R1,2035,0,all-year,all-week,morning,estove,2025,0.26770000000
+1,cook,R1,2035,1,all-year,all-week,morning,estove,2030,0.73630000000
+1,cook,R1,2035,3,all-year,all-week,morning,estove,2025,0.26770000000
+1,cook,R1,2035,4,all-year,all-week,morning,estove,2030,0.73630000000
+1,cook,R1,2035,6,all-year,all-week,morning,gas_stove,2025,0.06690000000
+1,cook,R1,2035,7,all-year,all-week,morning,gas_stove,2025,0.06690000000
+1,cook,R1,2040,1,all-year,all-week,morning,estove,2030,0.73630000000
+1,cook,R1,2040,2,all-year,all-week,morning,estove,2035,0.51320000000
+1,cook,R1,2040,4,all-year,all-week,morning,estove,2030,0.73630000000
+1,cook,R1,2040,5,all-year,all-week,morning,estove,2035,0.51320000000
+1,cook,R2,2035,0,all-year,all-week,morning,estove,2025,0.26770000000
+1,cook,R2,2035,1,all-year,all-week,morning,estove,2030,0.73630000000
+1,cook,R2,2035,3,all-year,all-week,morning,estove,2025,0.26770000000
+1,cook,R2,2035,4,all-year,all-week,morning,estove,2030,0.73630000000
+1,cook,R2,2035,6,all-year,all-week,morning,gas_stove,2025,0.06690000000
+1,cook,R2,2035,7,all-year,all-week,morning,gas_stove,2025,0.06690000000
+1,cook,R2,2040,1,all-year,all-week,morning,estove,2030,0.73630000000
+1,cook,R2,2040,2,all-year,all-week,morning,estove,2035,0.51320000000
+1,cook,R2,2040,4,all-year,all-week,morning,estove,2030,0.73630000000
+1,cook,R2,2040,5,all-year,all-week,morning,estove,2035,0.51320000000
+2,heat,R1,2035,8,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R1,2035,9,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R1,2035,10,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R1,2035,11,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R1,2035,13,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R1,2035,14,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R1,2040,11,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R1,2040,12,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R1,2040,14,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R1,2040,15,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R2,2035,8,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R2,2035,9,all-year,all-week,mid-afternoon,gasboiler,2025,0.04460000000
+2,heat,R2,2035,10,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R2,2035,11,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R2,2035,13,all-year,all-week,mid-afternoon,heatpump,2025,0.17850000000
+2,heat,R2,2035,14,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R2,2040,11,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R2,2040,12,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R2,2040,14,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R2,2040,15,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,CO2f,R1,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,2.23120000000
+2,CO2f,R1,2035,7,all-year,all-week,mid-afternoon,gas_stove,2025,2.23120000000
+2,CO2f,R1,2035,8,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R1,2035,9,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R2,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,2.23120000000
+2,CO2f,R2,2035,7,all-year,all-week,mid-afternoon,gas_stove,2025,2.23120000000
+2,CO2f,R2,2035,8,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,CO2f,R2,2035,9,all-year,all-week,mid-afternoon,gasboiler,2025,2.88760000000
+2,cook,R1,2035,0,all-year,all-week,mid-afternoon,estove,2025,0.17850000000
+2,cook,R1,2035,1,all-year,all-week,mid-afternoon,estove,2030,0.49090000000
+2,cook,R1,2035,3,all-year,all-week,mid-afternoon,estove,2025,0.17850000000
+2,cook,R1,2035,4,all-year,all-week,mid-afternoon,estove,2030,0.49090000000
+2,cook,R1,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,0.04460000000
+2,cook,R1,2035,7,all-year,all-week,mid-afternoon,gas_stove,2025,0.04460000000
+2,cook,R1,2040,1,all-year,all-week,mid-afternoon,estove,2030,0.49090000000
+2,cook,R1,2040,2,all-year,all-week,mid-afternoon,estove,2035,0.34210000000
+2,cook,R1,2040,4,all-year,all-week,mid-afternoon,estove,2030,0.49090000000
+2,cook,R1,2040,5,all-year,all-week,mid-afternoon,estove,2035,0.34210000000
+2,cook,R2,2035,0,all-year,all-week,mid-afternoon,estove,2025,0.17850000000
+2,cook,R2,2035,1,all-year,all-week,mid-afternoon,estove,2030,0.49090000000
+2,cook,R2,2035,3,all-year,all-week,mid-afternoon,estove,2025,0.17850000000
+2,cook,R2,2035,4,all-year,all-week,mid-afternoon,estove,2030,0.49090000000
+2,cook,R2,2035,6,all-year,all-week,mid-afternoon,gas_stove,2025,0.04460000000
+2,cook,R2,2035,7,all-year,all-week,mid-afternoon,gas_stove,2025,0.04460000000
+2,cook,R2,2040,1,all-year,all-week,mid-afternoon,estove,2030,0.49090000000
+2,cook,R2,2040,2,all-year,all-week,mid-afternoon,estove,2035,0.34210000000
+2,cook,R2,2040,4,all-year,all-week,mid-afternoon,estove,2030,0.49090000000
+2,cook,R2,2040,5,all-year,all-week,mid-afternoon,estove,2035,0.34210000000
+3,heat,R1,2035,8,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R1,2035,9,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R1,2035,10,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R1,2035,11,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R1,2035,13,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R1,2035,14,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R1,2040,11,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R1,2040,12,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R1,2040,14,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R1,2040,15,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R2,2035,8,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R2,2035,9,all-year,all-week,early-peak,gasboiler,2025,0.06690000000
+3,heat,R2,2035,10,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R2,2035,11,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R2,2035,13,all-year,all-week,early-peak,heatpump,2025,0.26770000000
+3,heat,R2,2035,14,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R2,2040,11,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R2,2040,12,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R2,2040,14,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R2,2040,15,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,CO2f,R1,2035,6,all-year,all-week,early-peak,gas_stove,2025,3.34680000000
+3,CO2f,R1,2035,7,all-year,all-week,early-peak,gas_stove,2025,3.34680000000
+3,CO2f,R1,2035,8,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R1,2035,9,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R2,2035,6,all-year,all-week,early-peak,gas_stove,2025,3.34680000000
+3,CO2f,R2,2035,7,all-year,all-week,early-peak,gas_stove,2025,3.34680000000
+3,CO2f,R2,2035,8,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,CO2f,R2,2035,9,all-year,all-week,early-peak,gasboiler,2025,4.33140000000
+3,cook,R1,2035,0,all-year,all-week,early-peak,estove,2025,0.26770000000
+3,cook,R1,2035,1,all-year,all-week,early-peak,estove,2030,0.73630000000
+3,cook,R1,2035,3,all-year,all-week,early-peak,estove,2025,0.26770000000
+3,cook,R1,2035,4,all-year,all-week,early-peak,estove,2030,0.73630000000
+3,cook,R1,2035,6,all-year,all-week,early-peak,gas_stove,2025,0.06690000000
+3,cook,R1,2035,7,all-year,all-week,early-peak,gas_stove,2025,0.06690000000
+3,cook,R1,2040,1,all-year,all-week,early-peak,estove,2030,0.73630000000
+3,cook,R1,2040,2,all-year,all-week,early-peak,estove,2035,0.51320000000
+3,cook,R1,2040,4,all-year,all-week,early-peak,estove,2030,0.73630000000
+3,cook,R1,2040,5,all-year,all-week,early-peak,estove,2035,0.51320000000
+3,cook,R2,2035,0,all-year,all-week,early-peak,estove,2025,0.26770000000
+3,cook,R2,2035,1,all-year,all-week,early-peak,estove,2030,0.73630000000
+3,cook,R2,2035,3,all-year,all-week,early-peak,estove,2025,0.26770000000
+3,cook,R2,2035,4,all-year,all-week,early-peak,estove,2030,0.73630000000
+3,cook,R2,2035,6,all-year,all-week,early-peak,gas_stove,2025,0.06690000000
+3,cook,R2,2035,7,all-year,all-week,early-peak,gas_stove,2025,0.06690000000
+3,cook,R2,2040,1,all-year,all-week,early-peak,estove,2030,0.73630000000
+3,cook,R2,2040,2,all-year,all-week,early-peak,estove,2035,0.51320000000
+3,cook,R2,2040,4,all-year,all-week,early-peak,estove,2030,0.73630000000
+3,cook,R2,2040,5,all-year,all-week,early-peak,estove,2035,0.51320000000
+4,heat,R1,2035,8,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R1,2035,9,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R1,2035,10,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R1,2035,11,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R1,2035,13,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R1,2035,14,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R1,2040,11,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R1,2040,12,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R1,2040,14,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R1,2040,15,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R2,2035,8,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R2,2035,9,all-year,all-week,late-peak,gasboiler,2025,0.13390000000
+4,heat,R2,2035,10,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R2,2035,11,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R2,2035,13,all-year,all-week,late-peak,heatpump,2025,0.53570000000
+4,heat,R2,2035,14,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R2,2040,11,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R2,2040,12,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R2,2040,14,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R2,2040,15,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,CO2f,R1,2035,6,all-year,all-week,late-peak,gas_stove,2025,6.69670000000
+4,CO2f,R1,2035,7,all-year,all-week,late-peak,gas_stove,2025,6.69670000000
+4,CO2f,R1,2035,8,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R1,2035,9,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R2,2035,6,all-year,all-week,late-peak,gas_stove,2025,6.69670000000
+4,CO2f,R2,2035,7,all-year,all-week,late-peak,gas_stove,2025,6.69670000000
+4,CO2f,R2,2035,8,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,CO2f,R2,2035,9,all-year,all-week,late-peak,gasboiler,2025,8.66680000000
+4,cook,R1,2035,0,all-year,all-week,late-peak,estove,2025,0.53570000000
+4,cook,R1,2035,1,all-year,all-week,late-peak,estove,2030,1.47330000000
+4,cook,R1,2035,3,all-year,all-week,late-peak,estove,2025,0.53570000000
+4,cook,R1,2035,4,all-year,all-week,late-peak,estove,2030,1.47330000000
+4,cook,R1,2035,6,all-year,all-week,late-peak,gas_stove,2025,0.13390000000
+4,cook,R1,2035,7,all-year,all-week,late-peak,gas_stove,2025,0.13390000000
+4,cook,R1,2040,1,all-year,all-week,late-peak,estove,2030,1.47330000000
+4,cook,R1,2040,2,all-year,all-week,late-peak,estove,2035,1.02680000000
+4,cook,R1,2040,4,all-year,all-week,late-peak,estove,2030,1.47330000000
+4,cook,R1,2040,5,all-year,all-week,late-peak,estove,2035,1.02680000000
+4,cook,R2,2035,0,all-year,all-week,late-peak,estove,2025,0.53570000000
+4,cook,R2,2035,1,all-year,all-week,late-peak,estove,2030,1.47330000000
+4,cook,R2,2035,3,all-year,all-week,late-peak,estove,2025,0.53570000000
+4,cook,R2,2035,4,all-year,all-week,late-peak,estove,2030,1.47330000000
+4,cook,R2,2035,6,all-year,all-week,late-peak,gas_stove,2025,0.13390000000
+4,cook,R2,2035,7,all-year,all-week,late-peak,gas_stove,2025,0.13390000000
+4,cook,R2,2040,1,all-year,all-week,late-peak,estove,2030,1.47330000000
+4,cook,R2,2040,2,all-year,all-week,late-peak,estove,2035,1.02680000000
+4,cook,R2,2040,4,all-year,all-week,late-peak,estove,2030,1.47330000000
+4,cook,R2,2040,5,all-year,all-week,late-peak,estove,2035,1.02680000000
+5,heat,R1,2035,8,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R1,2035,9,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R1,2035,10,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R1,2035,11,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R1,2035,13,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R1,2035,14,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R1,2040,11,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R1,2040,12,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R1,2040,14,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R1,2040,15,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R2,2035,8,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R2,2035,9,all-year,all-week,evening,gasboiler,2025,0.08930000000
+5,heat,R2,2035,10,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R2,2035,11,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R2,2035,13,all-year,all-week,evening,heatpump,2025,0.35720000000
+5,heat,R2,2035,14,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R2,2040,11,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R2,2040,12,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R2,2040,14,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R2,2040,15,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,CO2f,R1,2035,6,all-year,all-week,evening,gas_stove,2025,4.46550000000
+5,CO2f,R1,2035,7,all-year,all-week,evening,gas_stove,2025,4.46550000000
+5,CO2f,R1,2035,8,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R1,2035,9,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R2,2035,6,all-year,all-week,evening,gas_stove,2025,4.46550000000
+5,CO2f,R2,2035,7,all-year,all-week,evening,gas_stove,2025,4.46550000000
+5,CO2f,R2,2035,8,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,CO2f,R2,2035,9,all-year,all-week,evening,gasboiler,2025,5.77920000000
+5,cook,R1,2035,0,all-year,all-week,evening,estove,2025,0.35720000000
+5,cook,R1,2035,1,all-year,all-week,evening,estove,2030,0.98250000000
+5,cook,R1,2035,3,all-year,all-week,evening,estove,2025,0.35720000000
+5,cook,R1,2035,4,all-year,all-week,evening,estove,2030,0.98250000000
+5,cook,R1,2035,6,all-year,all-week,evening,gas_stove,2025,0.08930000000
+5,cook,R1,2035,7,all-year,all-week,evening,gas_stove,2025,0.08930000000
+5,cook,R1,2040,1,all-year,all-week,evening,estove,2030,0.98250000000
+5,cook,R1,2040,2,all-year,all-week,evening,estove,2035,0.68470000000
+5,cook,R1,2040,4,all-year,all-week,evening,estove,2030,0.98250000000
+5,cook,R1,2040,5,all-year,all-week,evening,estove,2035,0.68470000000
+5,cook,R2,2035,0,all-year,all-week,evening,estove,2025,0.35720000000
+5,cook,R2,2035,1,all-year,all-week,evening,estove,2030,0.98250000000
+5,cook,R2,2035,3,all-year,all-week,evening,estove,2025,0.35720000000
+5,cook,R2,2035,4,all-year,all-week,evening,estove,2030,0.98250000000
+5,cook,R2,2035,6,all-year,all-week,evening,gas_stove,2025,0.08930000000
+5,cook,R2,2035,7,all-year,all-week,evening,gas_stove,2025,0.08930000000
+5,cook,R2,2040,1,all-year,all-week,evening,estove,2030,0.98250000000
+5,cook,R2,2040,2,all-year,all-week,evening,estove,2035,0.68470000000
+5,cook,R2,2040,4,all-year,all-week,evening,estove,2030,0.98250000000
+5,cook,R2,2040,5,all-year,all-week,evening,estove,2035,0.68470000000
+6,heat,R1,2035,8,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R1,2035,9,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R1,2035,10,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R1,2035,11,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R1,2035,13,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R1,2035,14,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R1,2040,11,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R1,2040,12,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R1,2040,14,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R1,2040,15,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R2,2035,8,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R2,2035,9,all-year,all-week,early-morning,gasboiler,2025,0.08930000000
+6,heat,R2,2035,10,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R2,2035,11,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R2,2035,13,all-year,all-week,early-morning,heatpump,2025,0.35720000000
+6,heat,R2,2035,14,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R2,2040,11,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R2,2040,12,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R2,2040,14,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R2,2040,15,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,CO2f,R1,2035,6,all-year,all-week,early-morning,gas_stove,2025,4.46550000000
+6,CO2f,R1,2035,7,all-year,all-week,early-morning,gas_stove,2025,4.46550000000
+6,CO2f,R1,2035,8,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R1,2035,9,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R2,2035,6,all-year,all-week,early-morning,gas_stove,2025,4.46550000000
+6,CO2f,R2,2035,7,all-year,all-week,early-morning,gas_stove,2025,4.46550000000
+6,CO2f,R2,2035,8,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,CO2f,R2,2035,9,all-year,all-week,early-morning,gasboiler,2025,5.77920000000
+6,cook,R1,2035,0,all-year,all-week,early-morning,estove,2025,0.35720000000
+6,cook,R1,2035,1,all-year,all-week,early-morning,estove,2030,0.98250000000
+6,cook,R1,2035,3,all-year,all-week,early-morning,estove,2025,0.35720000000
+6,cook,R1,2035,4,all-year,all-week,early-morning,estove,2030,0.98250000000
+6,cook,R1,2035,6,all-year,all-week,early-morning,gas_stove,2025,0.08930000000
+6,cook,R1,2035,7,all-year,all-week,early-morning,gas_stove,2025,0.08930000000
+6,cook,R1,2040,1,all-year,all-week,early-morning,estove,2030,0.98250000000
+6,cook,R1,2040,2,all-year,all-week,early-morning,estove,2035,0.68470000000
+6,cook,R1,2040,4,all-year,all-week,early-morning,estove,2030,0.98250000000
+6,cook,R1,2040,5,all-year,all-week,early-morning,estove,2035,0.68470000000
+6,cook,R2,2035,0,all-year,all-week,early-morning,estove,2025,0.35720000000
+6,cook,R2,2035,1,all-year,all-week,early-morning,estove,2030,0.98250000000
+6,cook,R2,2035,3,all-year,all-week,early-morning,estove,2025,0.35720000000
+6,cook,R2,2035,4,all-year,all-week,early-morning,estove,2030,0.98250000000
+6,cook,R2,2035,6,all-year,all-week,early-morning,gas_stove,2025,0.08930000000
+6,cook,R2,2035,7,all-year,all-week,early-morning,gas_stove,2025,0.08930000000
+6,cook,R2,2040,1,all-year,all-week,early-morning,estove,2030,0.98250000000
+6,cook,R2,2040,2,all-year,all-week,early-morning,estove,2035,0.68470000000
+6,cook,R2,2040,4,all-year,all-week,early-morning,estove,2030,0.98250000000
+6,cook,R2,2040,5,all-year,all-week,early-morning,estove,2035,0.68470000000
+7,heat,R1,2035,8,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R1,2035,9,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R1,2035,10,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R1,2035,11,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R1,2035,13,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R1,2035,14,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R1,2040,11,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R1,2040,12,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R1,2040,14,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R1,2040,15,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R2,2035,8,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R2,2035,9,all-year,all-week,late-afternoon,gasboiler,2025,0.08930000000
+7,heat,R2,2035,10,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R2,2035,11,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R2,2035,13,all-year,all-week,late-afternoon,heatpump,2025,0.35720000000
+7,heat,R2,2035,14,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R2,2040,11,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R2,2040,12,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R2,2040,14,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R2,2040,15,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,CO2f,R1,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,4.46550000000
+7,CO2f,R1,2035,7,all-year,all-week,late-afternoon,gas_stove,2025,4.46550000000
+7,CO2f,R1,2035,8,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R1,2035,9,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R2,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,4.46550000000
+7,CO2f,R2,2035,7,all-year,all-week,late-afternoon,gas_stove,2025,4.46550000000
+7,CO2f,R2,2035,8,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,CO2f,R2,2035,9,all-year,all-week,late-afternoon,gasboiler,2025,5.77920000000
+7,cook,R1,2035,0,all-year,all-week,late-afternoon,estove,2025,0.35720000000
+7,cook,R1,2035,1,all-year,all-week,late-afternoon,estove,2030,0.98250000000
+7,cook,R1,2035,3,all-year,all-week,late-afternoon,estove,2025,0.35720000000
+7,cook,R1,2035,4,all-year,all-week,late-afternoon,estove,2030,0.98250000000
+7,cook,R1,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,0.08930000000
+7,cook,R1,2035,7,all-year,all-week,late-afternoon,gas_stove,2025,0.08930000000
+7,cook,R1,2040,1,all-year,all-week,late-afternoon,estove,2030,0.98250000000
+7,cook,R1,2040,2,all-year,all-week,late-afternoon,estove,2035,0.68470000000
+7,cook,R1,2040,4,all-year,all-week,late-afternoon,estove,2030,0.98250000000
+7,cook,R1,2040,5,all-year,all-week,late-afternoon,estove,2035,0.68470000000
+7,cook,R2,2035,0,all-year,all-week,late-afternoon,estove,2025,0.35720000000
+7,cook,R2,2035,1,all-year,all-week,late-afternoon,estove,2030,0.98250000000
+7,cook,R2,2035,3,all-year,all-week,late-afternoon,estove,2025,0.35720000000
+7,cook,R2,2035,4,all-year,all-week,late-afternoon,estove,2030,0.98250000000
+7,cook,R2,2035,6,all-year,all-week,late-afternoon,gas_stove,2025,0.08930000000
+7,cook,R2,2035,7,all-year,all-week,late-afternoon,gas_stove,2025,0.08930000000
+7,cook,R2,2040,1,all-year,all-week,late-afternoon,estove,2030,0.98250000000
+7,cook,R2,2040,2,all-year,all-week,late-afternoon,estove,2035,0.68470000000
+7,cook,R2,2040,4,all-year,all-week,late-afternoon,estove,2030,0.98250000000
+7,cook,R2,2040,5,all-year,all-week,late-afternoon,estove,2035,0.68470000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2040.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2040.csv
index a46c9d617..2d971d43f 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2040.csv
@@ -1,257 +1,257 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2040,6,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R1,2040,7,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R1,2040,9,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R1,2040,10,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R1,2045,7,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R1,2045,8,heatpump,2040,all-year,all-week,night,0.60990000000
-0,heat,R1,2045,10,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R1,2045,11,heatpump,2040,all-year,all-week,night,0.60990000000
-0,heat,R2,2040,6,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R2,2040,7,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R2,2040,9,heatpump,2030,all-year,all-week,night,0.49090000000
-0,heat,R2,2040,10,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R2,2045,7,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R2,2045,8,heatpump,2040,all-year,all-week,night,0.60990000000
-0,heat,R2,2045,10,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R2,2045,11,heatpump,2040,all-year,all-week,night,0.60990000000
-0,cook,R1,2040,0,estove,2030,all-year,all-week,night,0.49090000000
-0,cook,R1,2040,1,estove,2035,all-year,all-week,night,0.34210000000
-0,cook,R1,2040,3,estove,2030,all-year,all-week,night,0.49090000000
-0,cook,R1,2040,4,estove,2035,all-year,all-week,night,0.34210000000
-0,cook,R1,2045,1,estove,2035,all-year,all-week,night,0.34210000000
-0,cook,R1,2045,2,estove,2040,all-year,all-week,night,0.60990000000
-0,cook,R1,2045,4,estove,2035,all-year,all-week,night,0.34210000000
-0,cook,R1,2045,5,estove,2040,all-year,all-week,night,0.60990000000
-0,cook,R2,2040,0,estove,2030,all-year,all-week,night,0.49090000000
-0,cook,R2,2040,1,estove,2035,all-year,all-week,night,0.34210000000
-0,cook,R2,2040,3,estove,2030,all-year,all-week,night,0.49090000000
-0,cook,R2,2040,4,estove,2035,all-year,all-week,night,0.34210000000
-0,cook,R2,2045,1,estove,2035,all-year,all-week,night,0.34210000000
-0,cook,R2,2045,2,estove,2040,all-year,all-week,night,0.60990000000
-0,cook,R2,2045,4,estove,2035,all-year,all-week,night,0.34210000000
-0,cook,R2,2045,5,estove,2040,all-year,all-week,night,0.60990000000
-1,heat,R1,2040,6,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R1,2040,7,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R1,2040,9,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R1,2040,10,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R1,2045,7,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R1,2045,8,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,heat,R1,2045,10,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R1,2045,11,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,heat,R2,2040,6,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R2,2040,7,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R2,2040,9,heatpump,2030,all-year,all-week,morning,0.73630000000
-1,heat,R2,2040,10,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R2,2045,7,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R2,2045,8,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,heat,R2,2045,10,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R2,2045,11,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,cook,R1,2040,0,estove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R1,2040,1,estove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R1,2040,3,estove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R1,2040,4,estove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R1,2045,1,estove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R1,2045,2,estove,2040,all-year,all-week,morning,0.91480000000
-1,cook,R1,2045,4,estove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R1,2045,5,estove,2040,all-year,all-week,morning,0.91480000000
-1,cook,R2,2040,0,estove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R2,2040,1,estove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R2,2040,3,estove,2030,all-year,all-week,morning,0.73630000000
-1,cook,R2,2040,4,estove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R2,2045,1,estove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R2,2045,2,estove,2040,all-year,all-week,morning,0.91480000000
-1,cook,R2,2045,4,estove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R2,2045,5,estove,2040,all-year,all-week,morning,0.91480000000
-2,heat,R1,2040,6,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R1,2040,7,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R1,2040,9,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R1,2040,10,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R1,2045,7,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R1,2045,8,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R1,2045,10,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R1,2045,11,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R2,2040,6,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R2,2040,7,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R2,2040,9,heatpump,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,heat,R2,2040,10,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R2,2045,7,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R2,2045,8,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R2,2045,10,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R2,2045,11,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R1,2040,0,estove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R1,2040,1,estove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R1,2040,3,estove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R1,2040,4,estove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R1,2045,1,estove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R1,2045,2,estove,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R1,2045,4,estove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R1,2045,5,estove,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R2,2040,0,estove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R2,2040,1,estove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R2,2040,3,estove,2030,all-year,all-week,mid-afternoon,0.49090000000
-2,cook,R2,2040,4,estove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R2,2045,1,estove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R2,2045,2,estove,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R2,2045,4,estove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R2,2045,5,estove,2040,all-year,all-week,mid-afternoon,0.60990000000
-3,heat,R1,2040,6,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R1,2040,7,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R1,2040,9,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R1,2040,10,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R1,2045,7,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R1,2045,8,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,heat,R1,2045,10,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R1,2045,11,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,heat,R2,2040,6,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R2,2040,7,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R2,2040,9,heatpump,2030,all-year,all-week,early-peak,0.73630000000
-3,heat,R2,2040,10,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R2,2045,7,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R2,2045,8,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,heat,R2,2045,10,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R2,2045,11,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R1,2040,0,estove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R1,2040,1,estove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R1,2040,3,estove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R1,2040,4,estove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R1,2045,1,estove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R1,2045,2,estove,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R1,2045,4,estove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R1,2045,5,estove,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R2,2040,0,estove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R2,2040,1,estove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R2,2040,3,estove,2030,all-year,all-week,early-peak,0.73630000000
-3,cook,R2,2040,4,estove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R2,2045,1,estove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R2,2045,2,estove,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R2,2045,4,estove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R2,2045,5,estove,2040,all-year,all-week,early-peak,0.91480000000
-4,heat,R1,2040,6,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R1,2040,7,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R1,2040,9,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R1,2040,10,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R1,2045,7,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R1,2045,8,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,heat,R1,2045,10,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R1,2045,11,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,heat,R2,2040,6,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R2,2040,7,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R2,2040,9,heatpump,2030,all-year,all-week,late-peak,1.47330000000
-4,heat,R2,2040,10,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R2,2045,7,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R2,2045,8,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,heat,R2,2045,10,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R2,2045,11,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R1,2040,0,estove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R1,2040,1,estove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R1,2040,3,estove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R1,2040,4,estove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R1,2045,1,estove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R1,2045,2,estove,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R1,2045,4,estove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R1,2045,5,estove,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R2,2040,0,estove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R2,2040,1,estove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R2,2040,3,estove,2030,all-year,all-week,late-peak,1.47330000000
-4,cook,R2,2040,4,estove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R2,2045,1,estove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R2,2045,2,estove,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R2,2045,4,estove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R2,2045,5,estove,2040,all-year,all-week,late-peak,1.83050000000
-5,heat,R1,2040,6,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R1,2040,7,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R1,2040,9,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R1,2040,10,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R1,2045,7,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R1,2045,8,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,heat,R1,2045,10,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R1,2045,11,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,heat,R2,2040,6,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R2,2040,7,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R2,2040,9,heatpump,2030,all-year,all-week,evening,0.98250000000
-5,heat,R2,2040,10,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R2,2045,7,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R2,2045,8,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,heat,R2,2045,10,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R2,2045,11,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,cook,R1,2040,0,estove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R1,2040,1,estove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R1,2040,3,estove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R1,2040,4,estove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R1,2045,1,estove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R1,2045,2,estove,2040,all-year,all-week,evening,1.22060000000
-5,cook,R1,2045,4,estove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R1,2045,5,estove,2040,all-year,all-week,evening,1.22060000000
-5,cook,R2,2040,0,estove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R2,2040,1,estove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R2,2040,3,estove,2030,all-year,all-week,evening,0.98250000000
-5,cook,R2,2040,4,estove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R2,2045,1,estove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R2,2045,2,estove,2040,all-year,all-week,evening,1.22060000000
-5,cook,R2,2045,4,estove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R2,2045,5,estove,2040,all-year,all-week,evening,1.22060000000
-6,heat,R1,2040,6,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R1,2040,7,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R1,2040,9,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R1,2040,10,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R1,2045,7,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R1,2045,8,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,heat,R1,2045,10,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R1,2045,11,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,heat,R2,2040,6,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R2,2040,7,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R2,2040,9,heatpump,2030,all-year,all-week,early-morning,0.98250000000
-6,heat,R2,2040,10,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R2,2045,7,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R2,2045,8,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,heat,R2,2045,10,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R2,2045,11,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R1,2040,0,estove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R1,2040,1,estove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R1,2040,3,estove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R1,2040,4,estove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R1,2045,1,estove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R1,2045,2,estove,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R1,2045,4,estove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R1,2045,5,estove,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R2,2040,0,estove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R2,2040,1,estove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R2,2040,3,estove,2030,all-year,all-week,early-morning,0.98250000000
-6,cook,R2,2040,4,estove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R2,2045,1,estove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R2,2045,2,estove,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R2,2045,4,estove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R2,2045,5,estove,2040,all-year,all-week,early-morning,1.22060000000
-7,heat,R1,2040,6,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R1,2040,7,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R1,2040,9,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R1,2040,10,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R1,2045,7,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R1,2045,8,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R1,2045,10,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R1,2045,11,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R2,2040,6,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R2,2040,7,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R2,2040,9,heatpump,2030,all-year,all-week,late-afternoon,0.98250000000
-7,heat,R2,2040,10,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R2,2045,7,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R2,2045,8,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R2,2045,10,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R2,2045,11,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R1,2040,0,estove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R1,2040,1,estove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R1,2040,3,estove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R1,2040,4,estove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R1,2045,1,estove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R1,2045,2,estove,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R1,2045,4,estove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R1,2045,5,estove,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R2,2040,0,estove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R2,2040,1,estove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R2,2040,3,estove,2030,all-year,all-week,late-afternoon,0.98250000000
-7,cook,R2,2040,4,estove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R2,2045,1,estove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R2,2045,2,estove,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R2,2045,4,estove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R2,2045,5,estove,2040,all-year,all-week,late-afternoon,1.22060000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2040,6,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R1,2040,7,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R1,2040,9,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R1,2040,10,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R1,2045,7,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R1,2045,8,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R1,2045,10,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R1,2045,11,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R2,2040,6,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R2,2040,7,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R2,2040,9,all-year,all-week,night,heatpump,2030,0.49090000000
+0,heat,R2,2040,10,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R2,2045,7,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R2,2045,8,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R2,2045,10,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R2,2045,11,all-year,all-week,night,heatpump,2040,0.60990000000
+0,cook,R1,2040,0,all-year,all-week,night,estove,2030,0.49090000000
+0,cook,R1,2040,1,all-year,all-week,night,estove,2035,0.34210000000
+0,cook,R1,2040,3,all-year,all-week,night,estove,2030,0.49090000000
+0,cook,R1,2040,4,all-year,all-week,night,estove,2035,0.34210000000
+0,cook,R1,2045,1,all-year,all-week,night,estove,2035,0.34210000000
+0,cook,R1,2045,2,all-year,all-week,night,estove,2040,0.60990000000
+0,cook,R1,2045,4,all-year,all-week,night,estove,2035,0.34210000000
+0,cook,R1,2045,5,all-year,all-week,night,estove,2040,0.60990000000
+0,cook,R2,2040,0,all-year,all-week,night,estove,2030,0.49090000000
+0,cook,R2,2040,1,all-year,all-week,night,estove,2035,0.34210000000
+0,cook,R2,2040,3,all-year,all-week,night,estove,2030,0.49090000000
+0,cook,R2,2040,4,all-year,all-week,night,estove,2035,0.34210000000
+0,cook,R2,2045,1,all-year,all-week,night,estove,2035,0.34210000000
+0,cook,R2,2045,2,all-year,all-week,night,estove,2040,0.60990000000
+0,cook,R2,2045,4,all-year,all-week,night,estove,2035,0.34210000000
+0,cook,R2,2045,5,all-year,all-week,night,estove,2040,0.60990000000
+1,heat,R1,2040,6,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R1,2040,7,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R1,2040,9,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R1,2040,10,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R1,2045,7,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R1,2045,8,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R1,2045,10,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R1,2045,11,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R2,2040,6,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R2,2040,7,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R2,2040,9,all-year,all-week,morning,heatpump,2030,0.73630000000
+1,heat,R2,2040,10,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R2,2045,7,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R2,2045,8,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R2,2045,10,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R2,2045,11,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,cook,R1,2040,0,all-year,all-week,morning,estove,2030,0.73630000000
+1,cook,R1,2040,1,all-year,all-week,morning,estove,2035,0.51320000000
+1,cook,R1,2040,3,all-year,all-week,morning,estove,2030,0.73630000000
+1,cook,R1,2040,4,all-year,all-week,morning,estove,2035,0.51320000000
+1,cook,R1,2045,1,all-year,all-week,morning,estove,2035,0.51320000000
+1,cook,R1,2045,2,all-year,all-week,morning,estove,2040,0.91480000000
+1,cook,R1,2045,4,all-year,all-week,morning,estove,2035,0.51320000000
+1,cook,R1,2045,5,all-year,all-week,morning,estove,2040,0.91480000000
+1,cook,R2,2040,0,all-year,all-week,morning,estove,2030,0.73630000000
+1,cook,R2,2040,1,all-year,all-week,morning,estove,2035,0.51320000000
+1,cook,R2,2040,3,all-year,all-week,morning,estove,2030,0.73630000000
+1,cook,R2,2040,4,all-year,all-week,morning,estove,2035,0.51320000000
+1,cook,R2,2045,1,all-year,all-week,morning,estove,2035,0.51320000000
+1,cook,R2,2045,2,all-year,all-week,morning,estove,2040,0.91480000000
+1,cook,R2,2045,4,all-year,all-week,morning,estove,2035,0.51320000000
+1,cook,R2,2045,5,all-year,all-week,morning,estove,2040,0.91480000000
+2,heat,R1,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R1,2040,7,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R1,2040,9,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R1,2040,10,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R1,2045,7,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R1,2045,8,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R1,2045,10,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R1,2045,11,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R2,2040,6,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R2,2040,7,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R2,2040,9,all-year,all-week,mid-afternoon,heatpump,2030,0.49090000000
+2,heat,R2,2040,10,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R2,2045,7,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R2,2045,8,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R2,2045,10,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R2,2045,11,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,cook,R1,2040,0,all-year,all-week,mid-afternoon,estove,2030,0.49090000000
+2,cook,R1,2040,1,all-year,all-week,mid-afternoon,estove,2035,0.34210000000
+2,cook,R1,2040,3,all-year,all-week,mid-afternoon,estove,2030,0.49090000000
+2,cook,R1,2040,4,all-year,all-week,mid-afternoon,estove,2035,0.34210000000
+2,cook,R1,2045,1,all-year,all-week,mid-afternoon,estove,2035,0.34210000000
+2,cook,R1,2045,2,all-year,all-week,mid-afternoon,estove,2040,0.60990000000
+2,cook,R1,2045,4,all-year,all-week,mid-afternoon,estove,2035,0.34210000000
+2,cook,R1,2045,5,all-year,all-week,mid-afternoon,estove,2040,0.60990000000
+2,cook,R2,2040,0,all-year,all-week,mid-afternoon,estove,2030,0.49090000000
+2,cook,R2,2040,1,all-year,all-week,mid-afternoon,estove,2035,0.34210000000
+2,cook,R2,2040,3,all-year,all-week,mid-afternoon,estove,2030,0.49090000000
+2,cook,R2,2040,4,all-year,all-week,mid-afternoon,estove,2035,0.34210000000
+2,cook,R2,2045,1,all-year,all-week,mid-afternoon,estove,2035,0.34210000000
+2,cook,R2,2045,2,all-year,all-week,mid-afternoon,estove,2040,0.60990000000
+2,cook,R2,2045,4,all-year,all-week,mid-afternoon,estove,2035,0.34210000000
+2,cook,R2,2045,5,all-year,all-week,mid-afternoon,estove,2040,0.60990000000
+3,heat,R1,2040,6,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R1,2040,7,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R1,2040,9,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R1,2040,10,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R1,2045,7,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R1,2045,8,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R1,2045,10,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R1,2045,11,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R2,2040,6,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R2,2040,7,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R2,2040,9,all-year,all-week,early-peak,heatpump,2030,0.73630000000
+3,heat,R2,2040,10,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R2,2045,7,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R2,2045,8,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R2,2045,10,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R2,2045,11,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,cook,R1,2040,0,all-year,all-week,early-peak,estove,2030,0.73630000000
+3,cook,R1,2040,1,all-year,all-week,early-peak,estove,2035,0.51320000000
+3,cook,R1,2040,3,all-year,all-week,early-peak,estove,2030,0.73630000000
+3,cook,R1,2040,4,all-year,all-week,early-peak,estove,2035,0.51320000000
+3,cook,R1,2045,1,all-year,all-week,early-peak,estove,2035,0.51320000000
+3,cook,R1,2045,2,all-year,all-week,early-peak,estove,2040,0.91480000000
+3,cook,R1,2045,4,all-year,all-week,early-peak,estove,2035,0.51320000000
+3,cook,R1,2045,5,all-year,all-week,early-peak,estove,2040,0.91480000000
+3,cook,R2,2040,0,all-year,all-week,early-peak,estove,2030,0.73630000000
+3,cook,R2,2040,1,all-year,all-week,early-peak,estove,2035,0.51320000000
+3,cook,R2,2040,3,all-year,all-week,early-peak,estove,2030,0.73630000000
+3,cook,R2,2040,4,all-year,all-week,early-peak,estove,2035,0.51320000000
+3,cook,R2,2045,1,all-year,all-week,early-peak,estove,2035,0.51320000000
+3,cook,R2,2045,2,all-year,all-week,early-peak,estove,2040,0.91480000000
+3,cook,R2,2045,4,all-year,all-week,early-peak,estove,2035,0.51320000000
+3,cook,R2,2045,5,all-year,all-week,early-peak,estove,2040,0.91480000000
+4,heat,R1,2040,6,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R1,2040,7,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R1,2040,9,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R1,2040,10,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R1,2045,7,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R1,2045,8,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R1,2045,10,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R1,2045,11,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R2,2040,6,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R2,2040,7,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R2,2040,9,all-year,all-week,late-peak,heatpump,2030,1.47330000000
+4,heat,R2,2040,10,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R2,2045,7,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R2,2045,8,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R2,2045,10,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R2,2045,11,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,cook,R1,2040,0,all-year,all-week,late-peak,estove,2030,1.47330000000
+4,cook,R1,2040,1,all-year,all-week,late-peak,estove,2035,1.02680000000
+4,cook,R1,2040,3,all-year,all-week,late-peak,estove,2030,1.47330000000
+4,cook,R1,2040,4,all-year,all-week,late-peak,estove,2035,1.02680000000
+4,cook,R1,2045,1,all-year,all-week,late-peak,estove,2035,1.02680000000
+4,cook,R1,2045,2,all-year,all-week,late-peak,estove,2040,1.83050000000
+4,cook,R1,2045,4,all-year,all-week,late-peak,estove,2035,1.02680000000
+4,cook,R1,2045,5,all-year,all-week,late-peak,estove,2040,1.83050000000
+4,cook,R2,2040,0,all-year,all-week,late-peak,estove,2030,1.47330000000
+4,cook,R2,2040,1,all-year,all-week,late-peak,estove,2035,1.02680000000
+4,cook,R2,2040,3,all-year,all-week,late-peak,estove,2030,1.47330000000
+4,cook,R2,2040,4,all-year,all-week,late-peak,estove,2035,1.02680000000
+4,cook,R2,2045,1,all-year,all-week,late-peak,estove,2035,1.02680000000
+4,cook,R2,2045,2,all-year,all-week,late-peak,estove,2040,1.83050000000
+4,cook,R2,2045,4,all-year,all-week,late-peak,estove,2035,1.02680000000
+4,cook,R2,2045,5,all-year,all-week,late-peak,estove,2040,1.83050000000
+5,heat,R1,2040,6,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R1,2040,7,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R1,2040,9,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R1,2040,10,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R1,2045,7,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R1,2045,8,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R1,2045,10,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R1,2045,11,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R2,2040,6,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R2,2040,7,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R2,2040,9,all-year,all-week,evening,heatpump,2030,0.98250000000
+5,heat,R2,2040,10,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R2,2045,7,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R2,2045,8,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R2,2045,10,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R2,2045,11,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,cook,R1,2040,0,all-year,all-week,evening,estove,2030,0.98250000000
+5,cook,R1,2040,1,all-year,all-week,evening,estove,2035,0.68470000000
+5,cook,R1,2040,3,all-year,all-week,evening,estove,2030,0.98250000000
+5,cook,R1,2040,4,all-year,all-week,evening,estove,2035,0.68470000000
+5,cook,R1,2045,1,all-year,all-week,evening,estove,2035,0.68470000000
+5,cook,R1,2045,2,all-year,all-week,evening,estove,2040,1.22060000000
+5,cook,R1,2045,4,all-year,all-week,evening,estove,2035,0.68470000000
+5,cook,R1,2045,5,all-year,all-week,evening,estove,2040,1.22060000000
+5,cook,R2,2040,0,all-year,all-week,evening,estove,2030,0.98250000000
+5,cook,R2,2040,1,all-year,all-week,evening,estove,2035,0.68470000000
+5,cook,R2,2040,3,all-year,all-week,evening,estove,2030,0.98250000000
+5,cook,R2,2040,4,all-year,all-week,evening,estove,2035,0.68470000000
+5,cook,R2,2045,1,all-year,all-week,evening,estove,2035,0.68470000000
+5,cook,R2,2045,2,all-year,all-week,evening,estove,2040,1.22060000000
+5,cook,R2,2045,4,all-year,all-week,evening,estove,2035,0.68470000000
+5,cook,R2,2045,5,all-year,all-week,evening,estove,2040,1.22060000000
+6,heat,R1,2040,6,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R1,2040,7,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R1,2040,9,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R1,2040,10,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R1,2045,7,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R1,2045,8,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R1,2045,10,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R1,2045,11,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R2,2040,6,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R2,2040,7,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R2,2040,9,all-year,all-week,early-morning,heatpump,2030,0.98250000000
+6,heat,R2,2040,10,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R2,2045,7,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R2,2045,8,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R2,2045,10,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R2,2045,11,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,cook,R1,2040,0,all-year,all-week,early-morning,estove,2030,0.98250000000
+6,cook,R1,2040,1,all-year,all-week,early-morning,estove,2035,0.68470000000
+6,cook,R1,2040,3,all-year,all-week,early-morning,estove,2030,0.98250000000
+6,cook,R1,2040,4,all-year,all-week,early-morning,estove,2035,0.68470000000
+6,cook,R1,2045,1,all-year,all-week,early-morning,estove,2035,0.68470000000
+6,cook,R1,2045,2,all-year,all-week,early-morning,estove,2040,1.22060000000
+6,cook,R1,2045,4,all-year,all-week,early-morning,estove,2035,0.68470000000
+6,cook,R1,2045,5,all-year,all-week,early-morning,estove,2040,1.22060000000
+6,cook,R2,2040,0,all-year,all-week,early-morning,estove,2030,0.98250000000
+6,cook,R2,2040,1,all-year,all-week,early-morning,estove,2035,0.68470000000
+6,cook,R2,2040,3,all-year,all-week,early-morning,estove,2030,0.98250000000
+6,cook,R2,2040,4,all-year,all-week,early-morning,estove,2035,0.68470000000
+6,cook,R2,2045,1,all-year,all-week,early-morning,estove,2035,0.68470000000
+6,cook,R2,2045,2,all-year,all-week,early-morning,estove,2040,1.22060000000
+6,cook,R2,2045,4,all-year,all-week,early-morning,estove,2035,0.68470000000
+6,cook,R2,2045,5,all-year,all-week,early-morning,estove,2040,1.22060000000
+7,heat,R1,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R1,2040,7,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R1,2040,9,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R1,2040,10,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R1,2045,7,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R1,2045,8,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R1,2045,10,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R1,2045,11,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R2,2040,6,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R2,2040,7,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R2,2040,9,all-year,all-week,late-afternoon,heatpump,2030,0.98250000000
+7,heat,R2,2040,10,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R2,2045,7,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R2,2045,8,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R2,2045,10,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R2,2045,11,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,cook,R1,2040,0,all-year,all-week,late-afternoon,estove,2030,0.98250000000
+7,cook,R1,2040,1,all-year,all-week,late-afternoon,estove,2035,0.68470000000
+7,cook,R1,2040,3,all-year,all-week,late-afternoon,estove,2030,0.98250000000
+7,cook,R1,2040,4,all-year,all-week,late-afternoon,estove,2035,0.68470000000
+7,cook,R1,2045,1,all-year,all-week,late-afternoon,estove,2035,0.68470000000
+7,cook,R1,2045,2,all-year,all-week,late-afternoon,estove,2040,1.22060000000
+7,cook,R1,2045,4,all-year,all-week,late-afternoon,estove,2035,0.68470000000
+7,cook,R1,2045,5,all-year,all-week,late-afternoon,estove,2040,1.22060000000
+7,cook,R2,2040,0,all-year,all-week,late-afternoon,estove,2030,0.98250000000
+7,cook,R2,2040,1,all-year,all-week,late-afternoon,estove,2035,0.68470000000
+7,cook,R2,2040,3,all-year,all-week,late-afternoon,estove,2030,0.98250000000
+7,cook,R2,2040,4,all-year,all-week,late-afternoon,estove,2035,0.68470000000
+7,cook,R2,2045,1,all-year,all-week,late-afternoon,estove,2035,0.68470000000
+7,cook,R2,2045,2,all-year,all-week,late-afternoon,estove,2040,1.22060000000
+7,cook,R2,2045,4,all-year,all-week,late-afternoon,estove,2035,0.68470000000
+7,cook,R2,2045,5,all-year,all-week,late-afternoon,estove,2040,1.22060000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2045.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2045.csv
index 6d7f67111..c0568a1cb 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2045.csv
@@ -1,257 +1,257 @@
-timeslice,commodity,region,year,asset,technology,installed,month,day,hour,supply
-0,heat,R1,2045,6,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R1,2045,7,heatpump,2040,all-year,all-week,night,0.60990000000
-0,heat,R1,2045,9,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R1,2045,10,heatpump,2040,all-year,all-week,night,0.60990000000
-0,heat,R1,2050,7,heatpump,2040,all-year,all-week,night,0.60990000000
-0,heat,R1,2050,8,heatpump,2045,all-year,all-week,night,0.46110000000
-0,heat,R1,2050,10,heatpump,2040,all-year,all-week,night,0.60990000000
-0,heat,R1,2050,11,heatpump,2045,all-year,all-week,night,0.46110000000
-0,heat,R2,2045,6,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R2,2045,7,heatpump,2040,all-year,all-week,night,0.60990000000
-0,heat,R2,2045,9,heatpump,2035,all-year,all-week,night,0.34210000000
-0,heat,R2,2045,10,heatpump,2040,all-year,all-week,night,0.60990000000
-0,heat,R2,2050,7,heatpump,2040,all-year,all-week,night,0.60990000000
-0,heat,R2,2050,8,heatpump,2045,all-year,all-week,night,0.46110000000
-0,heat,R2,2050,10,heatpump,2040,all-year,all-week,night,0.60990000000
-0,heat,R2,2050,11,heatpump,2045,all-year,all-week,night,0.46110000000
-0,cook,R1,2045,0,estove,2035,all-year,all-week,night,0.34210000000
-0,cook,R1,2045,1,estove,2040,all-year,all-week,night,0.60990000000
-0,cook,R1,2045,3,estove,2035,all-year,all-week,night,0.34210000000
-0,cook,R1,2045,4,estove,2040,all-year,all-week,night,0.60990000000
-0,cook,R1,2050,1,estove,2040,all-year,all-week,night,0.60990000000
-0,cook,R1,2050,2,estove,2045,all-year,all-week,night,0.46110000000
-0,cook,R1,2050,4,estove,2040,all-year,all-week,night,0.60990000000
-0,cook,R1,2050,5,estove,2045,all-year,all-week,night,0.46110000000
-0,cook,R2,2045,0,estove,2035,all-year,all-week,night,0.34210000000
-0,cook,R2,2045,1,estove,2040,all-year,all-week,night,0.60990000000
-0,cook,R2,2045,3,estove,2035,all-year,all-week,night,0.34210000000
-0,cook,R2,2045,4,estove,2040,all-year,all-week,night,0.60990000000
-0,cook,R2,2050,1,estove,2040,all-year,all-week,night,0.60990000000
-0,cook,R2,2050,2,estove,2045,all-year,all-week,night,0.46110000000
-0,cook,R2,2050,4,estove,2040,all-year,all-week,night,0.60990000000
-0,cook,R2,2050,5,estove,2045,all-year,all-week,night,0.46110000000
-1,heat,R1,2045,6,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R1,2045,7,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,heat,R1,2045,9,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R1,2045,10,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,heat,R1,2050,7,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,heat,R1,2050,8,heatpump,2045,all-year,all-week,morning,0.69170000000
-1,heat,R1,2050,10,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,heat,R1,2050,11,heatpump,2045,all-year,all-week,morning,0.69170000000
-1,heat,R2,2045,6,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R2,2045,7,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,heat,R2,2045,9,heatpump,2035,all-year,all-week,morning,0.51320000000
-1,heat,R2,2045,10,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,heat,R2,2050,7,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,heat,R2,2050,8,heatpump,2045,all-year,all-week,morning,0.69170000000
-1,heat,R2,2050,10,heatpump,2040,all-year,all-week,morning,0.91480000000
-1,heat,R2,2050,11,heatpump,2045,all-year,all-week,morning,0.69170000000
-1,cook,R1,2045,0,estove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R1,2045,1,estove,2040,all-year,all-week,morning,0.91480000000
-1,cook,R1,2045,3,estove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R1,2045,4,estove,2040,all-year,all-week,morning,0.91480000000
-1,cook,R1,2050,1,estove,2040,all-year,all-week,morning,0.91480000000
-1,cook,R1,2050,2,estove,2045,all-year,all-week,morning,0.69170000000
-1,cook,R1,2050,4,estove,2040,all-year,all-week,morning,0.91480000000
-1,cook,R1,2050,5,estove,2045,all-year,all-week,morning,0.69170000000
-1,cook,R2,2045,0,estove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R2,2045,1,estove,2040,all-year,all-week,morning,0.91480000000
-1,cook,R2,2045,3,estove,2035,all-year,all-week,morning,0.51320000000
-1,cook,R2,2045,4,estove,2040,all-year,all-week,morning,0.91480000000
-1,cook,R2,2050,1,estove,2040,all-year,all-week,morning,0.91480000000
-1,cook,R2,2050,2,estove,2045,all-year,all-week,morning,0.69170000000
-1,cook,R2,2050,4,estove,2040,all-year,all-week,morning,0.91480000000
-1,cook,R2,2050,5,estove,2045,all-year,all-week,morning,0.69170000000
-2,heat,R1,2045,6,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R1,2045,7,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R1,2045,9,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R1,2045,10,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R1,2050,7,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R1,2050,8,heatpump,2045,all-year,all-week,mid-afternoon,0.46110000000
-2,heat,R1,2050,10,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R1,2050,11,heatpump,2045,all-year,all-week,mid-afternoon,0.46110000000
-2,heat,R2,2045,6,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R2,2045,7,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R2,2045,9,heatpump,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,heat,R2,2045,10,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R2,2050,7,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R2,2050,8,heatpump,2045,all-year,all-week,mid-afternoon,0.46110000000
-2,heat,R2,2050,10,heatpump,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R2,2050,11,heatpump,2045,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R1,2045,0,estove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R1,2045,1,estove,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R1,2045,3,estove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R1,2045,4,estove,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R1,2050,1,estove,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R1,2050,2,estove,2045,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R1,2050,4,estove,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R1,2050,5,estove,2045,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R2,2045,0,estove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R2,2045,1,estove,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R2,2045,3,estove,2035,all-year,all-week,mid-afternoon,0.34210000000
-2,cook,R2,2045,4,estove,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R2,2050,1,estove,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R2,2050,2,estove,2045,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R2,2050,4,estove,2040,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R2,2050,5,estove,2045,all-year,all-week,mid-afternoon,0.46110000000
-3,heat,R1,2045,6,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R1,2045,7,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,heat,R1,2045,9,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R1,2045,10,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,heat,R1,2050,7,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,heat,R1,2050,8,heatpump,2045,all-year,all-week,early-peak,0.69170000000
-3,heat,R1,2050,10,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,heat,R1,2050,11,heatpump,2045,all-year,all-week,early-peak,0.69170000000
-3,heat,R2,2045,6,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R2,2045,7,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,heat,R2,2045,9,heatpump,2035,all-year,all-week,early-peak,0.51320000000
-3,heat,R2,2045,10,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,heat,R2,2050,7,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,heat,R2,2050,8,heatpump,2045,all-year,all-week,early-peak,0.69170000000
-3,heat,R2,2050,10,heatpump,2040,all-year,all-week,early-peak,0.91480000000
-3,heat,R2,2050,11,heatpump,2045,all-year,all-week,early-peak,0.69170000000
-3,cook,R1,2045,0,estove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R1,2045,1,estove,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R1,2045,3,estove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R1,2045,4,estove,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R1,2050,1,estove,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R1,2050,2,estove,2045,all-year,all-week,early-peak,0.69170000000
-3,cook,R1,2050,4,estove,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R1,2050,5,estove,2045,all-year,all-week,early-peak,0.69170000000
-3,cook,R2,2045,0,estove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R2,2045,1,estove,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R2,2045,3,estove,2035,all-year,all-week,early-peak,0.51320000000
-3,cook,R2,2045,4,estove,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R2,2050,1,estove,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R2,2050,2,estove,2045,all-year,all-week,early-peak,0.69170000000
-3,cook,R2,2050,4,estove,2040,all-year,all-week,early-peak,0.91480000000
-3,cook,R2,2050,5,estove,2045,all-year,all-week,early-peak,0.69170000000
-4,heat,R1,2045,6,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R1,2045,7,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,heat,R1,2045,9,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R1,2045,10,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,heat,R1,2050,7,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,heat,R1,2050,8,heatpump,2045,all-year,all-week,late-peak,1.38400000000
-4,heat,R1,2050,10,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,heat,R1,2050,11,heatpump,2045,all-year,all-week,late-peak,1.38400000000
-4,heat,R2,2045,6,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R2,2045,7,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,heat,R2,2045,9,heatpump,2035,all-year,all-week,late-peak,1.02680000000
-4,heat,R2,2045,10,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,heat,R2,2050,7,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,heat,R2,2050,8,heatpump,2045,all-year,all-week,late-peak,1.38400000000
-4,heat,R2,2050,10,heatpump,2040,all-year,all-week,late-peak,1.83050000000
-4,heat,R2,2050,11,heatpump,2045,all-year,all-week,late-peak,1.38400000000
-4,cook,R1,2045,0,estove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R1,2045,1,estove,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R1,2045,3,estove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R1,2045,4,estove,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R1,2050,1,estove,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R1,2050,2,estove,2045,all-year,all-week,late-peak,1.38400000000
-4,cook,R1,2050,4,estove,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R1,2050,5,estove,2045,all-year,all-week,late-peak,1.38400000000
-4,cook,R2,2045,0,estove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R2,2045,1,estove,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R2,2045,3,estove,2035,all-year,all-week,late-peak,1.02680000000
-4,cook,R2,2045,4,estove,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R2,2050,1,estove,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R2,2050,2,estove,2045,all-year,all-week,late-peak,1.38400000000
-4,cook,R2,2050,4,estove,2040,all-year,all-week,late-peak,1.83050000000
-4,cook,R2,2050,5,estove,2045,all-year,all-week,late-peak,1.38400000000
-5,heat,R1,2045,6,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R1,2045,7,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,heat,R1,2045,9,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R1,2045,10,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,heat,R1,2050,7,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,heat,R1,2050,8,heatpump,2045,all-year,all-week,evening,0.92290000000
-5,heat,R1,2050,10,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,heat,R1,2050,11,heatpump,2045,all-year,all-week,evening,0.92290000000
-5,heat,R2,2045,6,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R2,2045,7,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,heat,R2,2045,9,heatpump,2035,all-year,all-week,evening,0.68470000000
-5,heat,R2,2045,10,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,heat,R2,2050,7,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,heat,R2,2050,8,heatpump,2045,all-year,all-week,evening,0.92290000000
-5,heat,R2,2050,10,heatpump,2040,all-year,all-week,evening,1.22060000000
-5,heat,R2,2050,11,heatpump,2045,all-year,all-week,evening,0.92290000000
-5,cook,R1,2045,0,estove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R1,2045,1,estove,2040,all-year,all-week,evening,1.22060000000
-5,cook,R1,2045,3,estove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R1,2045,4,estove,2040,all-year,all-week,evening,1.22060000000
-5,cook,R1,2050,1,estove,2040,all-year,all-week,evening,1.22060000000
-5,cook,R1,2050,2,estove,2045,all-year,all-week,evening,0.92290000000
-5,cook,R1,2050,4,estove,2040,all-year,all-week,evening,1.22060000000
-5,cook,R1,2050,5,estove,2045,all-year,all-week,evening,0.92290000000
-5,cook,R2,2045,0,estove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R2,2045,1,estove,2040,all-year,all-week,evening,1.22060000000
-5,cook,R2,2045,3,estove,2035,all-year,all-week,evening,0.68470000000
-5,cook,R2,2045,4,estove,2040,all-year,all-week,evening,1.22060000000
-5,cook,R2,2050,1,estove,2040,all-year,all-week,evening,1.22060000000
-5,cook,R2,2050,2,estove,2045,all-year,all-week,evening,0.92290000000
-5,cook,R2,2050,4,estove,2040,all-year,all-week,evening,1.22060000000
-5,cook,R2,2050,5,estove,2045,all-year,all-week,evening,0.92290000000
-6,heat,R1,2045,6,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R1,2045,7,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,heat,R1,2045,9,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R1,2045,10,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,heat,R1,2050,7,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,heat,R1,2050,8,heatpump,2045,all-year,all-week,early-morning,0.92290000000
-6,heat,R1,2050,10,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,heat,R1,2050,11,heatpump,2045,all-year,all-week,early-morning,0.92290000000
-6,heat,R2,2045,6,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R2,2045,7,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,heat,R2,2045,9,heatpump,2035,all-year,all-week,early-morning,0.68470000000
-6,heat,R2,2045,10,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,heat,R2,2050,7,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,heat,R2,2050,8,heatpump,2045,all-year,all-week,early-morning,0.92290000000
-6,heat,R2,2050,10,heatpump,2040,all-year,all-week,early-morning,1.22060000000
-6,heat,R2,2050,11,heatpump,2045,all-year,all-week,early-morning,0.92290000000
-6,cook,R1,2045,0,estove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R1,2045,1,estove,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R1,2045,3,estove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R1,2045,4,estove,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R1,2050,1,estove,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R1,2050,2,estove,2045,all-year,all-week,early-morning,0.92290000000
-6,cook,R1,2050,4,estove,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R1,2050,5,estove,2045,all-year,all-week,early-morning,0.92290000000
-6,cook,R2,2045,0,estove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R2,2045,1,estove,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R2,2045,3,estove,2035,all-year,all-week,early-morning,0.68470000000
-6,cook,R2,2045,4,estove,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R2,2050,1,estove,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R2,2050,2,estove,2045,all-year,all-week,early-morning,0.92290000000
-6,cook,R2,2050,4,estove,2040,all-year,all-week,early-morning,1.22060000000
-6,cook,R2,2050,5,estove,2045,all-year,all-week,early-morning,0.92290000000
-7,heat,R1,2045,6,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R1,2045,7,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R1,2045,9,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R1,2045,10,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R1,2050,7,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R1,2050,8,heatpump,2045,all-year,all-week,late-afternoon,0.92290000000
-7,heat,R1,2050,10,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R1,2050,11,heatpump,2045,all-year,all-week,late-afternoon,0.92290000000
-7,heat,R2,2045,6,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R2,2045,7,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R2,2045,9,heatpump,2035,all-year,all-week,late-afternoon,0.68470000000
-7,heat,R2,2045,10,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R2,2050,7,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R2,2050,8,heatpump,2045,all-year,all-week,late-afternoon,0.92290000000
-7,heat,R2,2050,10,heatpump,2040,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R2,2050,11,heatpump,2045,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R1,2045,0,estove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R1,2045,1,estove,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R1,2045,3,estove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R1,2045,4,estove,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R1,2050,1,estove,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R1,2050,2,estove,2045,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R1,2050,4,estove,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R1,2050,5,estove,2045,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R2,2045,0,estove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R2,2045,1,estove,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R2,2045,3,estove,2035,all-year,all-week,late-afternoon,0.68470000000
-7,cook,R2,2045,4,estove,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R2,2050,1,estove,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R2,2050,2,estove,2045,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R2,2050,4,estove,2040,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R2,2050,5,estove,2045,all-year,all-week,late-afternoon,0.92290000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2045,6,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R1,2045,7,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R1,2045,9,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R1,2045,10,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R1,2050,7,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R1,2050,8,all-year,all-week,night,heatpump,2045,0.46110000000
+0,heat,R1,2050,10,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R1,2050,11,all-year,all-week,night,heatpump,2045,0.46110000000
+0,heat,R2,2045,6,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R2,2045,7,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R2,2045,9,all-year,all-week,night,heatpump,2035,0.34210000000
+0,heat,R2,2045,10,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R2,2050,7,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R2,2050,8,all-year,all-week,night,heatpump,2045,0.46110000000
+0,heat,R2,2050,10,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R2,2050,11,all-year,all-week,night,heatpump,2045,0.46110000000
+0,cook,R1,2045,0,all-year,all-week,night,estove,2035,0.34210000000
+0,cook,R1,2045,1,all-year,all-week,night,estove,2040,0.60990000000
+0,cook,R1,2045,3,all-year,all-week,night,estove,2035,0.34210000000
+0,cook,R1,2045,4,all-year,all-week,night,estove,2040,0.60990000000
+0,cook,R1,2050,1,all-year,all-week,night,estove,2040,0.60990000000
+0,cook,R1,2050,2,all-year,all-week,night,estove,2045,0.46110000000
+0,cook,R1,2050,4,all-year,all-week,night,estove,2040,0.60990000000
+0,cook,R1,2050,5,all-year,all-week,night,estove,2045,0.46110000000
+0,cook,R2,2045,0,all-year,all-week,night,estove,2035,0.34210000000
+0,cook,R2,2045,1,all-year,all-week,night,estove,2040,0.60990000000
+0,cook,R2,2045,3,all-year,all-week,night,estove,2035,0.34210000000
+0,cook,R2,2045,4,all-year,all-week,night,estove,2040,0.60990000000
+0,cook,R2,2050,1,all-year,all-week,night,estove,2040,0.60990000000
+0,cook,R2,2050,2,all-year,all-week,night,estove,2045,0.46110000000
+0,cook,R2,2050,4,all-year,all-week,night,estove,2040,0.60990000000
+0,cook,R2,2050,5,all-year,all-week,night,estove,2045,0.46110000000
+1,heat,R1,2045,6,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R1,2045,7,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R1,2045,9,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R1,2045,10,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R1,2050,7,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R1,2050,8,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,heat,R1,2050,10,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R1,2050,11,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,heat,R2,2045,6,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R2,2045,7,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R2,2045,9,all-year,all-week,morning,heatpump,2035,0.51320000000
+1,heat,R2,2045,10,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R2,2050,7,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R2,2050,8,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,heat,R2,2050,10,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R2,2050,11,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,cook,R1,2045,0,all-year,all-week,morning,estove,2035,0.51320000000
+1,cook,R1,2045,1,all-year,all-week,morning,estove,2040,0.91480000000
+1,cook,R1,2045,3,all-year,all-week,morning,estove,2035,0.51320000000
+1,cook,R1,2045,4,all-year,all-week,morning,estove,2040,0.91480000000
+1,cook,R1,2050,1,all-year,all-week,morning,estove,2040,0.91480000000
+1,cook,R1,2050,2,all-year,all-week,morning,estove,2045,0.69170000000
+1,cook,R1,2050,4,all-year,all-week,morning,estove,2040,0.91480000000
+1,cook,R1,2050,5,all-year,all-week,morning,estove,2045,0.69170000000
+1,cook,R2,2045,0,all-year,all-week,morning,estove,2035,0.51320000000
+1,cook,R2,2045,1,all-year,all-week,morning,estove,2040,0.91480000000
+1,cook,R2,2045,3,all-year,all-week,morning,estove,2035,0.51320000000
+1,cook,R2,2045,4,all-year,all-week,morning,estove,2040,0.91480000000
+1,cook,R2,2050,1,all-year,all-week,morning,estove,2040,0.91480000000
+1,cook,R2,2050,2,all-year,all-week,morning,estove,2045,0.69170000000
+1,cook,R2,2050,4,all-year,all-week,morning,estove,2040,0.91480000000
+1,cook,R2,2050,5,all-year,all-week,morning,estove,2045,0.69170000000
+2,heat,R1,2045,6,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R1,2045,7,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R1,2045,9,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R1,2045,10,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R1,2050,7,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R1,2050,8,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,heat,R1,2050,10,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R1,2050,11,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,heat,R2,2045,6,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R2,2045,7,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R2,2045,9,all-year,all-week,mid-afternoon,heatpump,2035,0.34210000000
+2,heat,R2,2045,10,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R2,2050,7,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R2,2050,8,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,heat,R2,2050,10,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R2,2050,11,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,cook,R1,2045,0,all-year,all-week,mid-afternoon,estove,2035,0.34210000000
+2,cook,R1,2045,1,all-year,all-week,mid-afternoon,estove,2040,0.60990000000
+2,cook,R1,2045,3,all-year,all-week,mid-afternoon,estove,2035,0.34210000000
+2,cook,R1,2045,4,all-year,all-week,mid-afternoon,estove,2040,0.60990000000
+2,cook,R1,2050,1,all-year,all-week,mid-afternoon,estove,2040,0.60990000000
+2,cook,R1,2050,2,all-year,all-week,mid-afternoon,estove,2045,0.46110000000
+2,cook,R1,2050,4,all-year,all-week,mid-afternoon,estove,2040,0.60990000000
+2,cook,R1,2050,5,all-year,all-week,mid-afternoon,estove,2045,0.46110000000
+2,cook,R2,2045,0,all-year,all-week,mid-afternoon,estove,2035,0.34210000000
+2,cook,R2,2045,1,all-year,all-week,mid-afternoon,estove,2040,0.60990000000
+2,cook,R2,2045,3,all-year,all-week,mid-afternoon,estove,2035,0.34210000000
+2,cook,R2,2045,4,all-year,all-week,mid-afternoon,estove,2040,0.60990000000
+2,cook,R2,2050,1,all-year,all-week,mid-afternoon,estove,2040,0.60990000000
+2,cook,R2,2050,2,all-year,all-week,mid-afternoon,estove,2045,0.46110000000
+2,cook,R2,2050,4,all-year,all-week,mid-afternoon,estove,2040,0.60990000000
+2,cook,R2,2050,5,all-year,all-week,mid-afternoon,estove,2045,0.46110000000
+3,heat,R1,2045,6,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R1,2045,7,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R1,2045,9,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R1,2045,10,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R1,2050,7,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R1,2050,8,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,heat,R1,2050,10,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R1,2050,11,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,heat,R2,2045,6,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R2,2045,7,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R2,2045,9,all-year,all-week,early-peak,heatpump,2035,0.51320000000
+3,heat,R2,2045,10,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R2,2050,7,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R2,2050,8,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,heat,R2,2050,10,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R2,2050,11,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,cook,R1,2045,0,all-year,all-week,early-peak,estove,2035,0.51320000000
+3,cook,R1,2045,1,all-year,all-week,early-peak,estove,2040,0.91480000000
+3,cook,R1,2045,3,all-year,all-week,early-peak,estove,2035,0.51320000000
+3,cook,R1,2045,4,all-year,all-week,early-peak,estove,2040,0.91480000000
+3,cook,R1,2050,1,all-year,all-week,early-peak,estove,2040,0.91480000000
+3,cook,R1,2050,2,all-year,all-week,early-peak,estove,2045,0.69170000000
+3,cook,R1,2050,4,all-year,all-week,early-peak,estove,2040,0.91480000000
+3,cook,R1,2050,5,all-year,all-week,early-peak,estove,2045,0.69170000000
+3,cook,R2,2045,0,all-year,all-week,early-peak,estove,2035,0.51320000000
+3,cook,R2,2045,1,all-year,all-week,early-peak,estove,2040,0.91480000000
+3,cook,R2,2045,3,all-year,all-week,early-peak,estove,2035,0.51320000000
+3,cook,R2,2045,4,all-year,all-week,early-peak,estove,2040,0.91480000000
+3,cook,R2,2050,1,all-year,all-week,early-peak,estove,2040,0.91480000000
+3,cook,R2,2050,2,all-year,all-week,early-peak,estove,2045,0.69170000000
+3,cook,R2,2050,4,all-year,all-week,early-peak,estove,2040,0.91480000000
+3,cook,R2,2050,5,all-year,all-week,early-peak,estove,2045,0.69170000000
+4,heat,R1,2045,6,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R1,2045,7,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R1,2045,9,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R1,2045,10,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R1,2050,7,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R1,2050,8,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,heat,R1,2050,10,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R1,2050,11,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,heat,R2,2045,6,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R2,2045,7,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R2,2045,9,all-year,all-week,late-peak,heatpump,2035,1.02680000000
+4,heat,R2,2045,10,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R2,2050,7,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R2,2050,8,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,heat,R2,2050,10,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R2,2050,11,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,cook,R1,2045,0,all-year,all-week,late-peak,estove,2035,1.02680000000
+4,cook,R1,2045,1,all-year,all-week,late-peak,estove,2040,1.83050000000
+4,cook,R1,2045,3,all-year,all-week,late-peak,estove,2035,1.02680000000
+4,cook,R1,2045,4,all-year,all-week,late-peak,estove,2040,1.83050000000
+4,cook,R1,2050,1,all-year,all-week,late-peak,estove,2040,1.83050000000
+4,cook,R1,2050,2,all-year,all-week,late-peak,estove,2045,1.38400000000
+4,cook,R1,2050,4,all-year,all-week,late-peak,estove,2040,1.83050000000
+4,cook,R1,2050,5,all-year,all-week,late-peak,estove,2045,1.38400000000
+4,cook,R2,2045,0,all-year,all-week,late-peak,estove,2035,1.02680000000
+4,cook,R2,2045,1,all-year,all-week,late-peak,estove,2040,1.83050000000
+4,cook,R2,2045,3,all-year,all-week,late-peak,estove,2035,1.02680000000
+4,cook,R2,2045,4,all-year,all-week,late-peak,estove,2040,1.83050000000
+4,cook,R2,2050,1,all-year,all-week,late-peak,estove,2040,1.83050000000
+4,cook,R2,2050,2,all-year,all-week,late-peak,estove,2045,1.38400000000
+4,cook,R2,2050,4,all-year,all-week,late-peak,estove,2040,1.83050000000
+4,cook,R2,2050,5,all-year,all-week,late-peak,estove,2045,1.38400000000
+5,heat,R1,2045,6,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R1,2045,7,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R1,2045,9,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R1,2045,10,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R1,2050,7,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R1,2050,8,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,heat,R1,2050,10,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R1,2050,11,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,heat,R2,2045,6,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R2,2045,7,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R2,2045,9,all-year,all-week,evening,heatpump,2035,0.68470000000
+5,heat,R2,2045,10,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R2,2050,7,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R2,2050,8,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,heat,R2,2050,10,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R2,2050,11,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,cook,R1,2045,0,all-year,all-week,evening,estove,2035,0.68470000000
+5,cook,R1,2045,1,all-year,all-week,evening,estove,2040,1.22060000000
+5,cook,R1,2045,3,all-year,all-week,evening,estove,2035,0.68470000000
+5,cook,R1,2045,4,all-year,all-week,evening,estove,2040,1.22060000000
+5,cook,R1,2050,1,all-year,all-week,evening,estove,2040,1.22060000000
+5,cook,R1,2050,2,all-year,all-week,evening,estove,2045,0.92290000000
+5,cook,R1,2050,4,all-year,all-week,evening,estove,2040,1.22060000000
+5,cook,R1,2050,5,all-year,all-week,evening,estove,2045,0.92290000000
+5,cook,R2,2045,0,all-year,all-week,evening,estove,2035,0.68470000000
+5,cook,R2,2045,1,all-year,all-week,evening,estove,2040,1.22060000000
+5,cook,R2,2045,3,all-year,all-week,evening,estove,2035,0.68470000000
+5,cook,R2,2045,4,all-year,all-week,evening,estove,2040,1.22060000000
+5,cook,R2,2050,1,all-year,all-week,evening,estove,2040,1.22060000000
+5,cook,R2,2050,2,all-year,all-week,evening,estove,2045,0.92290000000
+5,cook,R2,2050,4,all-year,all-week,evening,estove,2040,1.22060000000
+5,cook,R2,2050,5,all-year,all-week,evening,estove,2045,0.92290000000
+6,heat,R1,2045,6,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R1,2045,7,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R1,2045,9,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R1,2045,10,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R1,2050,7,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R1,2050,8,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,heat,R1,2050,10,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R1,2050,11,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,heat,R2,2045,6,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R2,2045,7,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R2,2045,9,all-year,all-week,early-morning,heatpump,2035,0.68470000000
+6,heat,R2,2045,10,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R2,2050,7,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R2,2050,8,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,heat,R2,2050,10,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R2,2050,11,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,cook,R1,2045,0,all-year,all-week,early-morning,estove,2035,0.68470000000
+6,cook,R1,2045,1,all-year,all-week,early-morning,estove,2040,1.22060000000
+6,cook,R1,2045,3,all-year,all-week,early-morning,estove,2035,0.68470000000
+6,cook,R1,2045,4,all-year,all-week,early-morning,estove,2040,1.22060000000
+6,cook,R1,2050,1,all-year,all-week,early-morning,estove,2040,1.22060000000
+6,cook,R1,2050,2,all-year,all-week,early-morning,estove,2045,0.92290000000
+6,cook,R1,2050,4,all-year,all-week,early-morning,estove,2040,1.22060000000
+6,cook,R1,2050,5,all-year,all-week,early-morning,estove,2045,0.92290000000
+6,cook,R2,2045,0,all-year,all-week,early-morning,estove,2035,0.68470000000
+6,cook,R2,2045,1,all-year,all-week,early-morning,estove,2040,1.22060000000
+6,cook,R2,2045,3,all-year,all-week,early-morning,estove,2035,0.68470000000
+6,cook,R2,2045,4,all-year,all-week,early-morning,estove,2040,1.22060000000
+6,cook,R2,2050,1,all-year,all-week,early-morning,estove,2040,1.22060000000
+6,cook,R2,2050,2,all-year,all-week,early-morning,estove,2045,0.92290000000
+6,cook,R2,2050,4,all-year,all-week,early-morning,estove,2040,1.22060000000
+6,cook,R2,2050,5,all-year,all-week,early-morning,estove,2045,0.92290000000
+7,heat,R1,2045,6,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R1,2045,7,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R1,2045,9,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R1,2045,10,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R1,2050,7,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R1,2050,8,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,heat,R1,2050,10,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R1,2050,11,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,heat,R2,2045,6,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R2,2045,7,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R2,2045,9,all-year,all-week,late-afternoon,heatpump,2035,0.68470000000
+7,heat,R2,2045,10,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R2,2050,7,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R2,2050,8,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,heat,R2,2050,10,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R2,2050,11,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,cook,R1,2045,0,all-year,all-week,late-afternoon,estove,2035,0.68470000000
+7,cook,R1,2045,1,all-year,all-week,late-afternoon,estove,2040,1.22060000000
+7,cook,R1,2045,3,all-year,all-week,late-afternoon,estove,2035,0.68470000000
+7,cook,R1,2045,4,all-year,all-week,late-afternoon,estove,2040,1.22060000000
+7,cook,R1,2050,1,all-year,all-week,late-afternoon,estove,2040,1.22060000000
+7,cook,R1,2050,2,all-year,all-week,late-afternoon,estove,2045,0.92290000000
+7,cook,R1,2050,4,all-year,all-week,late-afternoon,estove,2040,1.22060000000
+7,cook,R1,2050,5,all-year,all-week,late-afternoon,estove,2045,0.92290000000
+7,cook,R2,2045,0,all-year,all-week,late-afternoon,estove,2035,0.68470000000
+7,cook,R2,2045,1,all-year,all-week,late-afternoon,estove,2040,1.22060000000
+7,cook,R2,2045,3,all-year,all-week,late-afternoon,estove,2035,0.68470000000
+7,cook,R2,2045,4,all-year,all-week,late-afternoon,estove,2040,1.22060000000
+7,cook,R2,2050,1,all-year,all-week,late-afternoon,estove,2040,1.22060000000
+7,cook,R2,2050,2,all-year,all-week,late-afternoon,estove,2045,0.92290000000
+7,cook,R2,2050,4,all-year,all-week,late-afternoon,estove,2040,1.22060000000
+7,cook,R2,2050,5,all-year,all-week,late-afternoon,estove,2045,0.92290000000
diff --git a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2050.csv b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2050.csv
index f046e7e75..bce2faa62 100644
--- a/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/5-add-service-demand/1-new-service-demand/Results/Residential/Supply/2050.csv
@@ -1,257 +1,257 @@
-timeslice,commodity,region,year,asset,installed,technology,month,day,hour,supply
-0,heat,R1,2050,3,2040,heatpump,all-year,all-week,night,0.60990000000
-0,heat,R1,2050,5,2045,heatpump,all-year,all-week,night,0.46110000000
-0,heat,R1,2050,11,2040,heatpump,all-year,all-week,night,0.60990000000
-0,heat,R1,2050,13,2045,heatpump,all-year,all-week,night,0.46110000000
-0,heat,R1,2055,5,2045,heatpump,all-year,all-week,night,0.46110000000
-0,heat,R1,2055,7,2050,heatpump,all-year,all-week,night,0.60990000000
-0,heat,R1,2055,13,2045,heatpump,all-year,all-week,night,0.46110000000
-0,heat,R1,2055,15,2050,heatpump,all-year,all-week,night,0.60990000000
-0,heat,R2,2050,3,2040,heatpump,all-year,all-week,night,0.60990000000
-0,heat,R2,2050,5,2045,heatpump,all-year,all-week,night,0.46110000000
-0,heat,R2,2050,11,2040,heatpump,all-year,all-week,night,0.60990000000
-0,heat,R2,2050,13,2045,heatpump,all-year,all-week,night,0.46110000000
-0,heat,R2,2055,5,2045,heatpump,all-year,all-week,night,0.46110000000
-0,heat,R2,2055,7,2050,heatpump,all-year,all-week,night,0.60990000000
-0,heat,R2,2055,13,2045,heatpump,all-year,all-week,night,0.46110000000
-0,heat,R2,2055,15,2050,heatpump,all-year,all-week,night,0.60990000000
-0,cook,R1,2050,2,2040,estove,all-year,all-week,night,0.60990000000
-0,cook,R1,2050,4,2045,estove,all-year,all-week,night,0.46110000000
-0,cook,R1,2050,10,2040,estove,all-year,all-week,night,0.60990000000
-0,cook,R1,2050,12,2045,estove,all-year,all-week,night,0.46110000000
-0,cook,R1,2055,4,2045,estove,all-year,all-week,night,0.46110000000
-0,cook,R1,2055,6,2050,estove,all-year,all-week,night,0.60990000000
-0,cook,R1,2055,12,2045,estove,all-year,all-week,night,0.46110000000
-0,cook,R1,2055,14,2050,estove,all-year,all-week,night,0.60990000000
-0,cook,R2,2050,2,2040,estove,all-year,all-week,night,0.60990000000
-0,cook,R2,2050,4,2045,estove,all-year,all-week,night,0.46110000000
-0,cook,R2,2050,10,2040,estove,all-year,all-week,night,0.60990000000
-0,cook,R2,2050,12,2045,estove,all-year,all-week,night,0.46110000000
-0,cook,R2,2055,4,2045,estove,all-year,all-week,night,0.46110000000
-0,cook,R2,2055,6,2050,estove,all-year,all-week,night,0.60990000000
-0,cook,R2,2055,12,2045,estove,all-year,all-week,night,0.46110000000
-0,cook,R2,2055,14,2050,estove,all-year,all-week,night,0.60990000000
-1,heat,R1,2050,3,2040,heatpump,all-year,all-week,morning,0.91480000000
-1,heat,R1,2050,5,2045,heatpump,all-year,all-week,morning,0.69170000000
-1,heat,R1,2050,11,2040,heatpump,all-year,all-week,morning,0.91480000000
-1,heat,R1,2050,13,2045,heatpump,all-year,all-week,morning,0.69170000000
-1,heat,R1,2055,5,2045,heatpump,all-year,all-week,morning,0.69170000000
-1,heat,R1,2055,7,2050,heatpump,all-year,all-week,morning,0.91480000000
-1,heat,R1,2055,13,2045,heatpump,all-year,all-week,morning,0.69170000000
-1,heat,R1,2055,15,2050,heatpump,all-year,all-week,morning,0.91480000000
-1,heat,R2,2050,3,2040,heatpump,all-year,all-week,morning,0.91480000000
-1,heat,R2,2050,5,2045,heatpump,all-year,all-week,morning,0.69170000000
-1,heat,R2,2050,11,2040,heatpump,all-year,all-week,morning,0.91480000000
-1,heat,R2,2050,13,2045,heatpump,all-year,all-week,morning,0.69170000000
-1,heat,R2,2055,5,2045,heatpump,all-year,all-week,morning,0.69170000000
-1,heat,R2,2055,7,2050,heatpump,all-year,all-week,morning,0.91480000000
-1,heat,R2,2055,13,2045,heatpump,all-year,all-week,morning,0.69170000000
-1,heat,R2,2055,15,2050,heatpump,all-year,all-week,morning,0.91480000000
-1,cook,R1,2050,2,2040,estove,all-year,all-week,morning,0.91480000000
-1,cook,R1,2050,4,2045,estove,all-year,all-week,morning,0.69170000000
-1,cook,R1,2050,10,2040,estove,all-year,all-week,morning,0.91480000000
-1,cook,R1,2050,12,2045,estove,all-year,all-week,morning,0.69170000000
-1,cook,R1,2055,4,2045,estove,all-year,all-week,morning,0.69170000000
-1,cook,R1,2055,6,2050,estove,all-year,all-week,morning,0.91480000000
-1,cook,R1,2055,12,2045,estove,all-year,all-week,morning,0.69170000000
-1,cook,R1,2055,14,2050,estove,all-year,all-week,morning,0.91480000000
-1,cook,R2,2050,2,2040,estove,all-year,all-week,morning,0.91480000000
-1,cook,R2,2050,4,2045,estove,all-year,all-week,morning,0.69170000000
-1,cook,R2,2050,10,2040,estove,all-year,all-week,morning,0.91480000000
-1,cook,R2,2050,12,2045,estove,all-year,all-week,morning,0.69170000000
-1,cook,R2,2055,4,2045,estove,all-year,all-week,morning,0.69170000000
-1,cook,R2,2055,6,2050,estove,all-year,all-week,morning,0.91480000000
-1,cook,R2,2055,12,2045,estove,all-year,all-week,morning,0.69170000000
-1,cook,R2,2055,14,2050,estove,all-year,all-week,morning,0.91480000000
-2,heat,R1,2050,3,2040,heatpump,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R1,2050,5,2045,heatpump,all-year,all-week,mid-afternoon,0.46110000000
-2,heat,R1,2050,11,2040,heatpump,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R1,2050,13,2045,heatpump,all-year,all-week,mid-afternoon,0.46110000000
-2,heat,R1,2055,5,2045,heatpump,all-year,all-week,mid-afternoon,0.46110000000
-2,heat,R1,2055,7,2050,heatpump,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R1,2055,13,2045,heatpump,all-year,all-week,mid-afternoon,0.46110000000
-2,heat,R1,2055,15,2050,heatpump,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R2,2050,3,2040,heatpump,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R2,2050,5,2045,heatpump,all-year,all-week,mid-afternoon,0.46110000000
-2,heat,R2,2050,11,2040,heatpump,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R2,2050,13,2045,heatpump,all-year,all-week,mid-afternoon,0.46110000000
-2,heat,R2,2055,5,2045,heatpump,all-year,all-week,mid-afternoon,0.46110000000
-2,heat,R2,2055,7,2050,heatpump,all-year,all-week,mid-afternoon,0.60990000000
-2,heat,R2,2055,13,2045,heatpump,all-year,all-week,mid-afternoon,0.46110000000
-2,heat,R2,2055,15,2050,heatpump,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R1,2050,2,2040,estove,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R1,2050,4,2045,estove,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R1,2050,10,2040,estove,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R1,2050,12,2045,estove,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R1,2055,4,2045,estove,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R1,2055,6,2050,estove,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R1,2055,12,2045,estove,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R1,2055,14,2050,estove,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R2,2050,2,2040,estove,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R2,2050,4,2045,estove,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R2,2050,10,2040,estove,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R2,2050,12,2045,estove,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R2,2055,4,2045,estove,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R2,2055,6,2050,estove,all-year,all-week,mid-afternoon,0.60990000000
-2,cook,R2,2055,12,2045,estove,all-year,all-week,mid-afternoon,0.46110000000
-2,cook,R2,2055,14,2050,estove,all-year,all-week,mid-afternoon,0.60990000000
-3,heat,R1,2050,3,2040,heatpump,all-year,all-week,early-peak,0.91480000000
-3,heat,R1,2050,5,2045,heatpump,all-year,all-week,early-peak,0.69170000000
-3,heat,R1,2050,11,2040,heatpump,all-year,all-week,early-peak,0.91480000000
-3,heat,R1,2050,13,2045,heatpump,all-year,all-week,early-peak,0.69170000000
-3,heat,R1,2055,5,2045,heatpump,all-year,all-week,early-peak,0.69170000000
-3,heat,R1,2055,7,2050,heatpump,all-year,all-week,early-peak,0.91480000000
-3,heat,R1,2055,13,2045,heatpump,all-year,all-week,early-peak,0.69170000000
-3,heat,R1,2055,15,2050,heatpump,all-year,all-week,early-peak,0.91480000000
-3,heat,R2,2050,3,2040,heatpump,all-year,all-week,early-peak,0.91480000000
-3,heat,R2,2050,5,2045,heatpump,all-year,all-week,early-peak,0.69170000000
-3,heat,R2,2050,11,2040,heatpump,all-year,all-week,early-peak,0.91480000000
-3,heat,R2,2050,13,2045,heatpump,all-year,all-week,early-peak,0.69170000000
-3,heat,R2,2055,5,2045,heatpump,all-year,all-week,early-peak,0.69170000000
-3,heat,R2,2055,7,2050,heatpump,all-year,all-week,early-peak,0.91480000000
-3,heat,R2,2055,13,2045,heatpump,all-year,all-week,early-peak,0.69170000000
-3,heat,R2,2055,15,2050,heatpump,all-year,all-week,early-peak,0.91480000000
-3,cook,R1,2050,2,2040,estove,all-year,all-week,early-peak,0.91480000000
-3,cook,R1,2050,4,2045,estove,all-year,all-week,early-peak,0.69170000000
-3,cook,R1,2050,10,2040,estove,all-year,all-week,early-peak,0.91480000000
-3,cook,R1,2050,12,2045,estove,all-year,all-week,early-peak,0.69170000000
-3,cook,R1,2055,4,2045,estove,all-year,all-week,early-peak,0.69170000000
-3,cook,R1,2055,6,2050,estove,all-year,all-week,early-peak,0.91480000000
-3,cook,R1,2055,12,2045,estove,all-year,all-week,early-peak,0.69170000000
-3,cook,R1,2055,14,2050,estove,all-year,all-week,early-peak,0.91480000000
-3,cook,R2,2050,2,2040,estove,all-year,all-week,early-peak,0.91480000000
-3,cook,R2,2050,4,2045,estove,all-year,all-week,early-peak,0.69170000000
-3,cook,R2,2050,10,2040,estove,all-year,all-week,early-peak,0.91480000000
-3,cook,R2,2050,12,2045,estove,all-year,all-week,early-peak,0.69170000000
-3,cook,R2,2055,4,2045,estove,all-year,all-week,early-peak,0.69170000000
-3,cook,R2,2055,6,2050,estove,all-year,all-week,early-peak,0.91480000000
-3,cook,R2,2055,12,2045,estove,all-year,all-week,early-peak,0.69170000000
-3,cook,R2,2055,14,2050,estove,all-year,all-week,early-peak,0.91480000000
-4,heat,R1,2050,3,2040,heatpump,all-year,all-week,late-peak,1.83050000000
-4,heat,R1,2050,5,2045,heatpump,all-year,all-week,late-peak,1.38400000000
-4,heat,R1,2050,11,2040,heatpump,all-year,all-week,late-peak,1.83050000000
-4,heat,R1,2050,13,2045,heatpump,all-year,all-week,late-peak,1.38400000000
-4,heat,R1,2055,5,2045,heatpump,all-year,all-week,late-peak,1.38400000000
-4,heat,R1,2055,7,2050,heatpump,all-year,all-week,late-peak,1.83050000000
-4,heat,R1,2055,13,2045,heatpump,all-year,all-week,late-peak,1.38400000000
-4,heat,R1,2055,15,2050,heatpump,all-year,all-week,late-peak,1.83050000000
-4,heat,R2,2050,3,2040,heatpump,all-year,all-week,late-peak,1.83050000000
-4,heat,R2,2050,5,2045,heatpump,all-year,all-week,late-peak,1.38400000000
-4,heat,R2,2050,11,2040,heatpump,all-year,all-week,late-peak,1.83050000000
-4,heat,R2,2050,13,2045,heatpump,all-year,all-week,late-peak,1.38400000000
-4,heat,R2,2055,5,2045,heatpump,all-year,all-week,late-peak,1.38400000000
-4,heat,R2,2055,7,2050,heatpump,all-year,all-week,late-peak,1.83050000000
-4,heat,R2,2055,13,2045,heatpump,all-year,all-week,late-peak,1.38400000000
-4,heat,R2,2055,15,2050,heatpump,all-year,all-week,late-peak,1.83050000000
-4,cook,R1,2050,2,2040,estove,all-year,all-week,late-peak,1.83050000000
-4,cook,R1,2050,4,2045,estove,all-year,all-week,late-peak,1.38400000000
-4,cook,R1,2050,10,2040,estove,all-year,all-week,late-peak,1.83050000000
-4,cook,R1,2050,12,2045,estove,all-year,all-week,late-peak,1.38400000000
-4,cook,R1,2055,4,2045,estove,all-year,all-week,late-peak,1.38400000000
-4,cook,R1,2055,6,2050,estove,all-year,all-week,late-peak,1.83050000000
-4,cook,R1,2055,12,2045,estove,all-year,all-week,late-peak,1.38400000000
-4,cook,R1,2055,14,2050,estove,all-year,all-week,late-peak,1.83050000000
-4,cook,R2,2050,2,2040,estove,all-year,all-week,late-peak,1.83050000000
-4,cook,R2,2050,4,2045,estove,all-year,all-week,late-peak,1.38400000000
-4,cook,R2,2050,10,2040,estove,all-year,all-week,late-peak,1.83050000000
-4,cook,R2,2050,12,2045,estove,all-year,all-week,late-peak,1.38400000000
-4,cook,R2,2055,4,2045,estove,all-year,all-week,late-peak,1.38400000000
-4,cook,R2,2055,6,2050,estove,all-year,all-week,late-peak,1.83050000000
-4,cook,R2,2055,12,2045,estove,all-year,all-week,late-peak,1.38400000000
-4,cook,R2,2055,14,2050,estove,all-year,all-week,late-peak,1.83050000000
-5,heat,R1,2050,3,2040,heatpump,all-year,all-week,evening,1.22060000000
-5,heat,R1,2050,5,2045,heatpump,all-year,all-week,evening,0.92290000000
-5,heat,R1,2050,11,2040,heatpump,all-year,all-week,evening,1.22060000000
-5,heat,R1,2050,13,2045,heatpump,all-year,all-week,evening,0.92290000000
-5,heat,R1,2055,5,2045,heatpump,all-year,all-week,evening,0.92290000000
-5,heat,R1,2055,7,2050,heatpump,all-year,all-week,evening,1.22060000000
-5,heat,R1,2055,13,2045,heatpump,all-year,all-week,evening,0.92290000000
-5,heat,R1,2055,15,2050,heatpump,all-year,all-week,evening,1.22060000000
-5,heat,R2,2050,3,2040,heatpump,all-year,all-week,evening,1.22060000000
-5,heat,R2,2050,5,2045,heatpump,all-year,all-week,evening,0.92290000000
-5,heat,R2,2050,11,2040,heatpump,all-year,all-week,evening,1.22060000000
-5,heat,R2,2050,13,2045,heatpump,all-year,all-week,evening,0.92290000000
-5,heat,R2,2055,5,2045,heatpump,all-year,all-week,evening,0.92290000000
-5,heat,R2,2055,7,2050,heatpump,all-year,all-week,evening,1.22060000000
-5,heat,R2,2055,13,2045,heatpump,all-year,all-week,evening,0.92290000000
-5,heat,R2,2055,15,2050,heatpump,all-year,all-week,evening,1.22060000000
-5,cook,R1,2050,2,2040,estove,all-year,all-week,evening,1.22060000000
-5,cook,R1,2050,4,2045,estove,all-year,all-week,evening,0.92290000000
-5,cook,R1,2050,10,2040,estove,all-year,all-week,evening,1.22060000000
-5,cook,R1,2050,12,2045,estove,all-year,all-week,evening,0.92290000000
-5,cook,R1,2055,4,2045,estove,all-year,all-week,evening,0.92290000000
-5,cook,R1,2055,6,2050,estove,all-year,all-week,evening,1.22060000000
-5,cook,R1,2055,12,2045,estove,all-year,all-week,evening,0.92290000000
-5,cook,R1,2055,14,2050,estove,all-year,all-week,evening,1.22060000000
-5,cook,R2,2050,2,2040,estove,all-year,all-week,evening,1.22060000000
-5,cook,R2,2050,4,2045,estove,all-year,all-week,evening,0.92290000000
-5,cook,R2,2050,10,2040,estove,all-year,all-week,evening,1.22060000000
-5,cook,R2,2050,12,2045,estove,all-year,all-week,evening,0.92290000000
-5,cook,R2,2055,4,2045,estove,all-year,all-week,evening,0.92290000000
-5,cook,R2,2055,6,2050,estove,all-year,all-week,evening,1.22060000000
-5,cook,R2,2055,12,2045,estove,all-year,all-week,evening,0.92290000000
-5,cook,R2,2055,14,2050,estove,all-year,all-week,evening,1.22060000000
-6,heat,R1,2050,3,2040,heatpump,all-year,all-week,early-morning,1.22060000000
-6,heat,R1,2050,5,2045,heatpump,all-year,all-week,early-morning,0.92290000000
-6,heat,R1,2050,11,2040,heatpump,all-year,all-week,early-morning,1.22060000000
-6,heat,R1,2050,13,2045,heatpump,all-year,all-week,early-morning,0.92290000000
-6,heat,R1,2055,5,2045,heatpump,all-year,all-week,early-morning,0.92290000000
-6,heat,R1,2055,7,2050,heatpump,all-year,all-week,early-morning,1.22060000000
-6,heat,R1,2055,13,2045,heatpump,all-year,all-week,early-morning,0.92290000000
-6,heat,R1,2055,15,2050,heatpump,all-year,all-week,early-morning,1.22060000000
-6,heat,R2,2050,3,2040,heatpump,all-year,all-week,early-morning,1.22060000000
-6,heat,R2,2050,5,2045,heatpump,all-year,all-week,early-morning,0.92290000000
-6,heat,R2,2050,11,2040,heatpump,all-year,all-week,early-morning,1.22060000000
-6,heat,R2,2050,13,2045,heatpump,all-year,all-week,early-morning,0.92290000000
-6,heat,R2,2055,5,2045,heatpump,all-year,all-week,early-morning,0.92290000000
-6,heat,R2,2055,7,2050,heatpump,all-year,all-week,early-morning,1.22060000000
-6,heat,R2,2055,13,2045,heatpump,all-year,all-week,early-morning,0.92290000000
-6,heat,R2,2055,15,2050,heatpump,all-year,all-week,early-morning,1.22060000000
-6,cook,R1,2050,2,2040,estove,all-year,all-week,early-morning,1.22060000000
-6,cook,R1,2050,4,2045,estove,all-year,all-week,early-morning,0.92290000000
-6,cook,R1,2050,10,2040,estove,all-year,all-week,early-morning,1.22060000000
-6,cook,R1,2050,12,2045,estove,all-year,all-week,early-morning,0.92290000000
-6,cook,R1,2055,4,2045,estove,all-year,all-week,early-morning,0.92290000000
-6,cook,R1,2055,6,2050,estove,all-year,all-week,early-morning,1.22060000000
-6,cook,R1,2055,12,2045,estove,all-year,all-week,early-morning,0.92290000000
-6,cook,R1,2055,14,2050,estove,all-year,all-week,early-morning,1.22060000000
-6,cook,R2,2050,2,2040,estove,all-year,all-week,early-morning,1.22060000000
-6,cook,R2,2050,4,2045,estove,all-year,all-week,early-morning,0.92290000000
-6,cook,R2,2050,10,2040,estove,all-year,all-week,early-morning,1.22060000000
-6,cook,R2,2050,12,2045,estove,all-year,all-week,early-morning,0.92290000000
-6,cook,R2,2055,4,2045,estove,all-year,all-week,early-morning,0.92290000000
-6,cook,R2,2055,6,2050,estove,all-year,all-week,early-morning,1.22060000000
-6,cook,R2,2055,12,2045,estove,all-year,all-week,early-morning,0.92290000000
-6,cook,R2,2055,14,2050,estove,all-year,all-week,early-morning,1.22060000000
-7,heat,R1,2050,3,2040,heatpump,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R1,2050,5,2045,heatpump,all-year,all-week,late-afternoon,0.92290000000
-7,heat,R1,2050,11,2040,heatpump,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R1,2050,13,2045,heatpump,all-year,all-week,late-afternoon,0.92290000000
-7,heat,R1,2055,5,2045,heatpump,all-year,all-week,late-afternoon,0.92290000000
-7,heat,R1,2055,7,2050,heatpump,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R1,2055,13,2045,heatpump,all-year,all-week,late-afternoon,0.92290000000
-7,heat,R1,2055,15,2050,heatpump,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R2,2050,3,2040,heatpump,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R2,2050,5,2045,heatpump,all-year,all-week,late-afternoon,0.92290000000
-7,heat,R2,2050,11,2040,heatpump,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R2,2050,13,2045,heatpump,all-year,all-week,late-afternoon,0.92290000000
-7,heat,R2,2055,5,2045,heatpump,all-year,all-week,late-afternoon,0.92290000000
-7,heat,R2,2055,7,2050,heatpump,all-year,all-week,late-afternoon,1.22060000000
-7,heat,R2,2055,13,2045,heatpump,all-year,all-week,late-afternoon,0.92290000000
-7,heat,R2,2055,15,2050,heatpump,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R1,2050,2,2040,estove,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R1,2050,4,2045,estove,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R1,2050,10,2040,estove,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R1,2050,12,2045,estove,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R1,2055,4,2045,estove,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R1,2055,6,2050,estove,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R1,2055,12,2045,estove,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R1,2055,14,2050,estove,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R2,2050,2,2040,estove,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R2,2050,4,2045,estove,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R2,2050,10,2040,estove,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R2,2050,12,2045,estove,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R2,2055,4,2045,estove,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R2,2055,6,2050,estove,all-year,all-week,late-afternoon,1.22060000000
-7,cook,R2,2055,12,2045,estove,all-year,all-week,late-afternoon,0.92290000000
-7,cook,R2,2055,14,2050,estove,all-year,all-week,late-afternoon,1.22060000000
+timeslice,commodity,region,year,asset,month,day,hour,technology,installed,supply
+0,heat,R1,2050,5,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R1,2050,6,all-year,all-week,night,heatpump,2045,0.46110000000
+0,heat,R1,2050,13,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R1,2050,14,all-year,all-week,night,heatpump,2045,0.46110000000
+0,heat,R1,2055,6,all-year,all-week,night,heatpump,2045,0.46110000000
+0,heat,R1,2055,7,all-year,all-week,night,heatpump,2050,0.60990000000
+0,heat,R1,2055,14,all-year,all-week,night,heatpump,2045,0.46110000000
+0,heat,R1,2055,15,all-year,all-week,night,heatpump,2050,0.60990000000
+0,heat,R2,2050,5,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R2,2050,6,all-year,all-week,night,heatpump,2045,0.46110000000
+0,heat,R2,2050,13,all-year,all-week,night,heatpump,2040,0.60990000000
+0,heat,R2,2050,14,all-year,all-week,night,heatpump,2045,0.46110000000
+0,heat,R2,2055,6,all-year,all-week,night,heatpump,2045,0.46110000000
+0,heat,R2,2055,7,all-year,all-week,night,heatpump,2050,0.60990000000
+0,heat,R2,2055,14,all-year,all-week,night,heatpump,2045,0.46110000000
+0,heat,R2,2055,15,all-year,all-week,night,heatpump,2050,0.60990000000
+0,cook,R1,2050,1,all-year,all-week,night,estove,2040,0.60990000000
+0,cook,R1,2050,2,all-year,all-week,night,estove,2045,0.46110000000
+0,cook,R1,2050,9,all-year,all-week,night,estove,2040,0.60990000000
+0,cook,R1,2050,10,all-year,all-week,night,estove,2045,0.46110000000
+0,cook,R1,2055,2,all-year,all-week,night,estove,2045,0.46110000000
+0,cook,R1,2055,3,all-year,all-week,night,estove,2050,0.60990000000
+0,cook,R1,2055,10,all-year,all-week,night,estove,2045,0.46110000000
+0,cook,R1,2055,11,all-year,all-week,night,estove,2050,0.60990000000
+0,cook,R2,2050,1,all-year,all-week,night,estove,2040,0.60990000000
+0,cook,R2,2050,2,all-year,all-week,night,estove,2045,0.46110000000
+0,cook,R2,2050,9,all-year,all-week,night,estove,2040,0.60990000000
+0,cook,R2,2050,10,all-year,all-week,night,estove,2045,0.46110000000
+0,cook,R2,2055,2,all-year,all-week,night,estove,2045,0.46110000000
+0,cook,R2,2055,3,all-year,all-week,night,estove,2050,0.60990000000
+0,cook,R2,2055,10,all-year,all-week,night,estove,2045,0.46110000000
+0,cook,R2,2055,11,all-year,all-week,night,estove,2050,0.60990000000
+1,heat,R1,2050,5,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R1,2050,6,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,heat,R1,2050,13,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R1,2050,14,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,heat,R1,2055,6,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,heat,R1,2055,7,all-year,all-week,morning,heatpump,2050,0.91480000000
+1,heat,R1,2055,14,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,heat,R1,2055,15,all-year,all-week,morning,heatpump,2050,0.91480000000
+1,heat,R2,2050,5,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R2,2050,6,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,heat,R2,2050,13,all-year,all-week,morning,heatpump,2040,0.91480000000
+1,heat,R2,2050,14,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,heat,R2,2055,6,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,heat,R2,2055,7,all-year,all-week,morning,heatpump,2050,0.91480000000
+1,heat,R2,2055,14,all-year,all-week,morning,heatpump,2045,0.69170000000
+1,heat,R2,2055,15,all-year,all-week,morning,heatpump,2050,0.91480000000
+1,cook,R1,2050,1,all-year,all-week,morning,estove,2040,0.91480000000
+1,cook,R1,2050,2,all-year,all-week,morning,estove,2045,0.69170000000
+1,cook,R1,2050,9,all-year,all-week,morning,estove,2040,0.91480000000
+1,cook,R1,2050,10,all-year,all-week,morning,estove,2045,0.69170000000
+1,cook,R1,2055,2,all-year,all-week,morning,estove,2045,0.69170000000
+1,cook,R1,2055,3,all-year,all-week,morning,estove,2050,0.91480000000
+1,cook,R1,2055,10,all-year,all-week,morning,estove,2045,0.69170000000
+1,cook,R1,2055,11,all-year,all-week,morning,estove,2050,0.91480000000
+1,cook,R2,2050,1,all-year,all-week,morning,estove,2040,0.91480000000
+1,cook,R2,2050,2,all-year,all-week,morning,estove,2045,0.69170000000
+1,cook,R2,2050,9,all-year,all-week,morning,estove,2040,0.91480000000
+1,cook,R2,2050,10,all-year,all-week,morning,estove,2045,0.69170000000
+1,cook,R2,2055,2,all-year,all-week,morning,estove,2045,0.69170000000
+1,cook,R2,2055,3,all-year,all-week,morning,estove,2050,0.91480000000
+1,cook,R2,2055,10,all-year,all-week,morning,estove,2045,0.69170000000
+1,cook,R2,2055,11,all-year,all-week,morning,estove,2050,0.91480000000
+2,heat,R1,2050,5,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R1,2050,6,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,heat,R1,2050,13,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R1,2050,14,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,heat,R1,2055,6,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,heat,R1,2055,7,all-year,all-week,mid-afternoon,heatpump,2050,0.60990000000
+2,heat,R1,2055,14,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,heat,R1,2055,15,all-year,all-week,mid-afternoon,heatpump,2050,0.60990000000
+2,heat,R2,2050,5,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R2,2050,6,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,heat,R2,2050,13,all-year,all-week,mid-afternoon,heatpump,2040,0.60990000000
+2,heat,R2,2050,14,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,heat,R2,2055,6,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,heat,R2,2055,7,all-year,all-week,mid-afternoon,heatpump,2050,0.60990000000
+2,heat,R2,2055,14,all-year,all-week,mid-afternoon,heatpump,2045,0.46110000000
+2,heat,R2,2055,15,all-year,all-week,mid-afternoon,heatpump,2050,0.60990000000
+2,cook,R1,2050,1,all-year,all-week,mid-afternoon,estove,2040,0.60990000000
+2,cook,R1,2050,2,all-year,all-week,mid-afternoon,estove,2045,0.46110000000
+2,cook,R1,2050,9,all-year,all-week,mid-afternoon,estove,2040,0.60990000000
+2,cook,R1,2050,10,all-year,all-week,mid-afternoon,estove,2045,0.46110000000
+2,cook,R1,2055,2,all-year,all-week,mid-afternoon,estove,2045,0.46110000000
+2,cook,R1,2055,3,all-year,all-week,mid-afternoon,estove,2050,0.60990000000
+2,cook,R1,2055,10,all-year,all-week,mid-afternoon,estove,2045,0.46110000000
+2,cook,R1,2055,11,all-year,all-week,mid-afternoon,estove,2050,0.60990000000
+2,cook,R2,2050,1,all-year,all-week,mid-afternoon,estove,2040,0.60990000000
+2,cook,R2,2050,2,all-year,all-week,mid-afternoon,estove,2045,0.46110000000
+2,cook,R2,2050,9,all-year,all-week,mid-afternoon,estove,2040,0.60990000000
+2,cook,R2,2050,10,all-year,all-week,mid-afternoon,estove,2045,0.46110000000
+2,cook,R2,2055,2,all-year,all-week,mid-afternoon,estove,2045,0.46110000000
+2,cook,R2,2055,3,all-year,all-week,mid-afternoon,estove,2050,0.60990000000
+2,cook,R2,2055,10,all-year,all-week,mid-afternoon,estove,2045,0.46110000000
+2,cook,R2,2055,11,all-year,all-week,mid-afternoon,estove,2050,0.60990000000
+3,heat,R1,2050,5,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R1,2050,6,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,heat,R1,2050,13,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R1,2050,14,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,heat,R1,2055,6,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,heat,R1,2055,7,all-year,all-week,early-peak,heatpump,2050,0.91480000000
+3,heat,R1,2055,14,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,heat,R1,2055,15,all-year,all-week,early-peak,heatpump,2050,0.91480000000
+3,heat,R2,2050,5,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R2,2050,6,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,heat,R2,2050,13,all-year,all-week,early-peak,heatpump,2040,0.91480000000
+3,heat,R2,2050,14,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,heat,R2,2055,6,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,heat,R2,2055,7,all-year,all-week,early-peak,heatpump,2050,0.91480000000
+3,heat,R2,2055,14,all-year,all-week,early-peak,heatpump,2045,0.69170000000
+3,heat,R2,2055,15,all-year,all-week,early-peak,heatpump,2050,0.91480000000
+3,cook,R1,2050,1,all-year,all-week,early-peak,estove,2040,0.91480000000
+3,cook,R1,2050,2,all-year,all-week,early-peak,estove,2045,0.69170000000
+3,cook,R1,2050,9,all-year,all-week,early-peak,estove,2040,0.91480000000
+3,cook,R1,2050,10,all-year,all-week,early-peak,estove,2045,0.69170000000
+3,cook,R1,2055,2,all-year,all-week,early-peak,estove,2045,0.69170000000
+3,cook,R1,2055,3,all-year,all-week,early-peak,estove,2050,0.91480000000
+3,cook,R1,2055,10,all-year,all-week,early-peak,estove,2045,0.69170000000
+3,cook,R1,2055,11,all-year,all-week,early-peak,estove,2050,0.91480000000
+3,cook,R2,2050,1,all-year,all-week,early-peak,estove,2040,0.91480000000
+3,cook,R2,2050,2,all-year,all-week,early-peak,estove,2045,0.69170000000
+3,cook,R2,2050,9,all-year,all-week,early-peak,estove,2040,0.91480000000
+3,cook,R2,2050,10,all-year,all-week,early-peak,estove,2045,0.69170000000
+3,cook,R2,2055,2,all-year,all-week,early-peak,estove,2045,0.69170000000
+3,cook,R2,2055,3,all-year,all-week,early-peak,estove,2050,0.91480000000
+3,cook,R2,2055,10,all-year,all-week,early-peak,estove,2045,0.69170000000
+3,cook,R2,2055,11,all-year,all-week,early-peak,estove,2050,0.91480000000
+4,heat,R1,2050,5,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R1,2050,6,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,heat,R1,2050,13,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R1,2050,14,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,heat,R1,2055,6,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,heat,R1,2055,7,all-year,all-week,late-peak,heatpump,2050,1.83050000000
+4,heat,R1,2055,14,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,heat,R1,2055,15,all-year,all-week,late-peak,heatpump,2050,1.83050000000
+4,heat,R2,2050,5,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R2,2050,6,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,heat,R2,2050,13,all-year,all-week,late-peak,heatpump,2040,1.83050000000
+4,heat,R2,2050,14,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,heat,R2,2055,6,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,heat,R2,2055,7,all-year,all-week,late-peak,heatpump,2050,1.83050000000
+4,heat,R2,2055,14,all-year,all-week,late-peak,heatpump,2045,1.38400000000
+4,heat,R2,2055,15,all-year,all-week,late-peak,heatpump,2050,1.83050000000
+4,cook,R1,2050,1,all-year,all-week,late-peak,estove,2040,1.83050000000
+4,cook,R1,2050,2,all-year,all-week,late-peak,estove,2045,1.38400000000
+4,cook,R1,2050,9,all-year,all-week,late-peak,estove,2040,1.83050000000
+4,cook,R1,2050,10,all-year,all-week,late-peak,estove,2045,1.38400000000
+4,cook,R1,2055,2,all-year,all-week,late-peak,estove,2045,1.38400000000
+4,cook,R1,2055,3,all-year,all-week,late-peak,estove,2050,1.83050000000
+4,cook,R1,2055,10,all-year,all-week,late-peak,estove,2045,1.38400000000
+4,cook,R1,2055,11,all-year,all-week,late-peak,estove,2050,1.83050000000
+4,cook,R2,2050,1,all-year,all-week,late-peak,estove,2040,1.83050000000
+4,cook,R2,2050,2,all-year,all-week,late-peak,estove,2045,1.38400000000
+4,cook,R2,2050,9,all-year,all-week,late-peak,estove,2040,1.83050000000
+4,cook,R2,2050,10,all-year,all-week,late-peak,estove,2045,1.38400000000
+4,cook,R2,2055,2,all-year,all-week,late-peak,estove,2045,1.38400000000
+4,cook,R2,2055,3,all-year,all-week,late-peak,estove,2050,1.83050000000
+4,cook,R2,2055,10,all-year,all-week,late-peak,estove,2045,1.38400000000
+4,cook,R2,2055,11,all-year,all-week,late-peak,estove,2050,1.83050000000
+5,heat,R1,2050,5,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R1,2050,6,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,heat,R1,2050,13,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R1,2050,14,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,heat,R1,2055,6,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,heat,R1,2055,7,all-year,all-week,evening,heatpump,2050,1.22060000000
+5,heat,R1,2055,14,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,heat,R1,2055,15,all-year,all-week,evening,heatpump,2050,1.22060000000
+5,heat,R2,2050,5,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R2,2050,6,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,heat,R2,2050,13,all-year,all-week,evening,heatpump,2040,1.22060000000
+5,heat,R2,2050,14,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,heat,R2,2055,6,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,heat,R2,2055,7,all-year,all-week,evening,heatpump,2050,1.22060000000
+5,heat,R2,2055,14,all-year,all-week,evening,heatpump,2045,0.92290000000
+5,heat,R2,2055,15,all-year,all-week,evening,heatpump,2050,1.22060000000
+5,cook,R1,2050,1,all-year,all-week,evening,estove,2040,1.22060000000
+5,cook,R1,2050,2,all-year,all-week,evening,estove,2045,0.92290000000
+5,cook,R1,2050,9,all-year,all-week,evening,estove,2040,1.22060000000
+5,cook,R1,2050,10,all-year,all-week,evening,estove,2045,0.92290000000
+5,cook,R1,2055,2,all-year,all-week,evening,estove,2045,0.92290000000
+5,cook,R1,2055,3,all-year,all-week,evening,estove,2050,1.22060000000
+5,cook,R1,2055,10,all-year,all-week,evening,estove,2045,0.92290000000
+5,cook,R1,2055,11,all-year,all-week,evening,estove,2050,1.22060000000
+5,cook,R2,2050,1,all-year,all-week,evening,estove,2040,1.22060000000
+5,cook,R2,2050,2,all-year,all-week,evening,estove,2045,0.92290000000
+5,cook,R2,2050,9,all-year,all-week,evening,estove,2040,1.22060000000
+5,cook,R2,2050,10,all-year,all-week,evening,estove,2045,0.92290000000
+5,cook,R2,2055,2,all-year,all-week,evening,estove,2045,0.92290000000
+5,cook,R2,2055,3,all-year,all-week,evening,estove,2050,1.22060000000
+5,cook,R2,2055,10,all-year,all-week,evening,estove,2045,0.92290000000
+5,cook,R2,2055,11,all-year,all-week,evening,estove,2050,1.22060000000
+6,heat,R1,2050,5,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R1,2050,6,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,heat,R1,2050,13,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R1,2050,14,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,heat,R1,2055,6,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,heat,R1,2055,7,all-year,all-week,early-morning,heatpump,2050,1.22060000000
+6,heat,R1,2055,14,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,heat,R1,2055,15,all-year,all-week,early-morning,heatpump,2050,1.22060000000
+6,heat,R2,2050,5,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R2,2050,6,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,heat,R2,2050,13,all-year,all-week,early-morning,heatpump,2040,1.22060000000
+6,heat,R2,2050,14,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,heat,R2,2055,6,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,heat,R2,2055,7,all-year,all-week,early-morning,heatpump,2050,1.22060000000
+6,heat,R2,2055,14,all-year,all-week,early-morning,heatpump,2045,0.92290000000
+6,heat,R2,2055,15,all-year,all-week,early-morning,heatpump,2050,1.22060000000
+6,cook,R1,2050,1,all-year,all-week,early-morning,estove,2040,1.22060000000
+6,cook,R1,2050,2,all-year,all-week,early-morning,estove,2045,0.92290000000
+6,cook,R1,2050,9,all-year,all-week,early-morning,estove,2040,1.22060000000
+6,cook,R1,2050,10,all-year,all-week,early-morning,estove,2045,0.92290000000
+6,cook,R1,2055,2,all-year,all-week,early-morning,estove,2045,0.92290000000
+6,cook,R1,2055,3,all-year,all-week,early-morning,estove,2050,1.22060000000
+6,cook,R1,2055,10,all-year,all-week,early-morning,estove,2045,0.92290000000
+6,cook,R1,2055,11,all-year,all-week,early-morning,estove,2050,1.22060000000
+6,cook,R2,2050,1,all-year,all-week,early-morning,estove,2040,1.22060000000
+6,cook,R2,2050,2,all-year,all-week,early-morning,estove,2045,0.92290000000
+6,cook,R2,2050,9,all-year,all-week,early-morning,estove,2040,1.22060000000
+6,cook,R2,2050,10,all-year,all-week,early-morning,estove,2045,0.92290000000
+6,cook,R2,2055,2,all-year,all-week,early-morning,estove,2045,0.92290000000
+6,cook,R2,2055,3,all-year,all-week,early-morning,estove,2050,1.22060000000
+6,cook,R2,2055,10,all-year,all-week,early-morning,estove,2045,0.92290000000
+6,cook,R2,2055,11,all-year,all-week,early-morning,estove,2050,1.22060000000
+7,heat,R1,2050,5,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R1,2050,6,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,heat,R1,2050,13,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R1,2050,14,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,heat,R1,2055,6,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,heat,R1,2055,7,all-year,all-week,late-afternoon,heatpump,2050,1.22060000000
+7,heat,R1,2055,14,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,heat,R1,2055,15,all-year,all-week,late-afternoon,heatpump,2050,1.22060000000
+7,heat,R2,2050,5,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R2,2050,6,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,heat,R2,2050,13,all-year,all-week,late-afternoon,heatpump,2040,1.22060000000
+7,heat,R2,2050,14,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,heat,R2,2055,6,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,heat,R2,2055,7,all-year,all-week,late-afternoon,heatpump,2050,1.22060000000
+7,heat,R2,2055,14,all-year,all-week,late-afternoon,heatpump,2045,0.92290000000
+7,heat,R2,2055,15,all-year,all-week,late-afternoon,heatpump,2050,1.22060000000
+7,cook,R1,2050,1,all-year,all-week,late-afternoon,estove,2040,1.22060000000
+7,cook,R1,2050,2,all-year,all-week,late-afternoon,estove,2045,0.92290000000
+7,cook,R1,2050,9,all-year,all-week,late-afternoon,estove,2040,1.22060000000
+7,cook,R1,2050,10,all-year,all-week,late-afternoon,estove,2045,0.92290000000
+7,cook,R1,2055,2,all-year,all-week,late-afternoon,estove,2045,0.92290000000
+7,cook,R1,2055,3,all-year,all-week,late-afternoon,estove,2050,1.22060000000
+7,cook,R1,2055,10,all-year,all-week,late-afternoon,estove,2045,0.92290000000
+7,cook,R1,2055,11,all-year,all-week,late-afternoon,estove,2050,1.22060000000
+7,cook,R2,2050,1,all-year,all-week,late-afternoon,estove,2040,1.22060000000
+7,cook,R2,2050,2,all-year,all-week,late-afternoon,estove,2045,0.92290000000
+7,cook,R2,2050,9,all-year,all-week,late-afternoon,estove,2040,1.22060000000
+7,cook,R2,2050,10,all-year,all-week,late-afternoon,estove,2045,0.92290000000
+7,cook,R2,2055,2,all-year,all-week,late-afternoon,estove,2045,0.92290000000
+7,cook,R2,2055,3,all-year,all-week,late-afternoon,estove,2050,1.22060000000
+7,cook,R2,2055,10,all-year,all-week,late-afternoon,estove,2045,0.92290000000
+7,cook,R2,2055,11,all-year,all-week,late-afternoon,estove,2050,1.22060000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2020.csv
index fdbb2d279..d1ee882b2 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2020.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2020.csv
@@ -1,4 +1,4 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gassupply1,15.00000000000
-0,2025,R1,2020,gassupply1,15.00000000000
-0,2030,R1,2020,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2025.csv
index f2ad7b025..d42ba410b 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2025.csv
@@ -1,3 +1,3 @@
-asset,year,region,installed,technology,capacity
-0,2025,R1,2020,gassupply1,15.00000000000
-0,2030,R1,2020,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2030.csv
index c72974528..85cb6585a 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2030.csv
@@ -1,7 +1,7 @@
-asset,year,region,installed,technology,capacity
-0,2030,R1,2020,gassupply1,7.50000000000
-1,2035,R1,2030,gassupply1,4.91540000000
-1,2040,R1,2030,gassupply1,4.91540000000
-1,2045,R1,2030,gassupply1,4.91540000000
-1,2050,R1,2030,gassupply1,4.91540000000
-1,2069,R1,2030,gassupply1,4.91540000000
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2035,R1,gassupply1,2030,4.91540000000
+1,2040,R1,gassupply1,2030,4.91540000000
+1,2045,R1,gassupply1,2030,4.91540000000
+1,2050,R1,gassupply1,2030,4.91540000000
+1,2069,R1,gassupply1,2030,4.91540000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2035.csv
index f3e4bf75c..21b6abc42 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2035.csv
@@ -1,6 +1,6 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2030,gassupply1,4.91540000000
-1,2040,R1,2030,gassupply1,4.91540000000
-1,2045,R1,2030,gassupply1,4.91540000000
-1,2050,R1,2030,gassupply1,4.91540000000
-1,2069,R1,2030,gassupply1,4.91540000000
+asset,year,region,technology,installed,capacity
+1,2035,R1,gassupply1,2030,4.91540000000
+1,2040,R1,gassupply1,2030,4.91540000000
+1,2045,R1,gassupply1,2030,4.91540000000
+1,2050,R1,gassupply1,2030,4.91540000000
+1,2069,R1,gassupply1,2030,4.91540000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2040.csv
index 23ed9376d..49c4e9fee 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2040.csv
@@ -1,5 +1,5 @@
-asset,year,region,installed,technology,capacity
-1,2040,R1,2030,gassupply1,4.91540000000
-1,2045,R1,2030,gassupply1,4.91540000000
-1,2050,R1,2030,gassupply1,4.91540000000
-1,2069,R1,2030,gassupply1,4.91540000000
+asset,year,region,technology,installed,capacity
+1,2040,R1,gassupply1,2030,4.91540000000
+1,2045,R1,gassupply1,2030,4.91540000000
+1,2050,R1,gassupply1,2030,4.91540000000
+1,2069,R1,gassupply1,2030,4.91540000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2045.csv
index 821a7afad..e9db37887 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2045.csv
@@ -1,4 +1,4 @@
-asset,year,region,installed,technology,capacity
-1,2045,R1,2030,gassupply1,4.91540000000
-1,2050,R1,2030,gassupply1,4.91540000000
-1,2069,R1,2030,gassupply1,4.91540000000
+asset,year,region,technology,installed,capacity
+1,2045,R1,gassupply1,2030,4.91540000000
+1,2050,R1,gassupply1,2030,4.91540000000
+1,2069,R1,gassupply1,2030,4.91540000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2050.csv
index 0032cb9bf..6206749dc 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Gas/Capacity/2050.csv
@@ -1,4 +1,4 @@
-asset,year,region,installed,technology,capacity
-1,2050,R1,2030,gassupply1,4.91540000000
-1,2055,R1,2030,gassupply1,4.91540000000
-1,2069,R1,2030,gassupply1,4.91540000000
+asset,year,region,technology,installed,capacity
+1,2050,R1,gassupply1,2030,4.91540000000
+1,2055,R1,gassupply1,2030,4.91540000000
+1,2069,R1,gassupply1,2030,4.91540000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2020.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2020.csv
index bbb500947..1043ca6b2 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2020.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2020.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gasCCGT,1.00000000000
-0,2025,R1,2020,gasCCGT,1.00000000000
-1,2025,R1,2020,windturbine,9.61320000000
-1,2030,R1,2020,windturbine,9.61320000000
-1,2035,R1,2020,windturbine,9.61320000000
-1,2040,R1,2020,windturbine,9.61320000000
-1,2045,R1,2020,windturbine,9.61320000000
-1,2049,R1,2020,windturbine,9.61320000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2025,R1,windturbine,2020,9.61320000000
+1,2030,R1,windturbine,2020,9.61320000000
+1,2035,R1,windturbine,2020,9.61320000000
+1,2040,R1,windturbine,2020,9.61320000000
+1,2045,R1,windturbine,2020,9.61320000000
+1,2049,R1,windturbine,2020,9.61320000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2030.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2030.csv
index 76ad67dd6..31c131b74 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2030.csv
@@ -1,21 +1,21 @@
-asset,year,region,installed,technology,capacity
-1,2030,R1,2020,windturbine,9.61320000000
-1,2035,R1,2020,windturbine,9.61320000000
-1,2040,R1,2020,windturbine,9.61320000000
-1,2045,R1,2020,windturbine,9.61320000000
-1,2049,R1,2020,windturbine,9.61320000000
-2,2030,R1,2025,windturbine,4.09700000000
-2,2035,R1,2025,windturbine,4.09700000000
-2,2040,R1,2025,windturbine,4.09700000000
-2,2045,R1,2025,windturbine,4.09700000000
-2,2049,R1,2025,windturbine,4.09700000000
-2,2050,R1,2025,windturbine,4.09700000000
-2,2054,R1,2025,windturbine,4.09700000000
-3,2035,R1,2030,windturbine,0.49370000000
-3,2040,R1,2030,windturbine,0.49370000000
-3,2045,R1,2030,windturbine,0.49370000000
-3,2049,R1,2030,windturbine,0.49370000000
-3,2050,R1,2030,windturbine,0.49370000000
-3,2054,R1,2030,windturbine,0.49370000000
-3,2055,R1,2030,windturbine,0.49370000000
-3,2059,R1,2030,windturbine,0.49370000000
+asset,year,region,technology,installed,capacity
+1,2030,R1,windturbine,2020,9.61320000000
+1,2035,R1,windturbine,2020,9.61320000000
+1,2040,R1,windturbine,2020,9.61320000000
+1,2045,R1,windturbine,2020,9.61320000000
+1,2049,R1,windturbine,2020,9.61320000000
+2,2030,R1,windturbine,2025,4.09700000000
+2,2035,R1,windturbine,2025,4.09700000000
+2,2040,R1,windturbine,2025,4.09700000000
+2,2045,R1,windturbine,2025,4.09700000000
+2,2049,R1,windturbine,2025,4.09700000000
+2,2050,R1,windturbine,2025,4.09700000000
+2,2054,R1,windturbine,2025,4.09700000000
+3,2035,R1,windturbine,2030,0.49370000000
+3,2040,R1,windturbine,2030,0.49370000000
+3,2045,R1,windturbine,2030,0.49370000000
+3,2049,R1,windturbine,2030,0.49370000000
+3,2050,R1,windturbine,2030,0.49370000000
+3,2054,R1,windturbine,2030,0.49370000000
+3,2055,R1,windturbine,2030,0.49370000000
+3,2059,R1,windturbine,2030,0.49370000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2035.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2035.csv
index ac33bd588..9b1130ded 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2035.csv
@@ -1,28 +1,28 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2020,windturbine,9.61320000000
-1,2040,R1,2020,windturbine,9.61320000000
-1,2045,R1,2020,windturbine,9.61320000000
-1,2049,R1,2020,windturbine,9.61320000000
-2,2035,R1,2025,windturbine,4.09700000000
-2,2040,R1,2025,windturbine,4.09700000000
-2,2045,R1,2025,windturbine,4.09700000000
-2,2049,R1,2025,windturbine,4.09700000000
-2,2050,R1,2025,windturbine,4.09700000000
-2,2054,R1,2025,windturbine,4.09700000000
-3,2035,R1,2030,windturbine,0.49370000000
-3,2040,R1,2030,windturbine,0.49370000000
-3,2045,R1,2030,windturbine,0.49370000000
-3,2049,R1,2030,windturbine,0.49370000000
-3,2050,R1,2030,windturbine,0.49370000000
-3,2054,R1,2030,windturbine,0.49370000000
-3,2055,R1,2030,windturbine,0.49370000000
-3,2059,R1,2030,windturbine,0.49370000000
-4,2040,R1,2035,windturbine,1.91230000000
-4,2045,R1,2035,windturbine,1.91230000000
-4,2049,R1,2035,windturbine,1.91230000000
-4,2050,R1,2035,windturbine,1.91230000000
-4,2054,R1,2035,windturbine,1.91230000000
-4,2055,R1,2035,windturbine,1.91230000000
-4,2059,R1,2035,windturbine,1.91230000000
-4,2060,R1,2035,windturbine,1.91230000000
-4,2064,R1,2035,windturbine,1.91230000000
+asset,year,region,technology,installed,capacity
+1,2035,R1,windturbine,2020,9.61320000000
+1,2040,R1,windturbine,2020,9.61320000000
+1,2045,R1,windturbine,2020,9.61320000000
+1,2049,R1,windturbine,2020,9.61320000000
+2,2035,R1,windturbine,2025,4.09700000000
+2,2040,R1,windturbine,2025,4.09700000000
+2,2045,R1,windturbine,2025,4.09700000000
+2,2049,R1,windturbine,2025,4.09700000000
+2,2050,R1,windturbine,2025,4.09700000000
+2,2054,R1,windturbine,2025,4.09700000000
+3,2035,R1,windturbine,2030,0.49370000000
+3,2040,R1,windturbine,2030,0.49370000000
+3,2045,R1,windturbine,2030,0.49370000000
+3,2049,R1,windturbine,2030,0.49370000000
+3,2050,R1,windturbine,2030,0.49370000000
+3,2054,R1,windturbine,2030,0.49370000000
+3,2055,R1,windturbine,2030,0.49370000000
+3,2059,R1,windturbine,2030,0.49370000000
+4,2040,R1,windturbine,2035,1.91230000000
+4,2045,R1,windturbine,2035,1.91230000000
+4,2049,R1,windturbine,2035,1.91230000000
+4,2050,R1,windturbine,2035,1.91230000000
+4,2054,R1,windturbine,2035,1.91230000000
+4,2055,R1,windturbine,2035,1.91230000000
+4,2059,R1,windturbine,2035,1.91230000000
+4,2060,R1,windturbine,2035,1.91230000000
+4,2064,R1,windturbine,2035,1.91230000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2040.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2040.csv
index cb1a0914b..f52394655 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Power/Capacity/2040.csv
@@ -1,35 +1,35 @@
-asset,year,region,installed,technology,capacity
-1,2040,R1,2020,windturbine,9.61320000000
-1,2045,R1,2020,windturbine,9.61320000000
-1,2049,R1,2020,windturbine,9.61320000000
-2,2040,R1,2025,windturbine,4.09700000000
-2,2045,R1,2025,windturbine,4.09700000000
-2,2049,R1,2025,windturbine,4.09700000000
-2,2050,R1,2025,windturbine,4.09700000000
-2,2054,R1,2025,windturbine,4.09700000000
-3,2040,R1,2030,windturbine,0.49370000000
-3,2045,R1,2030,windturbine,0.49370000000
-3,2049,R1,2030,windturbine,0.49370000000
-3,2050,R1,2030,windturbine,0.49370000000
-3,2054,R1,2030,windturbine,0.49370000000
-3,2055,R1,2030,windturbine,0.49370000000
-3,2059,R1,2030,windturbine,0.49370000000
-4,2040,R1,2035,windturbine,1.91230000000
-4,2045,R1,2035,windturbine,1.91230000000
-4,2049,R1,2035,windturbine,1.91230000000
-4,2050,R1,2035,windturbine,1.91230000000
-4,2054,R1,2035,windturbine,1.91230000000
-4,2055,R1,2035,windturbine,1.91230000000
-4,2059,R1,2035,windturbine,1.91230000000
-4,2060,R1,2035,windturbine,1.91230000000
-4,2064,R1,2035,windturbine,1.91230000000
-5,2045,R1,2040,windturbine,0.31700000000
-5,2049,R1,2040,windturbine,0.31700000000
-5,2050,R1,2040,windturbine,0.31700000000
-5,2054,R1,2040,windturbine,0.31700000000
-5,2055,R1,2040,windturbine,0.31700000000
-5,2059,R1,2040,windturbine,0.31700000000
-5,2060,R1,2040,windturbine,0.31700000000
-5,2064,R1,2040,windturbine,0.31700000000
-5,2065,R1,2040,windturbine,0.31700000000
-5,2069,R1,2040,windturbine,0.31700000000
+asset,year,region,technology,installed,capacity
+1,2040,R1,windturbine,2020,9.61320000000
+1,2045,R1,windturbine,2020,9.61320000000
+1,2049,R1,windturbine,2020,9.61320000000
+2,2040,R1,windturbine,2025,4.09700000000
+2,2045,R1,windturbine,2025,4.09700000000
+2,2049,R1,windturbine,2025,4.09700000000
+2,2050,R1,windturbine,2025,4.09700000000
+2,2054,R1,windturbine,2025,4.09700000000
+3,2040,R1,windturbine,2030,0.49370000000
+3,2045,R1,windturbine,2030,0.49370000000
+3,2049,R1,windturbine,2030,0.49370000000
+3,2050,R1,windturbine,2030,0.49370000000
+3,2054,R1,windturbine,2030,0.49370000000
+3,2055,R1,windturbine,2030,0.49370000000
+3,2059,R1,windturbine,2030,0.49370000000
+4,2040,R1,windturbine,2035,1.91230000000
+4,2045,R1,windturbine,2035,1.91230000000
+4,2049,R1,windturbine,2035,1.91230000000
+4,2050,R1,windturbine,2035,1.91230000000
+4,2054,R1,windturbine,2035,1.91230000000
+4,2055,R1,windturbine,2035,1.91230000000
+4,2059,R1,windturbine,2035,1.91230000000
+4,2060,R1,windturbine,2035,1.91230000000
+4,2064,R1,windturbine,2035,1.91230000000
+5,2045,R1,windturbine,2040,0.31700000000
+5,2049,R1,windturbine,2040,0.31700000000
+5,2050,R1,windturbine,2040,0.31700000000
+5,2054,R1,windturbine,2040,0.31700000000
+5,2055,R1,windturbine,2040,0.31700000000
+5,2059,R1,windturbine,2040,0.31700000000
+5,2060,R1,windturbine,2040,0.31700000000
+5,2064,R1,windturbine,2040,0.31700000000
+5,2065,R1,windturbine,2040,0.31700000000
+5,2069,R1,windturbine,2040,0.31700000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2020.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2020.csv
index 23ffa638c..75a7bdf15 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2020.csv
@@ -1,31 +1,31 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2020,0,R1,gasboiler,2020,all-year,all-week,night,0.89580000000
-0,heat,2025,0,R1,gasboiler,2020,all-year,all-week,night,0.27650000000
-0,heat,2025,1,R1,heatpump,2020,all-year,all-week,night,0.65600000000
-0,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,night,57.96670000000
-0,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,night,17.89100000000
-1,heat,2020,0,R1,gasboiler,2020,all-year,all-week,morning,1.35000000000
-1,heat,2025,0,R1,gasboiler,2020,all-year,all-week,morning,0.41670000000
-1,heat,2025,1,R1,heatpump,2020,all-year,all-week,morning,0.98860000000
-1,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,morning,87.35830000000
-1,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,morning,26.96250000000
-2,heat,2020,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.89580000000
-2,heat,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.27650000000
-2,heat,2025,1,R1,heatpump,2020,all-year,all-week,afternoon,0.65600000000
-2,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,afternoon,57.96670000000
-2,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,17.89100000000
-3,heat,2020,0,R1,gasboiler,2020,all-year,all-week,early-peak,1.35000000000
-3,heat,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.41670000000
-3,heat,2025,1,R1,heatpump,2020,all-year,all-week,early-peak,0.98860000000
-3,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,early-peak,87.35830000000
-3,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,26.96250000000
-4,heat,2020,0,R1,gasboiler,2020,all-year,all-week,late-peak,2.70000000000
-4,heat,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,0.83330000000
-4,heat,2025,1,R1,heatpump,2020,all-year,all-week,late-peak,1.97720000000
-4,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,late-peak,174.71660000000
-4,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,53.92500000000
-5,heat,2020,0,R1,gasboiler,2020,all-year,all-week,evening,1.80420000000
-5,heat,2025,0,R1,gasboiler,2020,all-year,all-week,evening,0.55690000000
-5,heat,2025,1,R1,heatpump,2020,all-year,all-week,evening,1.32120000000
-5,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,evening,116.74990000000
-5,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,evening,36.03400000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,0.89580000000
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27650000000
+0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,0.65600000000
+0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,57.96670000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.89100000000
+1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.35000000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,0.98860000000
+1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,87.35830000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.89580000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27650000000
+2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,0.65600000000
+2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,57.96670000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.89100000000
+3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.35000000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,0.98860000000
+3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,87.35830000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,2.70000000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,1.97720000000
+4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,174.71660000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,1.80420000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55690000000
+5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,1.32120000000
+5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,116.74990000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,36.03400000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2025.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2025.csv
index fa269fb17..09ca76ed7 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2025.csv
@@ -1,43 +1,43 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2025,0,R1,gasboiler,2020,all-year,all-week,night,0.27650000000
-0,heat,2025,2,R1,heatpump,2020,all-year,all-week,night,0.65600000000
-0,heat,2030,1,R1,gasboiler,2025,all-year,all-week,night,0.21090000000
-0,heat,2030,2,R1,heatpump,2020,all-year,all-week,night,0.65600000000
-0,heat,2030,3,R1,heatpump,2025,all-year,all-week,night,0.10210000000
-0,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,night,17.89100000000
-0,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,night,13.64610000000
-1,heat,2025,0,R1,gasboiler,2020,all-year,all-week,morning,0.41670000000
-1,heat,2025,2,R1,heatpump,2020,all-year,all-week,morning,0.98860000000
-1,heat,2030,1,R1,gasboiler,2025,all-year,all-week,morning,0.31780000000
-1,heat,2030,2,R1,heatpump,2020,all-year,all-week,morning,0.98860000000
-1,heat,2030,3,R1,heatpump,2025,all-year,all-week,morning,0.15390000000
-1,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,morning,26.96250000000
-1,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,morning,20.56530000000
-2,heat,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.27650000000
-2,heat,2025,2,R1,heatpump,2020,all-year,all-week,afternoon,0.65600000000
-2,heat,2030,1,R1,gasboiler,2025,all-year,all-week,afternoon,0.21090000000
-2,heat,2030,2,R1,heatpump,2020,all-year,all-week,afternoon,0.65600000000
-2,heat,2030,3,R1,heatpump,2025,all-year,all-week,afternoon,0.10210000000
-2,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,17.89100000000
-2,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,afternoon,13.64610000000
-3,heat,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.41670000000
-3,heat,2025,2,R1,heatpump,2020,all-year,all-week,early-peak,0.98860000000
-3,heat,2030,1,R1,gasboiler,2025,all-year,all-week,early-peak,0.31780000000
-3,heat,2030,2,R1,heatpump,2020,all-year,all-week,early-peak,0.98860000000
-3,heat,2030,3,R1,heatpump,2025,all-year,all-week,early-peak,0.15390000000
-3,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,26.96250000000
-3,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,early-peak,20.56530000000
-4,heat,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,0.83330000000
-4,heat,2025,2,R1,heatpump,2020,all-year,all-week,late-peak,1.97720000000
-4,heat,2030,1,R1,gasboiler,2025,all-year,all-week,late-peak,0.63560000000
-4,heat,2030,2,R1,heatpump,2020,all-year,all-week,late-peak,1.97720000000
-4,heat,2030,3,R1,heatpump,2025,all-year,all-week,late-peak,0.30780000000
-4,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,53.92500000000
-4,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,late-peak,41.13050000000
-5,heat,2025,0,R1,gasboiler,2020,all-year,all-week,evening,0.55690000000
-5,heat,2025,2,R1,heatpump,2020,all-year,all-week,evening,1.32120000000
-5,heat,2030,1,R1,gasboiler,2025,all-year,all-week,evening,0.42470000000
-5,heat,2030,2,R1,heatpump,2020,all-year,all-week,evening,1.32120000000
-5,heat,2030,3,R1,heatpump,2025,all-year,all-week,evening,0.20570000000
-5,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,evening,36.03400000000
-5,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,evening,27.48440000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27650000000
+0,heat,2025,2,R1,all-year,all-week,night,heatpump,2020,0.65600000000
+0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.21090000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2020,0.65600000000
+0,heat,2030,3,R1,all-year,all-week,night,heatpump,2025,0.10210000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.89100000000
+0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,13.64610000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+1,heat,2025,2,R1,all-year,all-week,morning,heatpump,2020,0.98860000000
+1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.31780000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2020,0.98860000000
+1,heat,2030,3,R1,all-year,all-week,morning,heatpump,2025,0.15390000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,20.56530000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27650000000
+2,heat,2025,2,R1,all-year,all-week,afternoon,heatpump,2020,0.65600000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.21090000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2020,0.65600000000
+2,heat,2030,3,R1,all-year,all-week,afternoon,heatpump,2025,0.10210000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.89100000000
+2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,13.64610000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+3,heat,2025,2,R1,all-year,all-week,early-peak,heatpump,2020,0.98860000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.31780000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2020,0.98860000000
+3,heat,2030,3,R1,all-year,all-week,early-peak,heatpump,2025,0.15390000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,20.56530000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+4,heat,2025,2,R1,all-year,all-week,late-peak,heatpump,2020,1.97720000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.63560000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2020,1.97720000000
+4,heat,2030,3,R1,all-year,all-week,late-peak,heatpump,2025,0.30780000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,41.13050000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55690000000
+5,heat,2025,2,R1,all-year,all-week,evening,heatpump,2020,1.32120000000
+5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.42470000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2020,1.32120000000
+5,heat,2030,3,R1,all-year,all-week,evening,heatpump,2025,0.20570000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,36.03400000000
+5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,27.48440000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2030.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2030.csv
index 3351505dd..457bc6d09 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2030.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2030,0,R1,gasboiler,2025,all-year,all-week,night,0.21090000000
-0,heat,2030,1,R1,heatpump,2020,all-year,all-week,night,0.65600000000
-0,heat,2030,2,R1,heatpump,2025,all-year,all-week,night,0.10210000000
-0,heat,2035,0,R1,gasboiler,2025,all-year,all-week,night,0.21090000000
-0,heat,2035,2,R1,heatpump,2025,all-year,all-week,night,0.10210000000
-0,heat,2035,3,R1,heatpump,2030,all-year,all-week,night,0.68330000000
-0,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,night,13.64610000000
-0,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,night,13.64610000000
-1,heat,2030,0,R1,gasboiler,2025,all-year,all-week,morning,0.31780000000
-1,heat,2030,1,R1,heatpump,2020,all-year,all-week,morning,0.98860000000
-1,heat,2030,2,R1,heatpump,2025,all-year,all-week,morning,0.15390000000
-1,heat,2035,0,R1,gasboiler,2025,all-year,all-week,morning,0.31780000000
-1,heat,2035,2,R1,heatpump,2025,all-year,all-week,morning,0.15390000000
-1,heat,2035,3,R1,heatpump,2030,all-year,all-week,morning,1.02970000000
-1,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,morning,20.56530000000
-1,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,morning,20.56530000000
-2,heat,2030,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.21090000000
-2,heat,2030,1,R1,heatpump,2020,all-year,all-week,afternoon,0.65600000000
-2,heat,2030,2,R1,heatpump,2025,all-year,all-week,afternoon,0.10210000000
-2,heat,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.21090000000
-2,heat,2035,2,R1,heatpump,2025,all-year,all-week,afternoon,0.10210000000
-2,heat,2035,3,R1,heatpump,2030,all-year,all-week,afternoon,0.68330000000
-2,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,afternoon,13.64610000000
-2,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,13.64610000000
-3,heat,2030,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.31780000000
-3,heat,2030,1,R1,heatpump,2020,all-year,all-week,early-peak,0.98860000000
-3,heat,2030,2,R1,heatpump,2025,all-year,all-week,early-peak,0.15390000000
-3,heat,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.31780000000
-3,heat,2035,2,R1,heatpump,2025,all-year,all-week,early-peak,0.15390000000
-3,heat,2035,3,R1,heatpump,2030,all-year,all-week,early-peak,1.02970000000
-3,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,early-peak,20.56530000000
-3,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,20.56530000000
-4,heat,2030,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.63560000000
-4,heat,2030,1,R1,heatpump,2020,all-year,all-week,late-peak,1.97720000000
-4,heat,2030,2,R1,heatpump,2025,all-year,all-week,late-peak,0.30780000000
-4,heat,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.63560000000
-4,heat,2035,2,R1,heatpump,2025,all-year,all-week,late-peak,0.30780000000
-4,heat,2035,3,R1,heatpump,2030,all-year,all-week,late-peak,2.05950000000
-4,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,late-peak,41.13050000000
-4,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,41.13050000000
-5,heat,2030,0,R1,gasboiler,2025,all-year,all-week,evening,0.42470000000
-5,heat,2030,1,R1,heatpump,2020,all-year,all-week,evening,1.32120000000
-5,heat,2030,2,R1,heatpump,2025,all-year,all-week,evening,0.20570000000
-5,heat,2035,0,R1,gasboiler,2025,all-year,all-week,evening,0.42470000000
-5,heat,2035,2,R1,heatpump,2025,all-year,all-week,evening,0.20570000000
-5,heat,2035,3,R1,heatpump,2030,all-year,all-week,evening,1.37620000000
-5,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,evening,27.48440000000
-5,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,evening,27.48440000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2025,0.21090000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,0.65600000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.10210000000
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.21090000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.10210000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,0.68330000000
+0,CO2f,2030,0,R1,all-year,all-week,night,gasboiler,2025,13.64610000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,13.64610000000
+1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2025,0.31780000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,0.98860000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.15390000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.31780000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.15390000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,1.02970000000
+1,CO2f,2030,0,R1,all-year,all-week,morning,gasboiler,2025,20.56530000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,20.56530000000
+2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.21090000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,0.65600000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.10210000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.21090000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.10210000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,0.68330000000
+2,CO2f,2030,0,R1,all-year,all-week,afternoon,gasboiler,2025,13.64610000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,13.64610000000
+3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.31780000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,0.98860000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.15390000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.31780000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.15390000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,1.02970000000
+3,CO2f,2030,0,R1,all-year,all-week,early-peak,gasboiler,2025,20.56530000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,20.56530000000
+4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.63560000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,1.97720000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,0.30780000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.63560000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,0.30780000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,2.05950000000
+4,CO2f,2030,0,R1,all-year,all-week,late-peak,gasboiler,2025,41.13050000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,41.13050000000
+5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2025,0.42470000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,1.32120000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,0.20570000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.42470000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.20570000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,1.37620000000
+5,CO2f,2030,0,R1,all-year,all-week,evening,gasboiler,2025,27.48440000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,27.48440000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2035.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2035.csv
index 8c9ac46bd..bfad9bdec 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2035.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2035,0,R1,gasboiler,2025,all-year,all-week,night,0.21090000000
-0,heat,2035,2,R1,heatpump,2025,all-year,all-week,night,0.10210000000
-0,heat,2035,3,R1,heatpump,2030,all-year,all-week,night,0.68330000000
-0,heat,2040,1,R1,gasboiler,2035,all-year,all-week,night,0.13230000000
-0,heat,2040,3,R1,heatpump,2030,all-year,all-week,night,0.68330000000
-0,heat,2040,4,R1,heatpump,2035,all-year,all-week,night,0.20790000000
-0,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,night,13.64610000000
-0,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,night,8.56370000000
-1,heat,2035,0,R1,gasboiler,2025,all-year,all-week,morning,0.31780000000
-1,heat,2035,2,R1,heatpump,2025,all-year,all-week,morning,0.15390000000
-1,heat,2035,3,R1,heatpump,2030,all-year,all-week,morning,1.02970000000
-1,heat,2040,1,R1,gasboiler,2035,all-year,all-week,morning,0.19940000000
-1,heat,2040,3,R1,heatpump,2030,all-year,all-week,morning,1.02970000000
-1,heat,2040,4,R1,heatpump,2035,all-year,all-week,morning,0.31330000000
-1,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,morning,20.56530000000
-1,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,morning,12.90580000000
-2,heat,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.21090000000
-2,heat,2035,2,R1,heatpump,2025,all-year,all-week,afternoon,0.10210000000
-2,heat,2035,3,R1,heatpump,2030,all-year,all-week,afternoon,0.68330000000
-2,heat,2040,1,R1,gasboiler,2035,all-year,all-week,afternoon,0.13230000000
-2,heat,2040,3,R1,heatpump,2030,all-year,all-week,afternoon,0.68330000000
-2,heat,2040,4,R1,heatpump,2035,all-year,all-week,afternoon,0.20790000000
-2,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,13.64610000000
-2,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,afternoon,8.56370000000
-3,heat,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.31780000000
-3,heat,2035,2,R1,heatpump,2025,all-year,all-week,early-peak,0.15390000000
-3,heat,2035,3,R1,heatpump,2030,all-year,all-week,early-peak,1.02970000000
-3,heat,2040,1,R1,gasboiler,2035,all-year,all-week,early-peak,0.19940000000
-3,heat,2040,3,R1,heatpump,2030,all-year,all-week,early-peak,1.02970000000
-3,heat,2040,4,R1,heatpump,2035,all-year,all-week,early-peak,0.31330000000
-3,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,20.56530000000
-3,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,early-peak,12.90580000000
-4,heat,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.63560000000
-4,heat,2035,2,R1,heatpump,2025,all-year,all-week,late-peak,0.30780000000
-4,heat,2035,3,R1,heatpump,2030,all-year,all-week,late-peak,2.05950000000
-4,heat,2040,1,R1,gasboiler,2035,all-year,all-week,late-peak,0.39890000000
-4,heat,2040,3,R1,heatpump,2030,all-year,all-week,late-peak,2.05950000000
-4,heat,2040,4,R1,heatpump,2035,all-year,all-week,late-peak,0.62650000000
-4,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,41.13050000000
-4,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,late-peak,25.81170000000
-5,heat,2035,0,R1,gasboiler,2025,all-year,all-week,evening,0.42470000000
-5,heat,2035,2,R1,heatpump,2025,all-year,all-week,evening,0.20570000000
-5,heat,2035,3,R1,heatpump,2030,all-year,all-week,evening,1.37620000000
-5,heat,2040,1,R1,gasboiler,2035,all-year,all-week,evening,0.26650000000
-5,heat,2040,3,R1,heatpump,2030,all-year,all-week,evening,1.37620000000
-5,heat,2040,4,R1,heatpump,2035,all-year,all-week,evening,0.41870000000
-5,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,evening,27.48440000000
-5,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,evening,17.24800000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.21090000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.10210000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,0.68330000000
+0,heat,2040,1,R1,all-year,all-week,night,gasboiler,2035,0.13230000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,0.68330000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.20790000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,13.64610000000
+0,CO2f,2040,1,R1,all-year,all-week,night,gasboiler,2035,8.56370000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.31780000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.15390000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,1.02970000000
+1,heat,2040,1,R1,all-year,all-week,morning,gasboiler,2035,0.19940000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,1.02970000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,0.31330000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,20.56530000000
+1,CO2f,2040,1,R1,all-year,all-week,morning,gasboiler,2035,12.90580000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.21090000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.10210000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,0.68330000000
+2,heat,2040,1,R1,all-year,all-week,afternoon,gasboiler,2035,0.13230000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,0.68330000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.20790000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,13.64610000000
+2,CO2f,2040,1,R1,all-year,all-week,afternoon,gasboiler,2035,8.56370000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.31780000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.15390000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,1.02970000000
+3,heat,2040,1,R1,all-year,all-week,early-peak,gasboiler,2035,0.19940000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,1.02970000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,0.31330000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,20.56530000000
+3,CO2f,2040,1,R1,all-year,all-week,early-peak,gasboiler,2035,12.90580000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.63560000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,0.30780000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,2.05950000000
+4,heat,2040,1,R1,all-year,all-week,late-peak,gasboiler,2035,0.39890000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,2.05950000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,0.62650000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,41.13050000000
+4,CO2f,2040,1,R1,all-year,all-week,late-peak,gasboiler,2035,25.81170000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.42470000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.20570000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,1.37620000000
+5,heat,2040,1,R1,all-year,all-week,evening,gasboiler,2035,0.26650000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,1.37620000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,0.41870000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,27.48440000000
+5,CO2f,2040,1,R1,all-year,all-week,evening,gasboiler,2035,17.24800000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2040.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2040.csv
index 5e3fa1f04..0ab204b73 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2040.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2040,0,R1,gasboiler,2035,all-year,all-week,night,0.13230000000
-0,heat,2040,1,R1,heatpump,2030,all-year,all-week,night,0.68330000000
-0,heat,2040,2,R1,heatpump,2035,all-year,all-week,night,0.20790000000
-0,heat,2045,0,R1,gasboiler,2035,all-year,all-week,night,0.13230000000
-0,heat,2045,2,R1,heatpump,2035,all-year,all-week,night,0.20790000000
-0,heat,2045,3,R1,heatpump,2040,all-year,all-week,night,0.70080000000
-0,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,night,8.56370000000
-0,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,night,8.56370000000
-1,heat,2040,0,R1,gasboiler,2035,all-year,all-week,morning,0.19940000000
-1,heat,2040,1,R1,heatpump,2030,all-year,all-week,morning,1.02970000000
-1,heat,2040,2,R1,heatpump,2035,all-year,all-week,morning,0.31330000000
-1,heat,2045,0,R1,gasboiler,2035,all-year,all-week,morning,0.19940000000
-1,heat,2045,2,R1,heatpump,2035,all-year,all-week,morning,0.31330000000
-1,heat,2045,3,R1,heatpump,2040,all-year,all-week,morning,1.05620000000
-1,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,morning,12.90580000000
-1,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,morning,12.90580000000
-2,heat,2040,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.13230000000
-2,heat,2040,1,R1,heatpump,2030,all-year,all-week,afternoon,0.68330000000
-2,heat,2040,2,R1,heatpump,2035,all-year,all-week,afternoon,0.20790000000
-2,heat,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.13230000000
-2,heat,2045,2,R1,heatpump,2035,all-year,all-week,afternoon,0.20790000000
-2,heat,2045,3,R1,heatpump,2040,all-year,all-week,afternoon,0.70080000000
-2,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,afternoon,8.56370000000
-2,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,8.56370000000
-3,heat,2040,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.19940000000
-3,heat,2040,1,R1,heatpump,2030,all-year,all-week,early-peak,1.02970000000
-3,heat,2040,2,R1,heatpump,2035,all-year,all-week,early-peak,0.31330000000
-3,heat,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.19940000000
-3,heat,2045,2,R1,heatpump,2035,all-year,all-week,early-peak,0.31330000000
-3,heat,2045,3,R1,heatpump,2040,all-year,all-week,early-peak,1.05620000000
-3,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,early-peak,12.90580000000
-3,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,12.90580000000
-4,heat,2040,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.39890000000
-4,heat,2040,1,R1,heatpump,2030,all-year,all-week,late-peak,2.05950000000
-4,heat,2040,2,R1,heatpump,2035,all-year,all-week,late-peak,0.62650000000
-4,heat,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.39890000000
-4,heat,2045,2,R1,heatpump,2035,all-year,all-week,late-peak,0.62650000000
-4,heat,2045,3,R1,heatpump,2040,all-year,all-week,late-peak,2.11230000000
-4,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,late-peak,25.81170000000
-4,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,25.81170000000
-5,heat,2040,0,R1,gasboiler,2035,all-year,all-week,evening,0.26650000000
-5,heat,2040,1,R1,heatpump,2030,all-year,all-week,evening,1.37620000000
-5,heat,2040,2,R1,heatpump,2035,all-year,all-week,evening,0.41870000000
-5,heat,2045,0,R1,gasboiler,2035,all-year,all-week,evening,0.26650000000
-5,heat,2045,2,R1,heatpump,2035,all-year,all-week,evening,0.41870000000
-5,heat,2045,3,R1,heatpump,2040,all-year,all-week,evening,1.41150000000
-5,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,evening,17.24800000000
-5,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,evening,17.24800000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2040,0,R1,all-year,all-week,night,gasboiler,2035,0.13230000000
+0,heat,2040,1,R1,all-year,all-week,night,heatpump,2030,0.68330000000
+0,heat,2040,2,R1,all-year,all-week,night,heatpump,2035,0.20790000000
+0,heat,2045,0,R1,all-year,all-week,night,gasboiler,2035,0.13230000000
+0,heat,2045,2,R1,all-year,all-week,night,heatpump,2035,0.20790000000
+0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,0.70080000000
+0,CO2f,2040,0,R1,all-year,all-week,night,gasboiler,2035,8.56370000000
+0,CO2f,2045,0,R1,all-year,all-week,night,gasboiler,2035,8.56370000000
+1,heat,2040,0,R1,all-year,all-week,morning,gasboiler,2035,0.19940000000
+1,heat,2040,1,R1,all-year,all-week,morning,heatpump,2030,1.02970000000
+1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2035,0.31330000000
+1,heat,2045,0,R1,all-year,all-week,morning,gasboiler,2035,0.19940000000
+1,heat,2045,2,R1,all-year,all-week,morning,heatpump,2035,0.31330000000
+1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,1.05620000000
+1,CO2f,2040,0,R1,all-year,all-week,morning,gasboiler,2035,12.90580000000
+1,CO2f,2045,0,R1,all-year,all-week,morning,gasboiler,2035,12.90580000000
+2,heat,2040,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.13230000000
+2,heat,2040,1,R1,all-year,all-week,afternoon,heatpump,2030,0.68330000000
+2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2035,0.20790000000
+2,heat,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.13230000000
+2,heat,2045,2,R1,all-year,all-week,afternoon,heatpump,2035,0.20790000000
+2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,0.70080000000
+2,CO2f,2040,0,R1,all-year,all-week,afternoon,gasboiler,2035,8.56370000000
+2,CO2f,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,8.56370000000
+3,heat,2040,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.19940000000
+3,heat,2040,1,R1,all-year,all-week,early-peak,heatpump,2030,1.02970000000
+3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2035,0.31330000000
+3,heat,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.19940000000
+3,heat,2045,2,R1,all-year,all-week,early-peak,heatpump,2035,0.31330000000
+3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,1.05620000000
+3,CO2f,2040,0,R1,all-year,all-week,early-peak,gasboiler,2035,12.90580000000
+3,CO2f,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,12.90580000000
+4,heat,2040,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.39890000000
+4,heat,2040,1,R1,all-year,all-week,late-peak,heatpump,2030,2.05950000000
+4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2035,0.62650000000
+4,heat,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.39890000000
+4,heat,2045,2,R1,all-year,all-week,late-peak,heatpump,2035,0.62650000000
+4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,2.11230000000
+4,CO2f,2040,0,R1,all-year,all-week,late-peak,gasboiler,2035,25.81170000000
+4,CO2f,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,25.81170000000
+5,heat,2040,0,R1,all-year,all-week,evening,gasboiler,2035,0.26650000000
+5,heat,2040,1,R1,all-year,all-week,evening,heatpump,2030,1.37620000000
+5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2035,0.41870000000
+5,heat,2045,0,R1,all-year,all-week,evening,gasboiler,2035,0.26650000000
+5,heat,2045,2,R1,all-year,all-week,evening,heatpump,2035,0.41870000000
+5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,1.41150000000
+5,CO2f,2040,0,R1,all-year,all-week,evening,gasboiler,2035,17.24800000000
+5,CO2f,2045,0,R1,all-year,all-week,evening,gasboiler,2035,17.24800000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2045.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2045.csv
index 3e65d64a9..28a974df5 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2045.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2045,0,R1,gasboiler,2035,all-year,all-week,night,0.13230000000
-0,heat,2045,2,R1,heatpump,2035,all-year,all-week,night,0.20790000000
-0,heat,2045,3,R1,heatpump,2040,all-year,all-week,night,0.70080000000
-0,heat,2050,1,R1,gasboiler,2045,all-year,all-week,night,0.04150000000
-0,heat,2050,3,R1,heatpump,2040,all-year,all-week,night,0.70080000000
-0,heat,2050,4,R1,heatpump,2045,all-year,all-week,night,0.31620000000
-0,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,night,8.56370000000
-0,CO2f,2050,1,R1,gasboiler,2045,all-year,all-week,night,2.68350000000
-1,heat,2045,0,R1,gasboiler,2035,all-year,all-week,morning,0.19940000000
-1,heat,2045,2,R1,heatpump,2035,all-year,all-week,morning,0.31330000000
-1,heat,2045,3,R1,heatpump,2040,all-year,all-week,morning,1.05620000000
-1,heat,2050,1,R1,gasboiler,2045,all-year,all-week,morning,0.06250000000
-1,heat,2050,3,R1,heatpump,2040,all-year,all-week,morning,1.05620000000
-1,heat,2050,4,R1,heatpump,2045,all-year,all-week,morning,0.47650000000
-1,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,morning,12.90580000000
-1,CO2f,2050,1,R1,gasboiler,2045,all-year,all-week,morning,4.04420000000
-2,heat,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.13230000000
-2,heat,2045,2,R1,heatpump,2035,all-year,all-week,afternoon,0.20790000000
-2,heat,2045,3,R1,heatpump,2040,all-year,all-week,afternoon,0.70080000000
-2,heat,2050,1,R1,gasboiler,2045,all-year,all-week,afternoon,0.04150000000
-2,heat,2050,3,R1,heatpump,2040,all-year,all-week,afternoon,0.70080000000
-2,heat,2050,4,R1,heatpump,2045,all-year,all-week,afternoon,0.31620000000
-2,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,8.56370000000
-2,CO2f,2050,1,R1,gasboiler,2045,all-year,all-week,afternoon,2.68350000000
-3,heat,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.19940000000
-3,heat,2045,2,R1,heatpump,2035,all-year,all-week,early-peak,0.31330000000
-3,heat,2045,3,R1,heatpump,2040,all-year,all-week,early-peak,1.05620000000
-3,heat,2050,1,R1,gasboiler,2045,all-year,all-week,early-peak,0.06250000000
-3,heat,2050,3,R1,heatpump,2040,all-year,all-week,early-peak,1.05620000000
-3,heat,2050,4,R1,heatpump,2045,all-year,all-week,early-peak,0.47650000000
-3,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,12.90580000000
-3,CO2f,2050,1,R1,gasboiler,2045,all-year,all-week,early-peak,4.04420000000
-4,heat,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.39890000000
-4,heat,2045,2,R1,heatpump,2035,all-year,all-week,late-peak,0.62650000000
-4,heat,2045,3,R1,heatpump,2040,all-year,all-week,late-peak,2.11230000000
-4,heat,2050,1,R1,gasboiler,2045,all-year,all-week,late-peak,0.12500000000
-4,heat,2050,3,R1,heatpump,2040,all-year,all-week,late-peak,2.11230000000
-4,heat,2050,4,R1,heatpump,2045,all-year,all-week,late-peak,0.95310000000
-4,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,25.81170000000
-4,CO2f,2050,1,R1,gasboiler,2045,all-year,all-week,late-peak,8.08840000000
-5,heat,2045,0,R1,gasboiler,2035,all-year,all-week,evening,0.26650000000
-5,heat,2045,2,R1,heatpump,2035,all-year,all-week,evening,0.41870000000
-5,heat,2045,3,R1,heatpump,2040,all-year,all-week,evening,1.41150000000
-5,heat,2050,1,R1,gasboiler,2045,all-year,all-week,evening,0.08350000000
-5,heat,2050,3,R1,heatpump,2040,all-year,all-week,evening,1.41150000000
-5,heat,2050,4,R1,heatpump,2045,all-year,all-week,evening,0.63690000000
-5,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,evening,17.24800000000
-5,CO2f,2050,1,R1,gasboiler,2045,all-year,all-week,evening,5.40490000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2045,0,R1,all-year,all-week,night,gasboiler,2035,0.13230000000
+0,heat,2045,2,R1,all-year,all-week,night,heatpump,2035,0.20790000000
+0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,0.70080000000
+0,heat,2050,1,R1,all-year,all-week,night,gasboiler,2045,0.04150000000
+0,heat,2050,3,R1,all-year,all-week,night,heatpump,2040,0.70080000000
+0,heat,2050,4,R1,all-year,all-week,night,heatpump,2045,0.31620000000
+0,CO2f,2045,0,R1,all-year,all-week,night,gasboiler,2035,8.56370000000
+0,CO2f,2050,1,R1,all-year,all-week,night,gasboiler,2045,2.68350000000
+1,heat,2045,0,R1,all-year,all-week,morning,gasboiler,2035,0.19940000000
+1,heat,2045,2,R1,all-year,all-week,morning,heatpump,2035,0.31330000000
+1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,1.05620000000
+1,heat,2050,1,R1,all-year,all-week,morning,gasboiler,2045,0.06250000000
+1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2040,1.05620000000
+1,heat,2050,4,R1,all-year,all-week,morning,heatpump,2045,0.47650000000
+1,CO2f,2045,0,R1,all-year,all-week,morning,gasboiler,2035,12.90580000000
+1,CO2f,2050,1,R1,all-year,all-week,morning,gasboiler,2045,4.04420000000
+2,heat,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.13230000000
+2,heat,2045,2,R1,all-year,all-week,afternoon,heatpump,2035,0.20790000000
+2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,0.70080000000
+2,heat,2050,1,R1,all-year,all-week,afternoon,gasboiler,2045,0.04150000000
+2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2040,0.70080000000
+2,heat,2050,4,R1,all-year,all-week,afternoon,heatpump,2045,0.31620000000
+2,CO2f,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,8.56370000000
+2,CO2f,2050,1,R1,all-year,all-week,afternoon,gasboiler,2045,2.68350000000
+3,heat,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.19940000000
+3,heat,2045,2,R1,all-year,all-week,early-peak,heatpump,2035,0.31330000000
+3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,1.05620000000
+3,heat,2050,1,R1,all-year,all-week,early-peak,gasboiler,2045,0.06250000000
+3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2040,1.05620000000
+3,heat,2050,4,R1,all-year,all-week,early-peak,heatpump,2045,0.47650000000
+3,CO2f,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,12.90580000000
+3,CO2f,2050,1,R1,all-year,all-week,early-peak,gasboiler,2045,4.04420000000
+4,heat,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.39890000000
+4,heat,2045,2,R1,all-year,all-week,late-peak,heatpump,2035,0.62650000000
+4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,2.11230000000
+4,heat,2050,1,R1,all-year,all-week,late-peak,gasboiler,2045,0.12500000000
+4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2040,2.11230000000
+4,heat,2050,4,R1,all-year,all-week,late-peak,heatpump,2045,0.95310000000
+4,CO2f,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,25.81170000000
+4,CO2f,2050,1,R1,all-year,all-week,late-peak,gasboiler,2045,8.08840000000
+5,heat,2045,0,R1,all-year,all-week,evening,gasboiler,2035,0.26650000000
+5,heat,2045,2,R1,all-year,all-week,evening,heatpump,2035,0.41870000000
+5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,1.41150000000
+5,heat,2050,1,R1,all-year,all-week,evening,gasboiler,2045,0.08350000000
+5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2040,1.41150000000
+5,heat,2050,4,R1,all-year,all-week,evening,heatpump,2045,0.63690000000
+5,CO2f,2045,0,R1,all-year,all-week,evening,gasboiler,2035,17.24800000000
+5,CO2f,2050,1,R1,all-year,all-week,evening,gasboiler,2045,5.40490000000
diff --git a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2050.csv b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2050.csv
index 59bd881ef..72c9b5485 100644
--- a/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/6-add-correlation-demand/1-correlation/Results/Residential/Supply/2050.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2050,0,R1,gasboiler,2045,all-year,all-week,night,0.04150000000
-0,heat,2050,1,R1,heatpump,2040,all-year,all-week,night,0.70080000000
-0,heat,2050,2,R1,heatpump,2045,all-year,all-week,night,0.31620000000
-0,heat,2055,0,R1,gasboiler,2045,all-year,all-week,night,0.04150000000
-0,heat,2055,2,R1,heatpump,2045,all-year,all-week,night,0.31620000000
-0,heat,2055,3,R1,heatpump,2050,all-year,all-week,night,0.70790000000
-0,CO2f,2050,0,R1,gasboiler,2045,all-year,all-week,night,2.68350000000
-0,CO2f,2055,0,R1,gasboiler,2045,all-year,all-week,night,2.68350000000
-1,heat,2050,0,R1,gasboiler,2045,all-year,all-week,morning,0.06250000000
-1,heat,2050,1,R1,heatpump,2040,all-year,all-week,morning,1.05620000000
-1,heat,2050,2,R1,heatpump,2045,all-year,all-week,morning,0.47650000000
-1,heat,2055,0,R1,gasboiler,2045,all-year,all-week,morning,0.06250000000
-1,heat,2055,2,R1,heatpump,2045,all-year,all-week,morning,0.47650000000
-1,heat,2055,3,R1,heatpump,2050,all-year,all-week,morning,1.06680000000
-1,CO2f,2050,0,R1,gasboiler,2045,all-year,all-week,morning,4.04420000000
-1,CO2f,2055,0,R1,gasboiler,2045,all-year,all-week,morning,4.04420000000
-2,heat,2050,0,R1,gasboiler,2045,all-year,all-week,afternoon,0.04150000000
-2,heat,2050,1,R1,heatpump,2040,all-year,all-week,afternoon,0.70080000000
-2,heat,2050,2,R1,heatpump,2045,all-year,all-week,afternoon,0.31620000000
-2,heat,2055,0,R1,gasboiler,2045,all-year,all-week,afternoon,0.04150000000
-2,heat,2055,2,R1,heatpump,2045,all-year,all-week,afternoon,0.31620000000
-2,heat,2055,3,R1,heatpump,2050,all-year,all-week,afternoon,0.70790000000
-2,CO2f,2050,0,R1,gasboiler,2045,all-year,all-week,afternoon,2.68350000000
-2,CO2f,2055,0,R1,gasboiler,2045,all-year,all-week,afternoon,2.68350000000
-3,heat,2050,0,R1,gasboiler,2045,all-year,all-week,early-peak,0.06250000000
-3,heat,2050,1,R1,heatpump,2040,all-year,all-week,early-peak,1.05620000000
-3,heat,2050,2,R1,heatpump,2045,all-year,all-week,early-peak,0.47650000000
-3,heat,2055,0,R1,gasboiler,2045,all-year,all-week,early-peak,0.06250000000
-3,heat,2055,2,R1,heatpump,2045,all-year,all-week,early-peak,0.47650000000
-3,heat,2055,3,R1,heatpump,2050,all-year,all-week,early-peak,1.06680000000
-3,CO2f,2050,0,R1,gasboiler,2045,all-year,all-week,early-peak,4.04420000000
-3,CO2f,2055,0,R1,gasboiler,2045,all-year,all-week,early-peak,4.04420000000
-4,heat,2050,0,R1,gasboiler,2045,all-year,all-week,late-peak,0.12500000000
-4,heat,2050,1,R1,heatpump,2040,all-year,all-week,late-peak,2.11230000000
-4,heat,2050,2,R1,heatpump,2045,all-year,all-week,late-peak,0.95310000000
-4,heat,2055,0,R1,gasboiler,2045,all-year,all-week,late-peak,0.12500000000
-4,heat,2055,2,R1,heatpump,2045,all-year,all-week,late-peak,0.95310000000
-4,heat,2055,3,R1,heatpump,2050,all-year,all-week,late-peak,2.13360000000
-4,CO2f,2050,0,R1,gasboiler,2045,all-year,all-week,late-peak,8.08840000000
-4,CO2f,2055,0,R1,gasboiler,2045,all-year,all-week,late-peak,8.08840000000
-5,heat,2050,0,R1,gasboiler,2045,all-year,all-week,evening,0.08350000000
-5,heat,2050,1,R1,heatpump,2040,all-year,all-week,evening,1.41150000000
-5,heat,2050,2,R1,heatpump,2045,all-year,all-week,evening,0.63690000000
-5,heat,2055,0,R1,gasboiler,2045,all-year,all-week,evening,0.08350000000
-5,heat,2055,2,R1,heatpump,2045,all-year,all-week,evening,0.63690000000
-5,heat,2055,3,R1,heatpump,2050,all-year,all-week,evening,1.42580000000
-5,CO2f,2050,0,R1,gasboiler,2045,all-year,all-week,evening,5.40490000000
-5,CO2f,2055,0,R1,gasboiler,2045,all-year,all-week,evening,5.40490000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2050,0,R1,all-year,all-week,night,gasboiler,2045,0.04150000000
+0,heat,2050,1,R1,all-year,all-week,night,heatpump,2040,0.70080000000
+0,heat,2050,2,R1,all-year,all-week,night,heatpump,2045,0.31620000000
+0,heat,2055,0,R1,all-year,all-week,night,gasboiler,2045,0.04150000000
+0,heat,2055,2,R1,all-year,all-week,night,heatpump,2045,0.31620000000
+0,heat,2055,3,R1,all-year,all-week,night,heatpump,2050,0.70790000000
+0,CO2f,2050,0,R1,all-year,all-week,night,gasboiler,2045,2.68350000000
+0,CO2f,2055,0,R1,all-year,all-week,night,gasboiler,2045,2.68350000000
+1,heat,2050,0,R1,all-year,all-week,morning,gasboiler,2045,0.06250000000
+1,heat,2050,1,R1,all-year,all-week,morning,heatpump,2040,1.05620000000
+1,heat,2050,2,R1,all-year,all-week,morning,heatpump,2045,0.47650000000
+1,heat,2055,0,R1,all-year,all-week,morning,gasboiler,2045,0.06250000000
+1,heat,2055,2,R1,all-year,all-week,morning,heatpump,2045,0.47650000000
+1,heat,2055,3,R1,all-year,all-week,morning,heatpump,2050,1.06680000000
+1,CO2f,2050,0,R1,all-year,all-week,morning,gasboiler,2045,4.04420000000
+1,CO2f,2055,0,R1,all-year,all-week,morning,gasboiler,2045,4.04420000000
+2,heat,2050,0,R1,all-year,all-week,afternoon,gasboiler,2045,0.04150000000
+2,heat,2050,1,R1,all-year,all-week,afternoon,heatpump,2040,0.70080000000
+2,heat,2050,2,R1,all-year,all-week,afternoon,heatpump,2045,0.31620000000
+2,heat,2055,0,R1,all-year,all-week,afternoon,gasboiler,2045,0.04150000000
+2,heat,2055,2,R1,all-year,all-week,afternoon,heatpump,2045,0.31620000000
+2,heat,2055,3,R1,all-year,all-week,afternoon,heatpump,2050,0.70790000000
+2,CO2f,2050,0,R1,all-year,all-week,afternoon,gasboiler,2045,2.68350000000
+2,CO2f,2055,0,R1,all-year,all-week,afternoon,gasboiler,2045,2.68350000000
+3,heat,2050,0,R1,all-year,all-week,early-peak,gasboiler,2045,0.06250000000
+3,heat,2050,1,R1,all-year,all-week,early-peak,heatpump,2040,1.05620000000
+3,heat,2050,2,R1,all-year,all-week,early-peak,heatpump,2045,0.47650000000
+3,heat,2055,0,R1,all-year,all-week,early-peak,gasboiler,2045,0.06250000000
+3,heat,2055,2,R1,all-year,all-week,early-peak,heatpump,2045,0.47650000000
+3,heat,2055,3,R1,all-year,all-week,early-peak,heatpump,2050,1.06680000000
+3,CO2f,2050,0,R1,all-year,all-week,early-peak,gasboiler,2045,4.04420000000
+3,CO2f,2055,0,R1,all-year,all-week,early-peak,gasboiler,2045,4.04420000000
+4,heat,2050,0,R1,all-year,all-week,late-peak,gasboiler,2045,0.12500000000
+4,heat,2050,1,R1,all-year,all-week,late-peak,heatpump,2040,2.11230000000
+4,heat,2050,2,R1,all-year,all-week,late-peak,heatpump,2045,0.95310000000
+4,heat,2055,0,R1,all-year,all-week,late-peak,gasboiler,2045,0.12500000000
+4,heat,2055,2,R1,all-year,all-week,late-peak,heatpump,2045,0.95310000000
+4,heat,2055,3,R1,all-year,all-week,late-peak,heatpump,2050,2.13360000000
+4,CO2f,2050,0,R1,all-year,all-week,late-peak,gasboiler,2045,8.08840000000
+4,CO2f,2055,0,R1,all-year,all-week,late-peak,gasboiler,2045,8.08840000000
+5,heat,2050,0,R1,all-year,all-week,evening,gasboiler,2045,0.08350000000
+5,heat,2050,1,R1,all-year,all-week,evening,heatpump,2040,1.41150000000
+5,heat,2050,2,R1,all-year,all-week,evening,heatpump,2045,0.63690000000
+5,heat,2055,0,R1,all-year,all-week,evening,gasboiler,2045,0.08350000000
+5,heat,2055,2,R1,all-year,all-week,evening,heatpump,2045,0.63690000000
+5,heat,2055,3,R1,all-year,all-week,evening,heatpump,2050,1.42580000000
+5,CO2f,2050,0,R1,all-year,all-week,evening,gasboiler,2045,5.40490000000
+5,CO2f,2055,0,R1,all-year,all-week,evening,gasboiler,2045,5.40490000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2020.csv
index 5c04a79fe..33bbbed35 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2020.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2020.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gassupply1,15.00000000000
-0,2025,R1,2020,gassupply1,15.42960000000
-0,2030,R1,2020,gassupply1,7.92960000000
-0,2035,R1,2020,gassupply1,0.42960000000
-0,2040,R1,2020,gassupply1,0.42960000000
-0,2045,R1,2020,gassupply1,0.42960000000
-0,2050,R1,2020,gassupply1,0.42960000000
-0,2059,R1,2020,gassupply1,0.42960000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.42960000000
+0,2030,R1,gassupply1,2020,7.92960000000
+0,2035,R1,gassupply1,2020,0.42960000000
+0,2040,R1,gassupply1,2020,0.42960000000
+0,2045,R1,gassupply1,2020,0.42960000000
+0,2050,R1,gassupply1,2020,0.42960000000
+0,2059,R1,gassupply1,2020,0.42960000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2025.csv
index 83f68b799..9d035dfd3 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2025.csv
@@ -1,8 +1,8 @@
-asset,year,region,installed,technology,capacity
-0,2025,R1,2020,gassupply1,15.42960000000
-0,2030,R1,2020,gassupply1,7.92960000000
-0,2035,R1,2020,gassupply1,0.42960000000
-0,2040,R1,2020,gassupply1,0.42960000000
-0,2045,R1,2020,gassupply1,0.42960000000
-0,2050,R1,2020,gassupply1,0.42960000000
-0,2059,R1,2020,gassupply1,0.42960000000
+asset,year,region,technology,installed,capacity
+0,2025,R1,gassupply1,2020,15.42960000000
+0,2030,R1,gassupply1,2020,7.92960000000
+0,2035,R1,gassupply1,2020,0.42960000000
+0,2040,R1,gassupply1,2020,0.42960000000
+0,2045,R1,gassupply1,2020,0.42960000000
+0,2050,R1,gassupply1,2020,0.42960000000
+0,2059,R1,gassupply1,2020,0.42960000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2030.csv
index ec7a9590e..4cae28844 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2030.csv
@@ -1,14 +1,14 @@
-asset,year,region,installed,technology,capacity
-0,2030,R1,2020,gassupply1,7.92960000000
-0,2035,R1,2020,gassupply1,0.42960000000
-0,2040,R1,2020,gassupply1,0.42960000000
-0,2045,R1,2020,gassupply1,0.42960000000
-0,2050,R1,2020,gassupply1,0.42960000000
-0,2059,R1,2020,gassupply1,0.42960000000
-1,2035,R1,2030,gassupply1,4.85480000000
-1,2040,R1,2030,gassupply1,4.85480000000
-1,2045,R1,2030,gassupply1,4.85480000000
-1,2050,R1,2030,gassupply1,4.85480000000
-1,2059,R1,2030,gassupply1,4.85480000000
-1,2060,R1,2030,gassupply1,4.85480000000
-1,2069,R1,2030,gassupply1,4.85480000000
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,7.92960000000
+0,2035,R1,gassupply1,2020,0.42960000000
+0,2040,R1,gassupply1,2020,0.42960000000
+0,2045,R1,gassupply1,2020,0.42960000000
+0,2050,R1,gassupply1,2020,0.42960000000
+0,2059,R1,gassupply1,2020,0.42960000000
+1,2035,R1,gassupply1,2030,4.85480000000
+1,2040,R1,gassupply1,2030,4.85480000000
+1,2045,R1,gassupply1,2030,4.85480000000
+1,2050,R1,gassupply1,2030,4.85480000000
+1,2059,R1,gassupply1,2030,4.85480000000
+1,2060,R1,gassupply1,2030,4.85480000000
+1,2069,R1,gassupply1,2030,4.85480000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2035.csv
index 5c5b3b30d..772418b79 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2035.csv
@@ -1,13 +1,13 @@
-asset,year,region,installed,technology,capacity
-0,2035,R1,2020,gassupply1,0.42960000000
-0,2040,R1,2020,gassupply1,0.42960000000
-0,2045,R1,2020,gassupply1,0.42960000000
-0,2050,R1,2020,gassupply1,0.42960000000
-0,2059,R1,2020,gassupply1,0.42960000000
-1,2035,R1,2030,gassupply1,4.85480000000
-1,2040,R1,2030,gassupply1,4.85480000000
-1,2045,R1,2030,gassupply1,4.85480000000
-1,2050,R1,2030,gassupply1,4.85480000000
-1,2059,R1,2030,gassupply1,4.85480000000
-1,2060,R1,2030,gassupply1,4.85480000000
-1,2069,R1,2030,gassupply1,4.85480000000
+asset,year,region,technology,installed,capacity
+0,2035,R1,gassupply1,2020,0.42960000000
+0,2040,R1,gassupply1,2020,0.42960000000
+0,2045,R1,gassupply1,2020,0.42960000000
+0,2050,R1,gassupply1,2020,0.42960000000
+0,2059,R1,gassupply1,2020,0.42960000000
+1,2035,R1,gassupply1,2030,4.85480000000
+1,2040,R1,gassupply1,2030,4.85480000000
+1,2045,R1,gassupply1,2030,4.85480000000
+1,2050,R1,gassupply1,2030,4.85480000000
+1,2059,R1,gassupply1,2030,4.85480000000
+1,2060,R1,gassupply1,2030,4.85480000000
+1,2069,R1,gassupply1,2030,4.85480000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2040.csv
index b2702c268..70eb04b5b 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2040.csv
@@ -1,11 +1,11 @@
-asset,year,region,installed,technology,capacity
-0,2040,R1,2020,gassupply1,0.42960000000
-0,2045,R1,2020,gassupply1,0.42960000000
-0,2050,R1,2020,gassupply1,0.42960000000
-0,2059,R1,2020,gassupply1,0.42960000000
-1,2040,R1,2030,gassupply1,4.85480000000
-1,2045,R1,2030,gassupply1,4.85480000000
-1,2050,R1,2030,gassupply1,4.85480000000
-1,2059,R1,2030,gassupply1,4.85480000000
-1,2060,R1,2030,gassupply1,4.85480000000
-1,2069,R1,2030,gassupply1,4.85480000000
+asset,year,region,technology,installed,capacity
+0,2040,R1,gassupply1,2020,0.42960000000
+0,2045,R1,gassupply1,2020,0.42960000000
+0,2050,R1,gassupply1,2020,0.42960000000
+0,2059,R1,gassupply1,2020,0.42960000000
+1,2040,R1,gassupply1,2030,4.85480000000
+1,2045,R1,gassupply1,2030,4.85480000000
+1,2050,R1,gassupply1,2030,4.85480000000
+1,2059,R1,gassupply1,2030,4.85480000000
+1,2060,R1,gassupply1,2030,4.85480000000
+1,2069,R1,gassupply1,2030,4.85480000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2045.csv
index e8be0bbde..fdf6b01bb 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2045.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-0,2045,R1,2020,gassupply1,0.42960000000
-0,2050,R1,2020,gassupply1,0.42960000000
-0,2059,R1,2020,gassupply1,0.42960000000
-1,2045,R1,2030,gassupply1,4.85480000000
-1,2050,R1,2030,gassupply1,4.85480000000
-1,2059,R1,2030,gassupply1,4.85480000000
-1,2060,R1,2030,gassupply1,4.85480000000
-1,2069,R1,2030,gassupply1,4.85480000000
+asset,year,region,technology,installed,capacity
+0,2045,R1,gassupply1,2020,0.42960000000
+0,2050,R1,gassupply1,2020,0.42960000000
+0,2059,R1,gassupply1,2020,0.42960000000
+1,2045,R1,gassupply1,2030,4.85480000000
+1,2050,R1,gassupply1,2030,4.85480000000
+1,2059,R1,gassupply1,2030,4.85480000000
+1,2060,R1,gassupply1,2030,4.85480000000
+1,2069,R1,gassupply1,2030,4.85480000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2050.csv
index cd8cdf35d..ed1ed9d4b 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Gas/Capacity/2050.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-0,2050,R1,2020,gassupply1,0.42960000000
-0,2055,R1,2020,gassupply1,0.42960000000
-0,2059,R1,2020,gassupply1,0.42960000000
-1,2050,R1,2030,gassupply1,4.85480000000
-1,2055,R1,2030,gassupply1,4.85480000000
-1,2059,R1,2030,gassupply1,4.85480000000
-1,2060,R1,2030,gassupply1,4.85480000000
-1,2069,R1,2030,gassupply1,4.85480000000
+asset,year,region,technology,installed,capacity
+0,2050,R1,gassupply1,2020,0.42960000000
+0,2055,R1,gassupply1,2020,0.42960000000
+0,2059,R1,gassupply1,2020,0.42960000000
+1,2050,R1,gassupply1,2030,4.85480000000
+1,2055,R1,gassupply1,2030,4.85480000000
+1,2059,R1,gassupply1,2030,4.85480000000
+1,2060,R1,gassupply1,2030,4.85480000000
+1,2069,R1,gassupply1,2030,4.85480000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Consumption.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Consumption.csv
index 3013fe141..69eb3a4f7 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Consumption.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Consumption.csv
@@ -1,229 +1,229 @@
 agent,asset,category,comm_usage,commodity,consumption,dst_region,index,installed,region,sector,technology,timeslice,units_prices,year
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.16000000000,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.74000000000,R1,9,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.16000000000,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.74000000000,R1,25,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,3.48000000000,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,2.32000000000,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.32222222222,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R1,4,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.48333333333,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R1,20,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.32222222222,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R1,36,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.48333333333,R1,49,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R1,52,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.96666666667,R1,65,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.26666666667,R1,68,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.64444444444,R1,81,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.84444444444,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.33576719577,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22116402116,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50365079365,R1,13,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33174603175,R1,19,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.33576719577,R1,25,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22116402116,R1,31,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50365079365,R1,37,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33174603175,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.00730158730,R1,49,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66349206349,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.67153439153,R1,61,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.44232804233,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R1,0,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.26422222222,R1,5,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15333333333,R1,8,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R1,16,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.39633333333,R1,21,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.23000000000,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R1,32,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.26422222222,R1,37,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15333333333,R1,40,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R1,48,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.39633333333,R1,53,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.23000000000,R1,56,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.26666666667,R1,64,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.79266666667,R1,69,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.46000000000,R1,72,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.84444444444,R1,80,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.52844444444,R1,85,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30666666667,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.23951240017,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33604315539,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.35926860025,R1,15,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.50406473308,R1,19,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.23951240017,R1,27,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33604315539,R1,31,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.35926860025,R1,39,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.50406473308,R1,43,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.71853720050,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,1.00812946616,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.47902480034,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.67208631077,R1,67,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.26422222222,R1,1,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15333333333,R1,4,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,8,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.39633333333,R1,21,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.23000000000,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R1,28,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.26422222222,R1,41,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15333333333,R1,44,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.39633333333,R1,61,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.23000000000,R1,64,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R1,68,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.79266666667,R1,81,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.46000000000,R1,84,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.66666666667,R1,88,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.52844444444,R1,101,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30666666667,R1,104,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.11111111111,R1,108,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.18011035545,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25270028658,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.27607824686,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.27016553317,R1,19,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.37905042987,R1,23,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.41411737029,R1,27,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.18011035545,R1,35,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25270028658,R1,39,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.27607824686,R1,43,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.27016553317,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.37905042987,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.41411737029,R1,59,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.54033106634,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.75810085975,R1,71,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.82823474058,R1,75,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.36022071089,R1,83,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.50540057316,R1,87,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.55215649372,R1,91,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,0,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05864444444,R1,5,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.35755555556,R1,8,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R1,16,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08796666667,R1,21,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.53633333333,R1,24,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,32,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05864444444,R1,37,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.35755555556,R1,40,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08796666667,R1,53,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.53633333333,R1,56,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.66666666667,R1,64,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17593333333,R1,69,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.07266666667,R1,72,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.11111111111,R1,80,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11728888889,R1,85,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.71511111111,R1,88,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.15824641356,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22202451357,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24256457836,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.29027560563,R1,15,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.23736962033,R1,23,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33303677035,R1,27,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.36384686753,R1,31,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.43541340845,R1,35,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.15824641356,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22202451357,R1,47,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24256457836,R1,51,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.29027560563,R1,55,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.23736962033,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33303677035,R1,67,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.36384686753,R1,71,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.43541340845,R1,75,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.47473924067,R1,83,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66607354070,R1,87,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.72769373507,R1,91,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.87082681690,R1,95,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.31649282711,R1,103,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.44404902713,R1,107,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.48512915671,R1,111,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.58055121127,R1,115,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05864444444,R1,1,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.35755555556,R1,4,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R1,8,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08796666667,R1,17,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.53633333333,R1,20,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R1,24,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05864444444,R1,33,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.35755555556,R1,36,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R1,40,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08796666667,R1,49,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.53633333333,R1,52,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R1,56,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17593333333,R1,65,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.07266666667,R1,68,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,2.06666666667,R1,72,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11728888889,R1,81,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.71511111111,R1,84,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.37777777778,R1,88,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13656827502,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19160942829,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.20933571449,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25051081949,R1,15,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25842020716,R1,19,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.20485241253,R1,27,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.28741414243,R1,31,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.31400357173,R1,35,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.37576622924,R1,39,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.38763031074,R1,43,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13656827502,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19160942829,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.20933571449,R1,59,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25051081949,R1,63,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25842020716,R1,67,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.20485241253,R1,75,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.28741414243,R1,79,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.31400357173,R1,83,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.37576622924,R1,87,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.38763031074,R1,91,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40970482506,R1,99,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.57482828486,R1,103,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.62800714346,R1,107,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.75153245848,R1,111,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.77526062148,R1,115,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.27313655004,R1,123,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.38321885657,R1,127,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.41867142897,R1,131,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.50102163899,R1,135,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.51684041432,R1,139,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R1,0,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51111111111,R1,4,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R1,12,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.76666666667,R1,16,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R1,24,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51111111111,R1,28,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R1,36,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.76666666667,R1,40,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,2.06666666667,R1,48,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.53333333333,R1,52,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.37777777778,R1,60,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.02222222222,R1,64,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19078573323,R1,3,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.20843581726,R1,7,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24943391777,R1,11,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25730930438,R1,15,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.29403522736,R1,19,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.28617859985,R1,27,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.31265372589,R1,31,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.37415087666,R1,35,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.38596395657,R1,39,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.44105284104,R1,43,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19078573323,R1,51,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.20843581726,R1,55,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24943391777,R1,59,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25730930438,R1,63,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.29403522736,R1,67,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.28617859985,R1,75,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.31265372589,R1,79,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.37415087666,R1,83,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.38596395657,R1,87,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.44105284104,R1,91,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.57235719969,R1,99,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.62530745179,R1,103,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.74830175331,R1,107,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.77192791314,R1,111,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.88210568207,R1,115,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.38157146646,R1,123,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.41687163452,R1,127,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.49886783554,R1,131,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.51461860876,R1,135,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.58807045471,R1,139,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,R1,9,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,R1,25,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,3.48000000000,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,2.32000000000,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,4,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,20,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,36,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,R1,49,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,52,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,R1,65,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,R1,68,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,R1,81,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,R1,13,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,R1,19,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,R1,25,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,R1,31,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,R1,37,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.00730158730,R1,49,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.66349206349,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.67153439153,R1,61,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.44232804233,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,0,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,R1,5,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,R1,8,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,16,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,R1,21,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,32,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,R1,37,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,R1,40,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,48,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,R1,53,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,R1,56,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,R1,64,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,R1,69,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,R1,72,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,R1,80,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,R1,85,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.23951240017,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33604315539,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.35926860025,R1,15,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.50406473308,R1,19,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.23951240017,R1,27,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33604315539,R1,31,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.35926860025,R1,39,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.50406473308,R1,43,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.71853720050,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.00812946616,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.47902480034,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.67208631077,R1,67,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,R1,1,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,R1,4,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,R1,8,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,R1,21,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,R1,28,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,R1,41,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,R1,44,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,R1,61,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,R1,64,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,R1,68,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,R1,81,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,R1,84,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,R1,88,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,R1,101,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,R1,104,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,R1,108,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.18011035545,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25270028658,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.27607824686,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.27016553317,R1,19,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37905042987,R1,23,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.41411737029,R1,27,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.18011035545,R1,35,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25270028658,R1,39,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.27607824686,R1,43,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.27016553317,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37905042987,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.41411737029,R1,59,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.54033106634,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.75810085975,R1,71,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.82823474058,R1,75,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.36022071089,R1,83,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.50540057316,R1,87,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.55215649372,R1,91,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,R1,0,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,R1,5,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,R1,8,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,R1,16,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,R1,21,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,R1,24,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,R1,32,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,R1,37,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,R1,40,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,R1,53,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,R1,56,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,R1,64,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,R1,69,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,R1,72,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,R1,80,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,R1,85,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,R1,88,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15824641356,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22202451357,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24256457836,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.29027560563,R1,15,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.23736962033,R1,23,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33303677035,R1,27,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.36384686753,R1,31,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.43541340845,R1,35,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15824641356,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22202451357,R1,47,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24256457836,R1,51,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.29027560563,R1,55,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.23736962033,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33303677035,R1,67,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.36384686753,R1,71,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.43541340845,R1,75,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.47473924067,R1,83,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.66607354070,R1,87,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.72769373507,R1,91,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.87082681690,R1,95,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.31649282711,R1,103,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.44404902713,R1,107,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.48512915671,R1,111,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.58055121127,R1,115,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,R1,1,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,R1,4,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,R1,8,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,R1,17,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,R1,20,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,R1,24,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,R1,33,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,R1,36,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,R1,40,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,R1,49,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,R1,52,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,R1,56,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,R1,65,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,R1,68,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,R1,72,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,R1,81,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,R1,84,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,R1,88,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.13656827502,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.19160942829,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20933571449,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25051081949,R1,15,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25842020716,R1,19,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20485241253,R1,27,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.28741414243,R1,31,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.31400357173,R1,35,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37576622924,R1,39,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.38763031074,R1,43,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.13656827502,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.19160942829,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20933571449,R1,59,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25051081949,R1,63,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25842020716,R1,67,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20485241253,R1,75,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.28741414243,R1,79,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.31400357173,R1,83,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37576622924,R1,87,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.38763031074,R1,91,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.40970482506,R1,99,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.57482828486,R1,103,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.62800714346,R1,107,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.75153245848,R1,111,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.77526062148,R1,115,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.27313655004,R1,123,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.38321885657,R1,127,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.41867142897,R1,131,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.50102163899,R1,135,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.51684041432,R1,139,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,R1,0,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,R1,4,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,R1,12,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,R1,16,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,R1,24,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,R1,28,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,R1,36,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,R1,40,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,R1,48,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.53333333333,R1,52,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,R1,60,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.02222222222,R1,64,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.19078573323,R1,3,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20843581726,R1,7,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24943391777,R1,11,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25730930438,R1,15,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.29403522736,R1,19,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.28617859985,R1,27,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.31265372589,R1,31,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37415087666,R1,35,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.38596395657,R1,39,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.44105284104,R1,43,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.19078573323,R1,51,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20843581726,R1,55,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24943391777,R1,59,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25730930438,R1,63,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.29403522736,R1,67,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.28617859985,R1,75,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.31265372589,R1,79,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37415087666,R1,83,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.38596395657,R1,87,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.44105284104,R1,91,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.57235719969,R1,99,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.62530745179,R1,103,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.74830175331,R1,107,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.77192791314,R1,111,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.88210568207,R1,115,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.38157146646,R1,123,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.41687163452,R1,127,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.49886783554,R1,131,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.51461860876,R1,135,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.58807045471,R1,139,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Supply.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Supply.csv
index 37d1c8538..e5a087bcc 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Supply.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/MCAMetric_Supply.csv
@@ -1,325 +1,325 @@
 agent,asset,category,comm_usage,commodity,dst_region,index,installed,region,sector,supply,technology,timeslice,units_prices,year
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,4,2020.00000000000,R1,residential,1.00000000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,6,2020.00000000000,R1,residential,64.71000000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2020.00000000000,R1,residential,1.50000000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,14,2020.00000000000,R1,residential,97.06500000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,20,2020.00000000000,R1,residential,1.00000000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2020.00000000000,R1,residential,64.71000000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,28,2020.00000000000,R1,residential,1.50000000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,30,2020.00000000000,R1,residential,97.06500000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,36,2020.00000000000,R1,residential,3.00000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,38,2020.00000000000,R1,residential,194.13000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2020.00000000000,R1,residential,2.00000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,46,2020.00000000000,R1,residential,129.42000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,1.16732260678,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2020.00000000000,R1,gas,1.88146776247,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,1.68925801597,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2020.00000000000,R1,gas,1.88146776247,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,3.76293552495,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2020.00000000000,R1,gas,3.11754832735,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2020.00000000000,R1,residential,0.83333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2020.00000000000,R1,residential,3.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,76,2020.00000000000,R1,residential,53.92500000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2020.00000000000,R1,residential,0.55555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2020.00000000000,R1,residential,35.95000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.20105820106,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2020.00000000000,R1,power,0.22116402116,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,6,2020.00000000000,R1,power,18.43100529101,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,12,2020.00000000000,R1,power,0.30158730159,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,13,2020.00000000000,R1,power,0.33174603175,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,18,2020.00000000000,R1,power,27.64650793651,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,24,2020.00000000000,R1,power,0.20105820106,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,25,2020.00000000000,R1,power,0.22116402116,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,30,2020.00000000000,R1,power,18.43100529101,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,36,2020.00000000000,R1,power,0.30158730159,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,37,2020.00000000000,R1,power,0.33174603175,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,42,2020.00000000000,R1,power,27.64650793651,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,48,2020.00000000000,R1,power,0.60317460317,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,49,2020.00000000000,R1,power,0.66349206349,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,54,2020.00000000000,R1,power,55.29301587302,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,60,2020.00000000000,R1,power,0.40211640212,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,61,2020.00000000000,R1,power,0.44232804233,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,66,2020.00000000000,R1,power,36.86201058201,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.65622222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2020.00000000000,R1,gas,1.15133333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,1.32422222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2020.00000000000,R1,gas,1.15133333333,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,2.30266666667,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2020.00000000000,R1,gas,2.31444444444,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,13,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,26,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,29,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,45,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,58,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,61,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2020.00000000000,R1,residential,3.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2025.00000000000,R1,residential,0.68333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2025.00000000000,R1,residential,1.15000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,77,2025.00000000000,R1,residential,44.21850000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2025.00000000000,R1,residential,0.45555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2025.00000000000,R1,residential,0.76666666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,93,2025.00000000000,R1,residential,29.47900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.23951240017,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2025.00000000000,R1,power,0.33604315539,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,12,2020.00000000000,R1,power,0.35926860025,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,13,2025.00000000000,R1,power,0.50406473308,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,24,2020.00000000000,R1,power,0.23951240017,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,25,2025.00000000000,R1,power,0.33604315539,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,36,2020.00000000000,R1,power,0.35926860025,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,37,2025.00000000000,R1,power,0.50406473308,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,48,2020.00000000000,R1,power,0.71853720050,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,49,2025.00000000000,R1,power,1.00812946616,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,60,2020.00000000000,R1,power,0.47902480034,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,61,2025.00000000000,R1,power,0.67208631077,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.26422222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,0.39633333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,0.26422222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,0.39633333333,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2020.00000000000,R1,gas,0.79266666667,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2020.00000000000,R1,gas,0.52844444444,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,11,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,15,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,32,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,35,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,50,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,51,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,52,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,55,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,70,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,71,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,75,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2025.00000000000,R1,residential,0.68333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,91,2025.00000000000,R1,residential,1.15000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,92,2030.00000000000,R1,residential,4.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,95,2025.00000000000,R1,residential,44.21850000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,110,2025.00000000000,R1,residential,0.45555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,111,2025.00000000000,R1,residential,0.76666666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,112,2030.00000000000,R1,residential,2.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,115,2025.00000000000,R1,residential,29.47900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.18011035545,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2025.00000000000,R1,power,0.25270028658,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2030.00000000000,R1,power,0.27607824686,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,16,2020.00000000000,R1,power,0.27016553317,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,17,2025.00000000000,R1,power,0.37905042987,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,18,2030.00000000000,R1,power,0.41411737029,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,32,2020.00000000000,R1,power,0.18011035545,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,33,2025.00000000000,R1,power,0.25270028658,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,34,2030.00000000000,R1,power,0.27607824686,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,48,2020.00000000000,R1,power,0.27016553317,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,49,2025.00000000000,R1,power,0.37905042987,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2030.00000000000,R1,power,0.41411737029,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,64,2020.00000000000,R1,power,0.54033106634,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,65,2025.00000000000,R1,power,0.75810085975,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,66,2030.00000000000,R1,power,0.82823474058,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,80,2020.00000000000,R1,power,0.36022071089,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,81,2025.00000000000,R1,power,0.50540057316,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,82,2030.00000000000,R1,power,0.55215649372,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.02148148148,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2030.00000000000,R1,gas,0.24274074074,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,0.03222222222,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2030.00000000000,R1,gas,0.36411111111,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,0.02148148148,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.24274074074,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,0.03222222222,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2030.00000000000,R1,gas,0.36411111111,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2020.00000000000,R1,gas,0.06444444444,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2030.00000000000,R1,gas,0.72822222222,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2020.00000000000,R1,gas,0.04296296296,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,11,2030.00000000000,R1,gas,0.48548148148,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,13,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,26,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,29,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,45,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,58,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,61,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2030.00000000000,R1,residential,4.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2035.00000000000,R1,residential,0.15166666667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2035.00000000000,R1,residential,2.68166666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,77,2035.00000000000,R1,residential,9.81435000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2030.00000000000,R1,residential,2.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2035.00000000000,R1,residential,0.10111111111,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2035.00000000000,R1,residential,1.78777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,93,2035.00000000000,R1,residential,6.54290000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.15824641356,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2025.00000000000,R1,power,0.22202451357,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2030.00000000000,R1,power,0.24256457836,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2035.00000000000,R1,power,0.29027560563,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,20,2020.00000000000,R1,power,0.23736962033,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,21,2025.00000000000,R1,power,0.33303677035,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,22,2030.00000000000,R1,power,0.36384686753,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,23,2035.00000000000,R1,power,0.43541340845,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,40,2020.00000000000,R1,power,0.15824641356,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,41,2025.00000000000,R1,power,0.22202451357,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,42,2030.00000000000,R1,power,0.24256457836,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,43,2035.00000000000,R1,power,0.29027560563,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,60,2020.00000000000,R1,power,0.23736962033,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,61,2025.00000000000,R1,power,0.33303677035,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,62,2030.00000000000,R1,power,0.36384686753,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,63,2035.00000000000,R1,power,0.43541340845,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,80,2020.00000000000,R1,power,0.47473924067,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,81,2025.00000000000,R1,power,0.66607354070,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,82,2030.00000000000,R1,power,0.72769373507,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,83,2035.00000000000,R1,power,0.87082681690,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,100,2020.00000000000,R1,power,0.31649282711,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,101,2025.00000000000,R1,power,0.44404902713,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,102,2030.00000000000,R1,power,0.48512915671,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,103,2035.00000000000,R1,power,0.58055121127,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.00476784101,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2030.00000000000,R1,gas,0.05387660343,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,0.00715176152,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2030.00000000000,R1,gas,0.08081490515,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,0.00476784101,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.05387660343,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,0.00715176152,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2030.00000000000,R1,gas,0.08081490515,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2020.00000000000,R1,gas,0.01430352304,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2030.00000000000,R1,gas,0.16162981030,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2020.00000000000,R1,gas,0.00953568202,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,11,2030.00000000000,R1,gas,0.10775320687,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,26,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,58,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2035.00000000000,R1,residential,0.15166666667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2035.00000000000,R1,residential,2.68166666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2040.00000000000,R1,residential,5.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,76,2035.00000000000,R1,residential,9.81435000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2035.00000000000,R1,residential,0.10111111111,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2035.00000000000,R1,residential,1.78777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2040.00000000000,R1,residential,3.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2035.00000000000,R1,residential,6.54290000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.13656827502,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2025.00000000000,R1,power,0.19160942829,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2030.00000000000,R1,power,0.20933571449,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2035.00000000000,R1,power,0.25051081949,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2040.00000000000,R1,power,0.25842020716,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,24,2020.00000000000,R1,power,0.20485241253,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,25,2025.00000000000,R1,power,0.28741414243,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,26,2030.00000000000,R1,power,0.31400357173,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,27,2035.00000000000,R1,power,0.37576622924,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,28,2040.00000000000,R1,power,0.38763031074,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,48,2020.00000000000,R1,power,0.13656827502,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,49,2025.00000000000,R1,power,0.19160942829,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2030.00000000000,R1,power,0.20933571449,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,51,2035.00000000000,R1,power,0.25051081949,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,52,2040.00000000000,R1,power,0.25842020716,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,72,2020.00000000000,R1,power,0.20485241253,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,73,2025.00000000000,R1,power,0.28741414243,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,74,2030.00000000000,R1,power,0.31400357173,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2035.00000000000,R1,power,0.37576622924,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,76,2040.00000000000,R1,power,0.38763031074,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,96,2020.00000000000,R1,power,0.40970482506,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,97,2025.00000000000,R1,power,0.57482828486,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,98,2030.00000000000,R1,power,0.62800714346,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,99,2035.00000000000,R1,power,0.75153245848,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,100,2040.00000000000,R1,power,0.77526062148,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2020.00000000000,R1,power,0.27313655004,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2025.00000000000,R1,power,0.38321885657,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,122,2030.00000000000,R1,power,0.41867142897,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2035.00000000000,R1,power,0.50102163899,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,124,2040.00000000000,R1,power,0.51684041432,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.00476784101,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2030.00000000000,R1,gas,0.05387660343,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,0.00715176152,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2030.00000000000,R1,gas,0.08081490515,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,0.00476784101,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.05387660343,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,0.00715176152,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2030.00000000000,R1,gas,0.08081490515,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2020.00000000000,R1,gas,0.01430352304,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2030.00000000000,R1,gas,0.16162981030,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2020.00000000000,R1,gas,0.00953568202,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,11,2030.00000000000,R1,gas,0.10775320687,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,7,2045.00000000000,R1,residential,1.27777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2045.00000000000,R1,residential,1.91666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2045.00000000000,R1,residential,1.27777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2045.00000000000,R1,residential,1.91666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,54,2040.00000000000,R1,residential,5.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,55,2045.00000000000,R1,residential,3.83333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,66,2040.00000000000,R1,residential,3.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,67,2045.00000000000,R1,residential,2.55555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2025.00000000000,R1,power,0.19078573323,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2030.00000000000,R1,power,0.20843581726,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2035.00000000000,R1,power,0.24943391777,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2040.00000000000,R1,power,0.25730930438,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2045.00000000000,R1,power,0.29403522736,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,24,2025.00000000000,R1,power,0.28617859985,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,25,2030.00000000000,R1,power,0.31265372589,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,26,2035.00000000000,R1,power,0.37415087666,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,27,2040.00000000000,R1,power,0.38596395657,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,28,2045.00000000000,R1,power,0.44105284104,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,48,2025.00000000000,R1,power,0.19078573323,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,49,2030.00000000000,R1,power,0.20843581726,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2035.00000000000,R1,power,0.24943391777,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,51,2040.00000000000,R1,power,0.25730930438,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,52,2045.00000000000,R1,power,0.29403522736,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,72,2025.00000000000,R1,power,0.28617859985,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,73,2030.00000000000,R1,power,0.31265372589,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,74,2035.00000000000,R1,power,0.37415087666,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2040.00000000000,R1,power,0.38596395657,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,76,2045.00000000000,R1,power,0.44105284104,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,96,2025.00000000000,R1,power,0.57235719969,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,97,2030.00000000000,R1,power,0.62530745179,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,98,2035.00000000000,R1,power,0.74830175331,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,99,2040.00000000000,R1,power,0.77192791314,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,100,2045.00000000000,R1,power,0.88210568207,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2025.00000000000,R1,power,0.38157146646,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2030.00000000000,R1,power,0.41687163452,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,122,2035.00000000000,R1,power,0.49886783554,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2040.00000000000,R1,power,0.51461860876,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,124,2045.00000000000,R1,power,0.58807045471,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,4,2020.00000000000,R1,residential,1.00000000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,6,2020.00000000000,R1,residential,64.71000000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,12,2020.00000000000,R1,residential,1.50000000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,14,2020.00000000000,R1,residential,97.06500000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,20,2020.00000000000,R1,residential,1.00000000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,22,2020.00000000000,R1,residential,64.71000000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,28,2020.00000000000,R1,residential,1.50000000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,30,2020.00000000000,R1,residential,97.06500000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,36,2020.00000000000,R1,residential,3.00000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,38,2020.00000000000,R1,residential,194.13000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,44,2020.00000000000,R1,residential,2.00000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,46,2020.00000000000,R1,residential,129.42000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,1.16732260678,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2020.00000000000,R1,gas,1.88146776247,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,1.68925801597,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2020.00000000000,R1,gas,1.88146776247,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,3.76293552495,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2020.00000000000,R1,gas,3.11754832735,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,8,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,9,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,12,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,24,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,25,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,28,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,40,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,41,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,44,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,56,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,57,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,60,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,72,2020.00000000000,R1,residential,0.83333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,73,2020.00000000000,R1,residential,3.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,76,2020.00000000000,R1,residential,53.92500000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2020.00000000000,R1,residential,0.55555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,89,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,92,2020.00000000000,R1,residential,35.95000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.20105820106,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.22116402116,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,6,2020.00000000000,R1,power,18.43100529101,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,12,2020.00000000000,R1,power,0.30158730159,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,13,2020.00000000000,R1,power,0.33174603175,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,18,2020.00000000000,R1,power,27.64650793651,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,0.20105820106,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2020.00000000000,R1,power,0.22116402116,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,30,2020.00000000000,R1,power,18.43100529101,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,36,2020.00000000000,R1,power,0.30158730159,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,37,2020.00000000000,R1,power,0.33174603175,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,42,2020.00000000000,R1,power,27.64650793651,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.60317460317,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2020.00000000000,R1,power,0.66349206349,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,54,2020.00000000000,R1,power,55.29301587302,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,0.40211640212,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,61,2020.00000000000,R1,power,0.44232804233,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,66,2020.00000000000,R1,power,36.86201058201,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.65622222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2020.00000000000,R1,gas,1.15133333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,1.32422222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2020.00000000000,R1,gas,1.15133333333,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,2.30266666667,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2020.00000000000,R1,gas,2.31444444444,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,8,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,9,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,10,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,13,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,24,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,25,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,26,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,29,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,40,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,41,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,42,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,45,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,56,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,57,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,58,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,61,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,72,2020.00000000000,R1,residential,3.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,73,2025.00000000000,R1,residential,0.68333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,74,2025.00000000000,R1,residential,1.15000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,77,2025.00000000000,R1,residential,44.21850000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,89,2025.00000000000,R1,residential,0.45555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,90,2025.00000000000,R1,residential,0.76666666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,93,2025.00000000000,R1,residential,29.47900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.23951240017,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2025.00000000000,R1,power,0.33604315539,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,12,2020.00000000000,R1,power,0.35926860025,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,13,2025.00000000000,R1,power,0.50406473308,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,0.23951240017,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2025.00000000000,R1,power,0.33604315539,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,36,2020.00000000000,R1,power,0.35926860025,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,37,2025.00000000000,R1,power,0.50406473308,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.71853720050,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2025.00000000000,R1,power,1.00812946616,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,0.47902480034,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,61,2025.00000000000,R1,power,0.67208631077,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.26422222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,0.39633333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,0.26422222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2020.00000000000,R1,gas,0.39633333333,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,8,2020.00000000000,R1,gas,0.79266666667,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2020.00000000000,R1,gas,0.52844444444,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,10,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,11,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,12,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,15,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,30,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,31,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,32,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,35,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,50,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,51,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,52,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,55,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,70,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,71,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,72,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,75,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,90,2025.00000000000,R1,residential,0.68333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,91,2025.00000000000,R1,residential,1.15000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,92,2030.00000000000,R1,residential,4.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,95,2025.00000000000,R1,residential,44.21850000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,110,2025.00000000000,R1,residential,0.45555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,111,2025.00000000000,R1,residential,0.76666666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,112,2030.00000000000,R1,residential,2.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,115,2025.00000000000,R1,residential,29.47900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.18011035545,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2025.00000000000,R1,power,0.25270028658,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2030.00000000000,R1,power,0.27607824686,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,16,2020.00000000000,R1,power,0.27016553317,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,17,2025.00000000000,R1,power,0.37905042987,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,18,2030.00000000000,R1,power,0.41411737029,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,32,2020.00000000000,R1,power,0.18011035545,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,33,2025.00000000000,R1,power,0.25270028658,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,34,2030.00000000000,R1,power,0.27607824686,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.27016553317,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2025.00000000000,R1,power,0.37905042987,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,50,2030.00000000000,R1,power,0.41411737029,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,64,2020.00000000000,R1,power,0.54033106634,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,65,2025.00000000000,R1,power,0.75810085975,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,66,2030.00000000000,R1,power,0.82823474058,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,80,2020.00000000000,R1,power,0.36022071089,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,81,2025.00000000000,R1,power,0.50540057316,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,82,2030.00000000000,R1,power,0.55215649372,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.02148148148,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2030.00000000000,R1,gas,0.24274074074,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,0.03222222222,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2030.00000000000,R1,gas,0.36411111111,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,0.02148148148,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2030.00000000000,R1,gas,0.24274074074,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2020.00000000000,R1,gas,0.03222222222,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,7,2030.00000000000,R1,gas,0.36411111111,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,8,2020.00000000000,R1,gas,0.06444444444,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,9,2030.00000000000,R1,gas,0.72822222222,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2020.00000000000,R1,gas,0.04296296296,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,11,2030.00000000000,R1,gas,0.48548148148,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,8,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,9,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,10,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,13,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,24,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,25,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,26,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,29,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,40,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,41,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,42,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,45,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,56,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,57,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,58,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,61,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,72,2030.00000000000,R1,residential,4.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,73,2035.00000000000,R1,residential,0.15166666667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,74,2035.00000000000,R1,residential,2.68166666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,77,2035.00000000000,R1,residential,9.81435000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2030.00000000000,R1,residential,2.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,89,2035.00000000000,R1,residential,0.10111111111,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,90,2035.00000000000,R1,residential,1.78777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,93,2035.00000000000,R1,residential,6.54290000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.15824641356,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2025.00000000000,R1,power,0.22202451357,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2030.00000000000,R1,power,0.24256457836,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2035.00000000000,R1,power,0.29027560563,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,20,2020.00000000000,R1,power,0.23736962033,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,21,2025.00000000000,R1,power,0.33303677035,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,22,2030.00000000000,R1,power,0.36384686753,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,23,2035.00000000000,R1,power,0.43541340845,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,40,2020.00000000000,R1,power,0.15824641356,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,41,2025.00000000000,R1,power,0.22202451357,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,42,2030.00000000000,R1,power,0.24256457836,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,43,2035.00000000000,R1,power,0.29027560563,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,0.23736962033,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,61,2025.00000000000,R1,power,0.33303677035,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,62,2030.00000000000,R1,power,0.36384686753,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,63,2035.00000000000,R1,power,0.43541340845,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,80,2020.00000000000,R1,power,0.47473924067,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,81,2025.00000000000,R1,power,0.66607354070,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,82,2030.00000000000,R1,power,0.72769373507,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,83,2035.00000000000,R1,power,0.87082681690,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,100,2020.00000000000,R1,power,0.31649282711,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,101,2025.00000000000,R1,power,0.44404902713,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,102,2030.00000000000,R1,power,0.48512915671,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,103,2035.00000000000,R1,power,0.58055121127,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.00476784101,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2030.00000000000,R1,gas,0.05387660343,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,0.00715176152,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2030.00000000000,R1,gas,0.08081490515,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,0.00476784101,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2030.00000000000,R1,gas,0.05387660343,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2020.00000000000,R1,gas,0.00715176152,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,7,2030.00000000000,R1,gas,0.08081490515,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,8,2020.00000000000,R1,gas,0.01430352304,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,9,2030.00000000000,R1,gas,0.16162981030,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2020.00000000000,R1,gas,0.00953568202,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,11,2030.00000000000,R1,gas,0.10775320687,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,8,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,9,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,10,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,12,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,24,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,25,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,26,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,28,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,40,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,41,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,42,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,44,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,56,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,57,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,58,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,60,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,72,2035.00000000000,R1,residential,0.15166666667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,73,2035.00000000000,R1,residential,2.68166666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,74,2040.00000000000,R1,residential,5.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,76,2035.00000000000,R1,residential,9.81435000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2035.00000000000,R1,residential,0.10111111111,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,89,2035.00000000000,R1,residential,1.78777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,90,2040.00000000000,R1,residential,3.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,92,2035.00000000000,R1,residential,6.54290000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.13656827502,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2025.00000000000,R1,power,0.19160942829,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2030.00000000000,R1,power,0.20933571449,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2035.00000000000,R1,power,0.25051081949,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,4,2040.00000000000,R1,power,0.25842020716,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,0.20485241253,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2025.00000000000,R1,power,0.28741414243,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,26,2030.00000000000,R1,power,0.31400357173,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,27,2035.00000000000,R1,power,0.37576622924,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,28,2040.00000000000,R1,power,0.38763031074,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.13656827502,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2025.00000000000,R1,power,0.19160942829,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,50,2030.00000000000,R1,power,0.20933571449,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,51,2035.00000000000,R1,power,0.25051081949,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,52,2040.00000000000,R1,power,0.25842020716,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,72,2020.00000000000,R1,power,0.20485241253,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,73,2025.00000000000,R1,power,0.28741414243,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,74,2030.00000000000,R1,power,0.31400357173,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,75,2035.00000000000,R1,power,0.37576622924,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,76,2040.00000000000,R1,power,0.38763031074,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,96,2020.00000000000,R1,power,0.40970482506,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,97,2025.00000000000,R1,power,0.57482828486,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,98,2030.00000000000,R1,power,0.62800714346,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,99,2035.00000000000,R1,power,0.75153245848,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,100,2040.00000000000,R1,power,0.77526062148,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,120,2020.00000000000,R1,power,0.27313655004,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,121,2025.00000000000,R1,power,0.38321885657,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,122,2030.00000000000,R1,power,0.41867142897,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,123,2035.00000000000,R1,power,0.50102163899,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,124,2040.00000000000,R1,power,0.51684041432,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.00476784101,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2030.00000000000,R1,gas,0.05387660343,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,0.00715176152,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2030.00000000000,R1,gas,0.08081490515,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,0.00476784101,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2030.00000000000,R1,gas,0.05387660343,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2020.00000000000,R1,gas,0.00715176152,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,7,2030.00000000000,R1,gas,0.08081490515,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,8,2020.00000000000,R1,gas,0.01430352304,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,9,2030.00000000000,R1,gas,0.16162981030,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2020.00000000000,R1,gas,0.00953568202,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,11,2030.00000000000,R1,gas,0.10775320687,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,6,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,7,2045.00000000000,R1,residential,1.27777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,18,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,19,2045.00000000000,R1,residential,1.91666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,30,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,31,2045.00000000000,R1,residential,1.27777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,42,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,43,2045.00000000000,R1,residential,1.91666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,54,2040.00000000000,R1,residential,5.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,55,2045.00000000000,R1,residential,3.83333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,66,2040.00000000000,R1,residential,3.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,67,2045.00000000000,R1,residential,2.55555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2025.00000000000,R1,power,0.19078573323,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2030.00000000000,R1,power,0.20843581726,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2035.00000000000,R1,power,0.24943391777,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2040.00000000000,R1,power,0.25730930438,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,4,2045.00000000000,R1,power,0.29403522736,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2025.00000000000,R1,power,0.28617859985,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2030.00000000000,R1,power,0.31265372589,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,26,2035.00000000000,R1,power,0.37415087666,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,27,2040.00000000000,R1,power,0.38596395657,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,28,2045.00000000000,R1,power,0.44105284104,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2025.00000000000,R1,power,0.19078573323,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2030.00000000000,R1,power,0.20843581726,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,50,2035.00000000000,R1,power,0.24943391777,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,51,2040.00000000000,R1,power,0.25730930438,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,52,2045.00000000000,R1,power,0.29403522736,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,72,2025.00000000000,R1,power,0.28617859985,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,73,2030.00000000000,R1,power,0.31265372589,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,74,2035.00000000000,R1,power,0.37415087666,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,75,2040.00000000000,R1,power,0.38596395657,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,76,2045.00000000000,R1,power,0.44105284104,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,96,2025.00000000000,R1,power,0.57235719969,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,97,2030.00000000000,R1,power,0.62530745179,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,98,2035.00000000000,R1,power,0.74830175331,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,99,2040.00000000000,R1,power,0.77192791314,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,100,2045.00000000000,R1,power,0.88210568207,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,120,2025.00000000000,R1,power,0.38157146646,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,121,2030.00000000000,R1,power,0.41687163452,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,122,2035.00000000000,R1,power,0.49886783554,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,123,2040.00000000000,R1,power,0.51461860876,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,124,2045.00000000000,R1,power,0.58807045471,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2020.csv
index 0745318f6..69c4d3388 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2020.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2020.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gasCCGT,1.00000000000
-0,2025,R1,2020,gasCCGT,1.00000000000
-1,2025,R1,2020,windturbine,1.10000000000
-1,2030,R1,2020,windturbine,1.10000000000
-1,2035,R1,2020,windturbine,1.10000000000
-1,2040,R1,2020,windturbine,1.10000000000
-1,2045,R1,2020,windturbine,1.10000000000
-1,2049,R1,2020,windturbine,1.10000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2025,R1,windturbine,2020,1.10000000000
+1,2030,R1,windturbine,2020,1.10000000000
+1,2035,R1,windturbine,2020,1.10000000000
+1,2040,R1,windturbine,2020,1.10000000000
+1,2045,R1,windturbine,2020,1.10000000000
+1,2049,R1,windturbine,2020,1.10000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2050.csv
index e61276d32..26c197549 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Capacity/2050.csv
@@ -1,41 +1,41 @@
-asset,year,region,installed,technology,capacity
-1,2050,R1,2025,windturbine,1.54330000000
-1,2054,R1,2025,windturbine,1.54330000000
-2,2050,R1,2030,windturbine,1.68610000000
-2,2054,R1,2030,windturbine,1.68610000000
-2,2055,R1,2030,windturbine,1.68610000000
-2,2059,R1,2030,windturbine,1.68610000000
-3,2050,R1,2035,windturbine,2.01780000000
-3,2054,R1,2035,windturbine,2.01780000000
-3,2055,R1,2035,windturbine,2.01780000000
-3,2059,R1,2035,windturbine,2.01780000000
-3,2060,R1,2035,windturbine,2.01780000000
-3,2064,R1,2035,windturbine,2.01780000000
-4,2050,R1,2040,windturbine,2.08150000000
-4,2054,R1,2040,windturbine,2.08150000000
-4,2055,R1,2040,windturbine,2.08150000000
-4,2059,R1,2040,windturbine,2.08150000000
-4,2060,R1,2040,windturbine,2.08150000000
-4,2064,R1,2040,windturbine,2.08150000000
-4,2065,R1,2040,windturbine,2.08150000000
-4,2069,R1,2040,windturbine,2.08150000000
-5,2050,R1,2045,windturbine,2.37860000000
-5,2054,R1,2045,windturbine,2.37860000000
-5,2055,R1,2045,windturbine,2.37860000000
-5,2059,R1,2045,windturbine,2.37860000000
-5,2060,R1,2045,windturbine,2.37860000000
-5,2064,R1,2045,windturbine,2.37860000000
-5,2065,R1,2045,windturbine,2.37860000000
-5,2069,R1,2045,windturbine,2.37860000000
-5,2070,R1,2045,windturbine,2.37860000000
-5,2074,R1,2045,windturbine,2.37860000000
-6,2055,R1,2050,windturbine,2.23940000000
-6,2059,R1,2050,windturbine,2.23940000000
-6,2060,R1,2050,windturbine,2.23940000000
-6,2064,R1,2050,windturbine,2.23940000000
-6,2065,R1,2050,windturbine,2.23940000000
-6,2069,R1,2050,windturbine,2.23940000000
-6,2070,R1,2050,windturbine,2.23940000000
-6,2074,R1,2050,windturbine,2.23940000000
-6,2075,R1,2050,windturbine,2.23940000000
-6,2079,R1,2050,windturbine,2.23940000000
+asset,year,region,technology,installed,capacity
+1,2050,R1,windturbine,2025,1.54330000000
+1,2054,R1,windturbine,2025,1.54330000000
+2,2050,R1,windturbine,2030,1.68610000000
+2,2054,R1,windturbine,2030,1.68610000000
+2,2055,R1,windturbine,2030,1.68610000000
+2,2059,R1,windturbine,2030,1.68610000000
+3,2050,R1,windturbine,2035,2.01780000000
+3,2054,R1,windturbine,2035,2.01780000000
+3,2055,R1,windturbine,2035,2.01780000000
+3,2059,R1,windturbine,2035,2.01780000000
+3,2060,R1,windturbine,2035,2.01780000000
+3,2064,R1,windturbine,2035,2.01780000000
+4,2050,R1,windturbine,2040,2.08150000000
+4,2054,R1,windturbine,2040,2.08150000000
+4,2055,R1,windturbine,2040,2.08150000000
+4,2059,R1,windturbine,2040,2.08150000000
+4,2060,R1,windturbine,2040,2.08150000000
+4,2064,R1,windturbine,2040,2.08150000000
+4,2065,R1,windturbine,2040,2.08150000000
+4,2069,R1,windturbine,2040,2.08150000000
+5,2050,R1,windturbine,2045,2.37860000000
+5,2054,R1,windturbine,2045,2.37860000000
+5,2055,R1,windturbine,2045,2.37860000000
+5,2059,R1,windturbine,2045,2.37860000000
+5,2060,R1,windturbine,2045,2.37860000000
+5,2064,R1,windturbine,2045,2.37860000000
+5,2065,R1,windturbine,2045,2.37860000000
+5,2069,R1,windturbine,2045,2.37860000000
+5,2070,R1,windturbine,2045,2.37860000000
+5,2074,R1,windturbine,2045,2.37860000000
+6,2055,R1,windturbine,2050,2.23940000000
+6,2059,R1,windturbine,2050,2.23940000000
+6,2060,R1,windturbine,2050,2.23940000000
+6,2064,R1,windturbine,2050,2.23940000000
+6,2065,R1,windturbine,2050,2.23940000000
+6,2069,R1,windturbine,2050,2.23940000000
+6,2070,R1,windturbine,2050,2.23940000000
+6,2074,R1,windturbine,2050,2.23940000000
+6,2075,R1,windturbine,2050,2.23940000000
+6,2079,R1,windturbine,2050,2.23940000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2020.csv
index ce41a4a75..01ce902e1 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2020.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2020.csv
@@ -1,31 +1,31 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,supply
-0,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,night,0.20000000000
-0,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,night,18.33400000000
-0,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,night,0.20000000000
-0,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,night,18.33400000000
-0,1,2025,electricity,R1,2020,windturbine,all-year,all-week,night,1.10000000000
-1,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,morning,0.40000000000
-1,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,morning,36.66800000000
-1,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,morning,0.40000000000
-1,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,morning,36.66800000000
-1,1,2025,electricity,R1,2020,windturbine,all-year,all-week,morning,1.10000000000
-2,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,afternoon,0.60000000000
-2,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,afternoon,55.00200000000
-2,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,afternoon,0.60000000000
-2,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,afternoon,55.00200000000
-2,1,2025,electricity,R1,2020,windturbine,all-year,all-week,afternoon,1.10000000000
-3,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,early-peak,0.40000000000
-3,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,early-peak,36.66800000000
-3,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,early-peak,0.40000000000
-3,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,early-peak,36.66800000000
-3,1,2025,electricity,R1,2020,windturbine,all-year,all-week,early-peak,1.10000000000
-4,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,late-peak,0.80000000000
-4,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,late-peak,73.33600000000
-4,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,late-peak,0.80000000000
-4,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,late-peak,73.33600000000
-4,1,2025,electricity,R1,2020,windturbine,all-year,all-week,late-peak,1.10000000000
-5,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,evening,1.00000000000
-5,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,evening,91.67000000000
-5,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,evening,1.00000000000
-5,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,evening,91.67000000000
-5,1,2025,electricity,R1,2020,windturbine,all-year,all-week,evening,1.10000000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2020,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.20000000000
+0,0,2020,CO2f,all-year,all-week,night,R1,gasCCGT,2020,18.33400000000
+0,0,2025,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.20000000000
+0,0,2025,CO2f,all-year,all-week,night,R1,gasCCGT,2020,18.33400000000
+0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,1.10000000000
+1,0,2020,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.40000000000
+1,0,2020,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,36.66800000000
+1,0,2025,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.40000000000
+1,0,2025,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,36.66800000000
+1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,1.10000000000
+2,0,2020,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
+2,0,2020,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
+2,0,2025,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
+2,0,2025,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
+2,1,2025,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.10000000000
+3,0,2020,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.40000000000
+3,0,2020,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,36.66800000000
+3,0,2025,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.40000000000
+3,0,2025,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,36.66800000000
+3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.10000000000
+4,0,2020,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.80000000000
+4,0,2020,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,73.33600000000
+4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.80000000000
+4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,73.33600000000
+4,1,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.10000000000
+5,0,2020,electricity,all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
+5,0,2020,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
+5,0,2025,electricity,all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
+5,0,2025,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
+5,1,2025,electricity,all-year,all-week,evening,R1,windturbine,2020,1.10000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2025.csv
index 959636f20..7e48eea43 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2025.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2025.csv
@@ -1,31 +1,31 @@
-timeslice,asset,year,commodity,region,technology,installed,month,day,hour,supply
-0,0,2025,electricity,R1,gasCCGT,2020,all-year,all-week,night,0.20000000000
-0,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,night,18.33400000000
-0,1,2025,electricity,R1,windturbine,2020,all-year,all-week,night,1.10000000000
-0,1,2030,electricity,R1,windturbine,2020,all-year,all-week,night,1.10000000000
-0,2,2030,electricity,R1,windturbine,2025,all-year,all-week,night,1.54330000000
-1,0,2025,electricity,R1,gasCCGT,2020,all-year,all-week,morning,0.40000000000
-1,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,morning,36.66800000000
-1,1,2025,electricity,R1,windturbine,2020,all-year,all-week,morning,1.10000000000
-1,1,2030,electricity,R1,windturbine,2020,all-year,all-week,morning,1.10000000000
-1,2,2030,electricity,R1,windturbine,2025,all-year,all-week,morning,1.54330000000
-2,0,2025,electricity,R1,gasCCGT,2020,all-year,all-week,afternoon,0.60000000000
-2,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,afternoon,55.00200000000
-2,1,2025,electricity,R1,windturbine,2020,all-year,all-week,afternoon,1.10000000000
-2,1,2030,electricity,R1,windturbine,2020,all-year,all-week,afternoon,1.10000000000
-2,2,2030,electricity,R1,windturbine,2025,all-year,all-week,afternoon,1.54330000000
-3,0,2025,electricity,R1,gasCCGT,2020,all-year,all-week,early-peak,0.40000000000
-3,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,early-peak,36.66800000000
-3,1,2025,electricity,R1,windturbine,2020,all-year,all-week,early-peak,1.10000000000
-3,1,2030,electricity,R1,windturbine,2020,all-year,all-week,early-peak,1.10000000000
-3,2,2030,electricity,R1,windturbine,2025,all-year,all-week,early-peak,1.54330000000
-4,0,2025,electricity,R1,gasCCGT,2020,all-year,all-week,late-peak,0.80000000000
-4,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,late-peak,73.33600000000
-4,1,2025,electricity,R1,windturbine,2020,all-year,all-week,late-peak,1.10000000000
-4,1,2030,electricity,R1,windturbine,2020,all-year,all-week,late-peak,1.10000000000
-4,2,2030,electricity,R1,windturbine,2025,all-year,all-week,late-peak,1.54330000000
-5,0,2025,electricity,R1,gasCCGT,2020,all-year,all-week,evening,1.00000000000
-5,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,evening,91.67000000000
-5,1,2025,electricity,R1,windturbine,2020,all-year,all-week,evening,1.10000000000
-5,1,2030,electricity,R1,windturbine,2020,all-year,all-week,evening,1.10000000000
-5,2,2030,electricity,R1,windturbine,2025,all-year,all-week,evening,1.54330000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2025,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.20000000000
+0,0,2025,CO2f,all-year,all-week,night,R1,gasCCGT,2020,18.33400000000
+0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,1.10000000000
+0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,1.10000000000
+0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,1.54330000000
+1,0,2025,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.40000000000
+1,0,2025,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,36.66800000000
+1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,1.10000000000
+1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,1.10000000000
+1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,1.54330000000
+2,0,2025,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
+2,0,2025,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
+2,1,2025,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.10000000000
+2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.10000000000
+2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.54330000000
+3,0,2025,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.40000000000
+3,0,2025,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,36.66800000000
+3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.10000000000
+3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.10000000000
+3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.54330000000
+4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.80000000000
+4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,73.33600000000
+4,1,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.10000000000
+4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.10000000000
+4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.54330000000
+5,0,2025,electricity,all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
+5,0,2025,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
+5,1,2025,electricity,all-year,all-week,evening,R1,windturbine,2020,1.10000000000
+5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,1.10000000000
+5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,1.54330000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2030.csv
index d39ab64c8..04fdc53e7 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2030.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2030.csv
@@ -1,31 +1,31 @@
-timeslice,asset,year,commodity,region,technology,installed,month,day,hour,supply
-0,0,2030,electricity,R1,windturbine,2020,all-year,all-week,night,1.10000000000
-0,0,2035,electricity,R1,windturbine,2020,all-year,all-week,night,1.10000000000
-0,1,2030,electricity,R1,windturbine,2025,all-year,all-week,night,1.54330000000
-0,1,2035,electricity,R1,windturbine,2025,all-year,all-week,night,1.54330000000
-0,2,2035,electricity,R1,windturbine,2030,all-year,all-week,night,1.68610000000
-1,0,2030,electricity,R1,windturbine,2020,all-year,all-week,morning,1.10000000000
-1,0,2035,electricity,R1,windturbine,2020,all-year,all-week,morning,1.10000000000
-1,1,2030,electricity,R1,windturbine,2025,all-year,all-week,morning,1.54330000000
-1,1,2035,electricity,R1,windturbine,2025,all-year,all-week,morning,1.54330000000
-1,2,2035,electricity,R1,windturbine,2030,all-year,all-week,morning,1.68610000000
-2,0,2030,electricity,R1,windturbine,2020,all-year,all-week,afternoon,1.10000000000
-2,0,2035,electricity,R1,windturbine,2020,all-year,all-week,afternoon,1.10000000000
-2,1,2030,electricity,R1,windturbine,2025,all-year,all-week,afternoon,1.54330000000
-2,1,2035,electricity,R1,windturbine,2025,all-year,all-week,afternoon,1.54330000000
-2,2,2035,electricity,R1,windturbine,2030,all-year,all-week,afternoon,1.68610000000
-3,0,2030,electricity,R1,windturbine,2020,all-year,all-week,early-peak,1.10000000000
-3,0,2035,electricity,R1,windturbine,2020,all-year,all-week,early-peak,1.10000000000
-3,1,2030,electricity,R1,windturbine,2025,all-year,all-week,early-peak,1.54330000000
-3,1,2035,electricity,R1,windturbine,2025,all-year,all-week,early-peak,1.54330000000
-3,2,2035,electricity,R1,windturbine,2030,all-year,all-week,early-peak,1.68610000000
-4,0,2030,electricity,R1,windturbine,2020,all-year,all-week,late-peak,1.10000000000
-4,0,2035,electricity,R1,windturbine,2020,all-year,all-week,late-peak,1.10000000000
-4,1,2030,electricity,R1,windturbine,2025,all-year,all-week,late-peak,1.54330000000
-4,1,2035,electricity,R1,windturbine,2025,all-year,all-week,late-peak,1.54330000000
-4,2,2035,electricity,R1,windturbine,2030,all-year,all-week,late-peak,1.68610000000
-5,0,2030,electricity,R1,windturbine,2020,all-year,all-week,evening,1.10000000000
-5,0,2035,electricity,R1,windturbine,2020,all-year,all-week,evening,1.10000000000
-5,1,2030,electricity,R1,windturbine,2025,all-year,all-week,evening,1.54330000000
-5,1,2035,electricity,R1,windturbine,2025,all-year,all-week,evening,1.54330000000
-5,2,2035,electricity,R1,windturbine,2030,all-year,all-week,evening,1.68610000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2030,electricity,all-year,all-week,night,R1,windturbine,2020,1.10000000000
+0,0,2035,electricity,all-year,all-week,night,R1,windturbine,2020,1.10000000000
+0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2025,1.54330000000
+0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2025,1.54330000000
+0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2030,1.68610000000
+1,0,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,1.10000000000
+1,0,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,1.10000000000
+1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,1.54330000000
+1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,1.54330000000
+1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,1.68610000000
+2,0,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.10000000000
+2,0,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.10000000000
+2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.54330000000
+2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.54330000000
+2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,1.68610000000
+3,0,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.10000000000
+3,0,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.10000000000
+3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.54330000000
+3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.54330000000
+3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,1.68610000000
+4,0,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.10000000000
+4,0,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.10000000000
+4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.54330000000
+4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.54330000000
+4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.68610000000
+5,0,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,1.10000000000
+5,0,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,1.10000000000
+5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,1.54330000000
+5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,1.54330000000
+5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,1.68610000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2035.csv
index 70cf1860a..6199673da 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2035.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2035.csv
@@ -1,43 +1,43 @@
-timeslice,asset,year,commodity,region,technology,installed,month,day,hour,supply
-0,0,2035,electricity,R1,windturbine,2020,all-year,all-week,night,1.10000000000
-0,0,2040,electricity,R1,windturbine,2020,all-year,all-week,night,1.10000000000
-0,1,2035,electricity,R1,windturbine,2025,all-year,all-week,night,1.54330000000
-0,1,2040,electricity,R1,windturbine,2025,all-year,all-week,night,1.54330000000
-0,2,2035,electricity,R1,windturbine,2030,all-year,all-week,night,1.68610000000
-0,2,2040,electricity,R1,windturbine,2030,all-year,all-week,night,1.68610000000
-0,3,2040,electricity,R1,windturbine,2035,all-year,all-week,night,2.01780000000
-1,0,2035,electricity,R1,windturbine,2020,all-year,all-week,morning,1.10000000000
-1,0,2040,electricity,R1,windturbine,2020,all-year,all-week,morning,1.10000000000
-1,1,2035,electricity,R1,windturbine,2025,all-year,all-week,morning,1.54330000000
-1,1,2040,electricity,R1,windturbine,2025,all-year,all-week,morning,1.54330000000
-1,2,2035,electricity,R1,windturbine,2030,all-year,all-week,morning,1.68610000000
-1,2,2040,electricity,R1,windturbine,2030,all-year,all-week,morning,1.68610000000
-1,3,2040,electricity,R1,windturbine,2035,all-year,all-week,morning,2.01780000000
-2,0,2035,electricity,R1,windturbine,2020,all-year,all-week,afternoon,1.10000000000
-2,0,2040,electricity,R1,windturbine,2020,all-year,all-week,afternoon,1.10000000000
-2,1,2035,electricity,R1,windturbine,2025,all-year,all-week,afternoon,1.54330000000
-2,1,2040,electricity,R1,windturbine,2025,all-year,all-week,afternoon,1.54330000000
-2,2,2035,electricity,R1,windturbine,2030,all-year,all-week,afternoon,1.68610000000
-2,2,2040,electricity,R1,windturbine,2030,all-year,all-week,afternoon,1.68610000000
-2,3,2040,electricity,R1,windturbine,2035,all-year,all-week,afternoon,2.01780000000
-3,0,2035,electricity,R1,windturbine,2020,all-year,all-week,early-peak,1.10000000000
-3,0,2040,electricity,R1,windturbine,2020,all-year,all-week,early-peak,1.10000000000
-3,1,2035,electricity,R1,windturbine,2025,all-year,all-week,early-peak,1.54330000000
-3,1,2040,electricity,R1,windturbine,2025,all-year,all-week,early-peak,1.54330000000
-3,2,2035,electricity,R1,windturbine,2030,all-year,all-week,early-peak,1.68610000000
-3,2,2040,electricity,R1,windturbine,2030,all-year,all-week,early-peak,1.68610000000
-3,3,2040,electricity,R1,windturbine,2035,all-year,all-week,early-peak,2.01780000000
-4,0,2035,electricity,R1,windturbine,2020,all-year,all-week,late-peak,1.10000000000
-4,0,2040,electricity,R1,windturbine,2020,all-year,all-week,late-peak,1.10000000000
-4,1,2035,electricity,R1,windturbine,2025,all-year,all-week,late-peak,1.54330000000
-4,1,2040,electricity,R1,windturbine,2025,all-year,all-week,late-peak,1.54330000000
-4,2,2035,electricity,R1,windturbine,2030,all-year,all-week,late-peak,1.68610000000
-4,2,2040,electricity,R1,windturbine,2030,all-year,all-week,late-peak,1.68610000000
-4,3,2040,electricity,R1,windturbine,2035,all-year,all-week,late-peak,2.01780000000
-5,0,2035,electricity,R1,windturbine,2020,all-year,all-week,evening,1.10000000000
-5,0,2040,electricity,R1,windturbine,2020,all-year,all-week,evening,1.10000000000
-5,1,2035,electricity,R1,windturbine,2025,all-year,all-week,evening,1.54330000000
-5,1,2040,electricity,R1,windturbine,2025,all-year,all-week,evening,1.54330000000
-5,2,2035,electricity,R1,windturbine,2030,all-year,all-week,evening,1.68610000000
-5,2,2040,electricity,R1,windturbine,2030,all-year,all-week,evening,1.68610000000
-5,3,2040,electricity,R1,windturbine,2035,all-year,all-week,evening,2.01780000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2035,electricity,all-year,all-week,night,R1,windturbine,2020,1.10000000000
+0,0,2040,electricity,all-year,all-week,night,R1,windturbine,2020,1.10000000000
+0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2025,1.54330000000
+0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2025,1.54330000000
+0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2030,1.68610000000
+0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2030,1.68610000000
+0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2035,2.01780000000
+1,0,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,1.10000000000
+1,0,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,1.10000000000
+1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,1.54330000000
+1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,1.54330000000
+1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,1.68610000000
+1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,1.68610000000
+1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,2.01780000000
+2,0,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.10000000000
+2,0,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.10000000000
+2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.54330000000
+2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.54330000000
+2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,1.68610000000
+2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,1.68610000000
+2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.01780000000
+3,0,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.10000000000
+3,0,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.10000000000
+3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.54330000000
+3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.54330000000
+3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,1.68610000000
+3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,1.68610000000
+3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.01780000000
+4,0,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.10000000000
+4,0,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.10000000000
+4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.54330000000
+4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.54330000000
+4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.68610000000
+4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.68610000000
+4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.01780000000
+5,0,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,1.10000000000
+5,0,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,1.10000000000
+5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,1.54330000000
+5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,1.54330000000
+5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,1.68610000000
+5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,1.68610000000
+5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,2.01780000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2040.csv
index 469339f6a..a51edca37 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2040.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2040.csv
@@ -1,55 +1,55 @@
-timeslice,asset,year,commodity,region,technology,installed,month,day,hour,supply
-0,0,2040,electricity,R1,windturbine,2020,all-year,all-week,night,1.10000000000
-0,0,2045,electricity,R1,windturbine,2020,all-year,all-week,night,1.10000000000
-0,1,2040,electricity,R1,windturbine,2025,all-year,all-week,night,1.54330000000
-0,1,2045,electricity,R1,windturbine,2025,all-year,all-week,night,1.54330000000
-0,2,2040,electricity,R1,windturbine,2030,all-year,all-week,night,1.68610000000
-0,2,2045,electricity,R1,windturbine,2030,all-year,all-week,night,1.68610000000
-0,3,2040,electricity,R1,windturbine,2035,all-year,all-week,night,2.01780000000
-0,3,2045,electricity,R1,windturbine,2035,all-year,all-week,night,2.01780000000
-0,4,2045,electricity,R1,windturbine,2040,all-year,all-week,night,2.08150000000
-1,0,2040,electricity,R1,windturbine,2020,all-year,all-week,morning,1.10000000000
-1,0,2045,electricity,R1,windturbine,2020,all-year,all-week,morning,1.10000000000
-1,1,2040,electricity,R1,windturbine,2025,all-year,all-week,morning,1.54330000000
-1,1,2045,electricity,R1,windturbine,2025,all-year,all-week,morning,1.54330000000
-1,2,2040,electricity,R1,windturbine,2030,all-year,all-week,morning,1.68610000000
-1,2,2045,electricity,R1,windturbine,2030,all-year,all-week,morning,1.68610000000
-1,3,2040,electricity,R1,windturbine,2035,all-year,all-week,morning,2.01780000000
-1,3,2045,electricity,R1,windturbine,2035,all-year,all-week,morning,2.01780000000
-1,4,2045,electricity,R1,windturbine,2040,all-year,all-week,morning,2.08150000000
-2,0,2040,electricity,R1,windturbine,2020,all-year,all-week,afternoon,1.10000000000
-2,0,2045,electricity,R1,windturbine,2020,all-year,all-week,afternoon,1.10000000000
-2,1,2040,electricity,R1,windturbine,2025,all-year,all-week,afternoon,1.54330000000
-2,1,2045,electricity,R1,windturbine,2025,all-year,all-week,afternoon,1.54330000000
-2,2,2040,electricity,R1,windturbine,2030,all-year,all-week,afternoon,1.68610000000
-2,2,2045,electricity,R1,windturbine,2030,all-year,all-week,afternoon,1.68610000000
-2,3,2040,electricity,R1,windturbine,2035,all-year,all-week,afternoon,2.01780000000
-2,3,2045,electricity,R1,windturbine,2035,all-year,all-week,afternoon,2.01780000000
-2,4,2045,electricity,R1,windturbine,2040,all-year,all-week,afternoon,2.08150000000
-3,0,2040,electricity,R1,windturbine,2020,all-year,all-week,early-peak,1.10000000000
-3,0,2045,electricity,R1,windturbine,2020,all-year,all-week,early-peak,1.10000000000
-3,1,2040,electricity,R1,windturbine,2025,all-year,all-week,early-peak,1.54330000000
-3,1,2045,electricity,R1,windturbine,2025,all-year,all-week,early-peak,1.54330000000
-3,2,2040,electricity,R1,windturbine,2030,all-year,all-week,early-peak,1.68610000000
-3,2,2045,electricity,R1,windturbine,2030,all-year,all-week,early-peak,1.68610000000
-3,3,2040,electricity,R1,windturbine,2035,all-year,all-week,early-peak,2.01780000000
-3,3,2045,electricity,R1,windturbine,2035,all-year,all-week,early-peak,2.01780000000
-3,4,2045,electricity,R1,windturbine,2040,all-year,all-week,early-peak,2.08150000000
-4,0,2040,electricity,R1,windturbine,2020,all-year,all-week,late-peak,1.10000000000
-4,0,2045,electricity,R1,windturbine,2020,all-year,all-week,late-peak,1.10000000000
-4,1,2040,electricity,R1,windturbine,2025,all-year,all-week,late-peak,1.54330000000
-4,1,2045,electricity,R1,windturbine,2025,all-year,all-week,late-peak,1.54330000000
-4,2,2040,electricity,R1,windturbine,2030,all-year,all-week,late-peak,1.68610000000
-4,2,2045,electricity,R1,windturbine,2030,all-year,all-week,late-peak,1.68610000000
-4,3,2040,electricity,R1,windturbine,2035,all-year,all-week,late-peak,2.01780000000
-4,3,2045,electricity,R1,windturbine,2035,all-year,all-week,late-peak,2.01780000000
-4,4,2045,electricity,R1,windturbine,2040,all-year,all-week,late-peak,2.08150000000
-5,0,2040,electricity,R1,windturbine,2020,all-year,all-week,evening,1.10000000000
-5,0,2045,electricity,R1,windturbine,2020,all-year,all-week,evening,1.10000000000
-5,1,2040,electricity,R1,windturbine,2025,all-year,all-week,evening,1.54330000000
-5,1,2045,electricity,R1,windturbine,2025,all-year,all-week,evening,1.54330000000
-5,2,2040,electricity,R1,windturbine,2030,all-year,all-week,evening,1.68610000000
-5,2,2045,electricity,R1,windturbine,2030,all-year,all-week,evening,1.68610000000
-5,3,2040,electricity,R1,windturbine,2035,all-year,all-week,evening,2.01780000000
-5,3,2045,electricity,R1,windturbine,2035,all-year,all-week,evening,2.01780000000
-5,4,2045,electricity,R1,windturbine,2040,all-year,all-week,evening,2.08150000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2040,electricity,all-year,all-week,night,R1,windturbine,2020,1.10000000000
+0,0,2045,electricity,all-year,all-week,night,R1,windturbine,2020,1.10000000000
+0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2025,1.54330000000
+0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2025,1.54330000000
+0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2030,1.68610000000
+0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2030,1.68610000000
+0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2035,2.01780000000
+0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2035,2.01780000000
+0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2040,2.08150000000
+1,0,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,1.10000000000
+1,0,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,1.10000000000
+1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,1.54330000000
+1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,1.54330000000
+1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,1.68610000000
+1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,1.68610000000
+1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,2.01780000000
+1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,2.01780000000
+1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,2.08150000000
+2,0,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.10000000000
+2,0,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.10000000000
+2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.54330000000
+2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.54330000000
+2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,1.68610000000
+2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,1.68610000000
+2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.01780000000
+2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.01780000000
+2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.08150000000
+3,0,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.10000000000
+3,0,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.10000000000
+3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.54330000000
+3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.54330000000
+3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,1.68610000000
+3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,1.68610000000
+3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.01780000000
+3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.01780000000
+3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.08150000000
+4,0,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.10000000000
+4,0,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.10000000000
+4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.54330000000
+4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.54330000000
+4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.68610000000
+4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.68610000000
+4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.01780000000
+4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.01780000000
+4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.08150000000
+5,0,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,1.10000000000
+5,0,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,1.10000000000
+5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,1.54330000000
+5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,1.54330000000
+5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,1.68610000000
+5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,1.68610000000
+5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,2.01780000000
+5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,2.01780000000
+5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,2.08150000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2045.csv
index b4e174f36..d8adfe54b 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2045.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2045.csv
@@ -1,61 +1,61 @@
-timeslice,asset,year,commodity,region,technology,installed,month,day,hour,supply
-0,0,2045,electricity,R1,windturbine,2020,all-year,all-week,night,1.10000000000
-0,1,2045,electricity,R1,windturbine,2025,all-year,all-week,night,1.54330000000
-0,1,2050,electricity,R1,windturbine,2025,all-year,all-week,night,1.54330000000
-0,2,2045,electricity,R1,windturbine,2030,all-year,all-week,night,1.68610000000
-0,2,2050,electricity,R1,windturbine,2030,all-year,all-week,night,1.68610000000
-0,3,2045,electricity,R1,windturbine,2035,all-year,all-week,night,2.01780000000
-0,3,2050,electricity,R1,windturbine,2035,all-year,all-week,night,2.01780000000
-0,4,2045,electricity,R1,windturbine,2040,all-year,all-week,night,2.08150000000
-0,4,2050,electricity,R1,windturbine,2040,all-year,all-week,night,2.08150000000
-0,5,2050,electricity,R1,windturbine,2045,all-year,all-week,night,2.37860000000
-1,0,2045,electricity,R1,windturbine,2020,all-year,all-week,morning,1.10000000000
-1,1,2045,electricity,R1,windturbine,2025,all-year,all-week,morning,1.54330000000
-1,1,2050,electricity,R1,windturbine,2025,all-year,all-week,morning,1.54330000000
-1,2,2045,electricity,R1,windturbine,2030,all-year,all-week,morning,1.68610000000
-1,2,2050,electricity,R1,windturbine,2030,all-year,all-week,morning,1.68610000000
-1,3,2045,electricity,R1,windturbine,2035,all-year,all-week,morning,2.01780000000
-1,3,2050,electricity,R1,windturbine,2035,all-year,all-week,morning,2.01780000000
-1,4,2045,electricity,R1,windturbine,2040,all-year,all-week,morning,2.08150000000
-1,4,2050,electricity,R1,windturbine,2040,all-year,all-week,morning,2.08150000000
-1,5,2050,electricity,R1,windturbine,2045,all-year,all-week,morning,2.37860000000
-2,0,2045,electricity,R1,windturbine,2020,all-year,all-week,afternoon,1.10000000000
-2,1,2045,electricity,R1,windturbine,2025,all-year,all-week,afternoon,1.54330000000
-2,1,2050,electricity,R1,windturbine,2025,all-year,all-week,afternoon,1.54330000000
-2,2,2045,electricity,R1,windturbine,2030,all-year,all-week,afternoon,1.68610000000
-2,2,2050,electricity,R1,windturbine,2030,all-year,all-week,afternoon,1.68610000000
-2,3,2045,electricity,R1,windturbine,2035,all-year,all-week,afternoon,2.01780000000
-2,3,2050,electricity,R1,windturbine,2035,all-year,all-week,afternoon,2.01780000000
-2,4,2045,electricity,R1,windturbine,2040,all-year,all-week,afternoon,2.08150000000
-2,4,2050,electricity,R1,windturbine,2040,all-year,all-week,afternoon,2.08150000000
-2,5,2050,electricity,R1,windturbine,2045,all-year,all-week,afternoon,2.37860000000
-3,0,2045,electricity,R1,windturbine,2020,all-year,all-week,early-peak,1.10000000000
-3,1,2045,electricity,R1,windturbine,2025,all-year,all-week,early-peak,1.54330000000
-3,1,2050,electricity,R1,windturbine,2025,all-year,all-week,early-peak,1.54330000000
-3,2,2045,electricity,R1,windturbine,2030,all-year,all-week,early-peak,1.68610000000
-3,2,2050,electricity,R1,windturbine,2030,all-year,all-week,early-peak,1.68610000000
-3,3,2045,electricity,R1,windturbine,2035,all-year,all-week,early-peak,2.01780000000
-3,3,2050,electricity,R1,windturbine,2035,all-year,all-week,early-peak,2.01780000000
-3,4,2045,electricity,R1,windturbine,2040,all-year,all-week,early-peak,2.08150000000
-3,4,2050,electricity,R1,windturbine,2040,all-year,all-week,early-peak,2.08150000000
-3,5,2050,electricity,R1,windturbine,2045,all-year,all-week,early-peak,2.37860000000
-4,0,2045,electricity,R1,windturbine,2020,all-year,all-week,late-peak,1.10000000000
-4,1,2045,electricity,R1,windturbine,2025,all-year,all-week,late-peak,1.54330000000
-4,1,2050,electricity,R1,windturbine,2025,all-year,all-week,late-peak,1.54330000000
-4,2,2045,electricity,R1,windturbine,2030,all-year,all-week,late-peak,1.68610000000
-4,2,2050,electricity,R1,windturbine,2030,all-year,all-week,late-peak,1.68610000000
-4,3,2045,electricity,R1,windturbine,2035,all-year,all-week,late-peak,2.01780000000
-4,3,2050,electricity,R1,windturbine,2035,all-year,all-week,late-peak,2.01780000000
-4,4,2045,electricity,R1,windturbine,2040,all-year,all-week,late-peak,2.08150000000
-4,4,2050,electricity,R1,windturbine,2040,all-year,all-week,late-peak,2.08150000000
-4,5,2050,electricity,R1,windturbine,2045,all-year,all-week,late-peak,2.37860000000
-5,0,2045,electricity,R1,windturbine,2020,all-year,all-week,evening,1.10000000000
-5,1,2045,electricity,R1,windturbine,2025,all-year,all-week,evening,1.54330000000
-5,1,2050,electricity,R1,windturbine,2025,all-year,all-week,evening,1.54330000000
-5,2,2045,electricity,R1,windturbine,2030,all-year,all-week,evening,1.68610000000
-5,2,2050,electricity,R1,windturbine,2030,all-year,all-week,evening,1.68610000000
-5,3,2045,electricity,R1,windturbine,2035,all-year,all-week,evening,2.01780000000
-5,3,2050,electricity,R1,windturbine,2035,all-year,all-week,evening,2.01780000000
-5,4,2045,electricity,R1,windturbine,2040,all-year,all-week,evening,2.08150000000
-5,4,2050,electricity,R1,windturbine,2040,all-year,all-week,evening,2.08150000000
-5,5,2050,electricity,R1,windturbine,2045,all-year,all-week,evening,2.37860000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2045,electricity,all-year,all-week,night,R1,windturbine,2020,1.10000000000
+0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2025,1.54330000000
+0,1,2050,electricity,all-year,all-week,night,R1,windturbine,2025,1.54330000000
+0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2030,1.68610000000
+0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2030,1.68610000000
+0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2035,2.01780000000
+0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2035,2.01780000000
+0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2040,2.08150000000
+0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2040,2.08150000000
+0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2045,2.37860000000
+1,0,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,1.10000000000
+1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,1.54330000000
+1,1,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,1.54330000000
+1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,1.68610000000
+1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,1.68610000000
+1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,2.01780000000
+1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,2.01780000000
+1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,2.08150000000
+1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,2.08150000000
+1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,2.37860000000
+2,0,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.10000000000
+2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.54330000000
+2,1,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.54330000000
+2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,1.68610000000
+2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,1.68610000000
+2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.01780000000
+2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.01780000000
+2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.08150000000
+2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.08150000000
+2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,2.37860000000
+3,0,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.10000000000
+3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.54330000000
+3,1,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.54330000000
+3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,1.68610000000
+3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,1.68610000000
+3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.01780000000
+3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.01780000000
+3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.08150000000
+3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.08150000000
+3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,2.37860000000
+4,0,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.10000000000
+4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.54330000000
+4,1,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.54330000000
+4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.68610000000
+4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.68610000000
+4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.01780000000
+4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.01780000000
+4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.08150000000
+4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.08150000000
+4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,2.37860000000
+5,0,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,1.10000000000
+5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,1.54330000000
+5,1,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,1.54330000000
+5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,1.68610000000
+5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,1.68610000000
+5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,2.01780000000
+5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,2.01780000000
+5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,2.08150000000
+5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,2.08150000000
+5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,2.37860000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2050.csv
index 06be5a1fa..0f54b4280 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2050.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Power/Supply/2050.csv
@@ -1,61 +1,61 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,supply
-0,1,2050,electricity,R1,2025,windturbine,all-year,all-week,night,1.54330000000
-0,2,2050,electricity,R1,2030,windturbine,all-year,all-week,night,1.68610000000
-0,2,2055,electricity,R1,2030,windturbine,all-year,all-week,night,1.68610000000
-0,3,2050,electricity,R1,2035,windturbine,all-year,all-week,night,2.01780000000
-0,3,2055,electricity,R1,2035,windturbine,all-year,all-week,night,2.01780000000
-0,4,2050,electricity,R1,2040,windturbine,all-year,all-week,night,2.08150000000
-0,4,2055,electricity,R1,2040,windturbine,all-year,all-week,night,2.08150000000
-0,5,2050,electricity,R1,2045,windturbine,all-year,all-week,night,2.37860000000
-0,5,2055,electricity,R1,2045,windturbine,all-year,all-week,night,2.37860000000
-0,6,2055,electricity,R1,2050,windturbine,all-year,all-week,night,2.23940000000
-1,1,2050,electricity,R1,2025,windturbine,all-year,all-week,morning,1.54330000000
-1,2,2050,electricity,R1,2030,windturbine,all-year,all-week,morning,1.68610000000
-1,2,2055,electricity,R1,2030,windturbine,all-year,all-week,morning,1.68610000000
-1,3,2050,electricity,R1,2035,windturbine,all-year,all-week,morning,2.01780000000
-1,3,2055,electricity,R1,2035,windturbine,all-year,all-week,morning,2.01780000000
-1,4,2050,electricity,R1,2040,windturbine,all-year,all-week,morning,2.08150000000
-1,4,2055,electricity,R1,2040,windturbine,all-year,all-week,morning,2.08150000000
-1,5,2050,electricity,R1,2045,windturbine,all-year,all-week,morning,2.37860000000
-1,5,2055,electricity,R1,2045,windturbine,all-year,all-week,morning,2.37860000000
-1,6,2055,electricity,R1,2050,windturbine,all-year,all-week,morning,2.23940000000
-2,1,2050,electricity,R1,2025,windturbine,all-year,all-week,afternoon,1.54330000000
-2,2,2050,electricity,R1,2030,windturbine,all-year,all-week,afternoon,1.68610000000
-2,2,2055,electricity,R1,2030,windturbine,all-year,all-week,afternoon,1.68610000000
-2,3,2050,electricity,R1,2035,windturbine,all-year,all-week,afternoon,2.01780000000
-2,3,2055,electricity,R1,2035,windturbine,all-year,all-week,afternoon,2.01780000000
-2,4,2050,electricity,R1,2040,windturbine,all-year,all-week,afternoon,2.08150000000
-2,4,2055,electricity,R1,2040,windturbine,all-year,all-week,afternoon,2.08150000000
-2,5,2050,electricity,R1,2045,windturbine,all-year,all-week,afternoon,2.37860000000
-2,5,2055,electricity,R1,2045,windturbine,all-year,all-week,afternoon,2.37860000000
-2,6,2055,electricity,R1,2050,windturbine,all-year,all-week,afternoon,2.23940000000
-3,1,2050,electricity,R1,2025,windturbine,all-year,all-week,early-peak,1.54330000000
-3,2,2050,electricity,R1,2030,windturbine,all-year,all-week,early-peak,1.68610000000
-3,2,2055,electricity,R1,2030,windturbine,all-year,all-week,early-peak,1.68610000000
-3,3,2050,electricity,R1,2035,windturbine,all-year,all-week,early-peak,2.01780000000
-3,3,2055,electricity,R1,2035,windturbine,all-year,all-week,early-peak,2.01780000000
-3,4,2050,electricity,R1,2040,windturbine,all-year,all-week,early-peak,2.08150000000
-3,4,2055,electricity,R1,2040,windturbine,all-year,all-week,early-peak,2.08150000000
-3,5,2050,electricity,R1,2045,windturbine,all-year,all-week,early-peak,2.37860000000
-3,5,2055,electricity,R1,2045,windturbine,all-year,all-week,early-peak,2.37860000000
-3,6,2055,electricity,R1,2050,windturbine,all-year,all-week,early-peak,2.23940000000
-4,1,2050,electricity,R1,2025,windturbine,all-year,all-week,late-peak,1.54330000000
-4,2,2050,electricity,R1,2030,windturbine,all-year,all-week,late-peak,1.68610000000
-4,2,2055,electricity,R1,2030,windturbine,all-year,all-week,late-peak,1.68610000000
-4,3,2050,electricity,R1,2035,windturbine,all-year,all-week,late-peak,2.01780000000
-4,3,2055,electricity,R1,2035,windturbine,all-year,all-week,late-peak,2.01780000000
-4,4,2050,electricity,R1,2040,windturbine,all-year,all-week,late-peak,2.08150000000
-4,4,2055,electricity,R1,2040,windturbine,all-year,all-week,late-peak,2.08150000000
-4,5,2050,electricity,R1,2045,windturbine,all-year,all-week,late-peak,2.37860000000
-4,5,2055,electricity,R1,2045,windturbine,all-year,all-week,late-peak,2.37860000000
-4,6,2055,electricity,R1,2050,windturbine,all-year,all-week,late-peak,2.23940000000
-5,1,2050,electricity,R1,2025,windturbine,all-year,all-week,evening,1.54330000000
-5,2,2050,electricity,R1,2030,windturbine,all-year,all-week,evening,1.68610000000
-5,2,2055,electricity,R1,2030,windturbine,all-year,all-week,evening,1.68610000000
-5,3,2050,electricity,R1,2035,windturbine,all-year,all-week,evening,2.01780000000
-5,3,2055,electricity,R1,2035,windturbine,all-year,all-week,evening,2.01780000000
-5,4,2050,electricity,R1,2040,windturbine,all-year,all-week,evening,2.08150000000
-5,4,2055,electricity,R1,2040,windturbine,all-year,all-week,evening,2.08150000000
-5,5,2050,electricity,R1,2045,windturbine,all-year,all-week,evening,2.37860000000
-5,5,2055,electricity,R1,2045,windturbine,all-year,all-week,evening,2.37860000000
-5,6,2055,electricity,R1,2050,windturbine,all-year,all-week,evening,2.23940000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,1,2050,electricity,all-year,all-week,night,R1,windturbine,2025,1.54330000000
+0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2030,1.68610000000
+0,2,2055,electricity,all-year,all-week,night,R1,windturbine,2030,1.68610000000
+0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2035,2.01780000000
+0,3,2055,electricity,all-year,all-week,night,R1,windturbine,2035,2.01780000000
+0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2040,2.08150000000
+0,4,2055,electricity,all-year,all-week,night,R1,windturbine,2040,2.08150000000
+0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2045,2.37860000000
+0,5,2055,electricity,all-year,all-week,night,R1,windturbine,2045,2.37860000000
+0,6,2055,electricity,all-year,all-week,night,R1,windturbine,2050,2.23940000000
+1,1,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,1.54330000000
+1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,1.68610000000
+1,2,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,1.68610000000
+1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,2.01780000000
+1,3,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,2.01780000000
+1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,2.08150000000
+1,4,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,2.08150000000
+1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,2.37860000000
+1,5,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,2.37860000000
+1,6,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,2.23940000000
+2,1,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.54330000000
+2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,1.68610000000
+2,2,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,1.68610000000
+2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.01780000000
+2,3,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.01780000000
+2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.08150000000
+2,4,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.08150000000
+2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,2.37860000000
+2,5,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,2.37860000000
+2,6,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,2.23940000000
+3,1,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.54330000000
+3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,1.68610000000
+3,2,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,1.68610000000
+3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.01780000000
+3,3,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.01780000000
+3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.08150000000
+3,4,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.08150000000
+3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,2.37860000000
+3,5,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,2.37860000000
+3,6,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,2.23940000000
+4,1,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.54330000000
+4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.68610000000
+4,2,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.68610000000
+4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.01780000000
+4,3,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.01780000000
+4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.08150000000
+4,4,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.08150000000
+4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,2.37860000000
+4,5,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,2.37860000000
+4,6,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,2.23940000000
+5,1,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,1.54330000000
+5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,1.68610000000
+5,2,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,1.68610000000
+5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,2.01780000000
+5,3,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,2.01780000000
+5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,2.08150000000
+5,4,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,2.08150000000
+5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,2.37860000000
+5,5,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,2.37860000000
+5,6,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,2.23940000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2050.csv
index 305b627b2..42f4be20c 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2050.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Capacity/2050.csv
@@ -1,11 +1,11 @@
-asset,year,region,installed,technology,capacity
-2,2050,R1,2040,heatpump,31.00000000000
-2,2054,R1,2040,heatpump,31.00000000000
-3,2050,R1,2045,heatpump,23.00000000000
-3,2054,R1,2045,heatpump,23.00000000000
-3,2055,R1,2045,heatpump,23.00000000000
-3,2059,R1,2045,heatpump,23.00000000000
-4,2055,R1,2050,heatpump,31.00000000000
-4,2059,R1,2050,heatpump,31.00000000000
-4,2060,R1,2050,heatpump,31.00000000000
-4,2064,R1,2050,heatpump,31.00000000000
+asset,year,region,technology,installed,capacity
+2,2050,R1,heatpump,2040,31.00000000000
+2,2054,R1,heatpump,2040,31.00000000000
+3,2050,R1,heatpump,2045,23.00000000000
+3,2054,R1,heatpump,2045,23.00000000000
+3,2055,R1,heatpump,2045,23.00000000000
+3,2059,R1,heatpump,2045,23.00000000000
+4,2055,R1,heatpump,2050,31.00000000000
+4,2059,R1,heatpump,2050,31.00000000000
+4,2060,R1,heatpump,2050,31.00000000000
+4,2064,R1,heatpump,2050,31.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2020.csv
index a44059a3e..7b8c4061d 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2020.csv
@@ -1,31 +1,31 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2020,0,R1,gasboiler,2020,all-year,all-week,night,1.00000000000
-0,heat,2025,0,R1,gasboiler,2020,all-year,all-week,night,0.27780000000
-0,heat,2025,1,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,night,64.71000000000
-0,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,night,17.97500000000
-1,heat,2020,0,R1,gasboiler,2020,all-year,all-week,morning,1.50000000000
-1,heat,2025,0,R1,gasboiler,2020,all-year,all-week,morning,0.41670000000
-1,heat,2025,1,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,morning,97.06500000000
-1,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,morning,26.96250000000
-2,heat,2020,0,R1,gasboiler,2020,all-year,all-week,afternoon,1.00000000000
-2,heat,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.27780000000
-2,heat,2025,1,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,afternoon,64.71000000000
-2,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,17.97500000000
-3,heat,2020,0,R1,gasboiler,2020,all-year,all-week,early-peak,1.50000000000
-3,heat,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.41670000000
-3,heat,2025,1,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,early-peak,97.06500000000
-3,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,26.96250000000
-4,heat,2020,0,R1,gasboiler,2020,all-year,all-week,late-peak,3.00000000000
-4,heat,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,0.83330000000
-4,heat,2025,1,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,late-peak,194.13000000000
-4,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,53.92500000000
-5,heat,2020,0,R1,gasboiler,2020,all-year,all-week,evening,2.00000000000
-5,heat,2025,0,R1,gasboiler,2020,all-year,all-week,evening,0.55560000000
-5,heat,2025,1,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,evening,129.42000000000
-5,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,evening,35.95000000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,1.00000000000
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,64.71000000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2025.csv
index c9ed8c00b..bfe116d0b 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2025.csv
@@ -1,43 +1,43 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2025,0,R1,gasboiler,2020,all-year,all-week,night,0.27780000000
-0,heat,2025,2,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,heat,2030,1,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2030,2,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,heat,2030,3,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,night,17.97500000000
-0,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-1,heat,2025,0,R1,gasboiler,2020,all-year,all-week,morning,0.41670000000
-1,heat,2025,2,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,heat,2030,1,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2030,2,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,heat,2030,3,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,morning,26.96250000000
-1,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-2,heat,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.27780000000
-2,heat,2025,2,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,heat,2030,1,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2030,2,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,heat,2030,3,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,17.97500000000
-2,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-3,heat,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.41670000000
-3,heat,2025,2,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,heat,2030,1,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2030,2,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,heat,2030,3,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,26.96250000000
-3,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-4,heat,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,0.83330000000
-4,heat,2025,2,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,heat,2030,1,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2030,2,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,heat,2030,3,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,53.92500000000
-4,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-5,heat,2025,0,R1,gasboiler,2020,all-year,all-week,evening,0.55560000000
-5,heat,2025,2,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,heat,2030,1,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2030,2,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,heat,2030,3,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,evening,35.95000000000
-5,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+0,heat,2025,2,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,3,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+1,heat,2025,2,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,3,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+2,heat,2025,2,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,3,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+3,heat,2025,2,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,3,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+4,heat,2025,2,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,3,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+5,heat,2025,2,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,3,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2030.csv
index 61ae11982..82873caab 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2030.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2030,0,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2030,1,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,heat,2030,2,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,heat,2035,0,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2035,2,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,heat,2035,3,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-0,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-1,heat,2030,0,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2030,1,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,heat,2030,2,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,heat,2035,0,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2035,2,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,heat,2035,3,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-1,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-2,heat,2030,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2030,1,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,heat,2030,2,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,heat,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2035,2,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,heat,2035,3,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-2,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-3,heat,2030,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2030,1,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,heat,2030,2,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,heat,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2035,2,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,heat,2035,3,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-3,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-4,heat,2030,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2030,1,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,heat,2030,2,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,heat,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2035,2,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,heat,2035,3,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-4,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-5,heat,2030,0,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2030,1,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,heat,2030,2,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,heat,2035,0,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2035,2,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,heat,2035,3,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
-5,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,CO2f,2030,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,CO2f,2030,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,CO2f,2030,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,CO2f,2030,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,CO2f,2030,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,CO2f,2030,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2035.csv
index 89e0bd4e1..741ea3c65 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2035.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2035,0,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2035,2,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,heat,2035,3,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,heat,2040,1,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2040,3,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,heat,2040,4,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-0,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-1,heat,2035,0,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2035,2,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,heat,2035,3,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,heat,2040,1,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2040,3,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,heat,2040,4,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-1,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-2,heat,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2035,2,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,heat,2035,3,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,heat,2040,1,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2040,3,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,heat,2040,4,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-2,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-3,heat,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2035,2,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,heat,2035,3,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,heat,2040,1,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2040,3,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,heat,2040,4,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-3,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-4,heat,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2035,2,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,heat,2035,3,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,heat,2040,1,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2040,3,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,heat,2040,4,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-4,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-5,heat,2035,0,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2035,2,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,heat,2035,3,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,heat,2040,1,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2040,3,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,heat,2040,4,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
-5,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,1,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+0,CO2f,2040,1,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,1,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+1,CO2f,2040,1,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,1,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+2,CO2f,2040,1,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,1,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+3,CO2f,2040,1,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,1,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+4,CO2f,2040,1,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,1,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
+5,CO2f,2040,1,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2040.csv
index 663e47a5a..c802f3409 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2040.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2040,0,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2040,1,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,heat,2040,2,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,heat,2045,0,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2045,2,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,heat,2045,3,R1,heatpump,2040,all-year,all-week,night,1.72220000000
-0,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-0,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-1,heat,2040,0,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2040,1,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,heat,2040,2,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,heat,2045,0,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2045,2,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,heat,2045,3,R1,heatpump,2040,all-year,all-week,morning,2.58330000000
-1,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-1,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-2,heat,2040,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2040,1,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,heat,2040,2,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,heat,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2045,2,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,heat,2045,3,R1,heatpump,2040,all-year,all-week,afternoon,1.72220000000
-2,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-2,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-3,heat,2040,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2040,1,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,heat,2040,2,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,heat,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2045,2,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,heat,2045,3,R1,heatpump,2040,all-year,all-week,early-peak,2.58330000000
-3,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-3,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-4,heat,2040,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2040,1,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,heat,2040,2,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,heat,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2045,2,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,heat,2045,3,R1,heatpump,2040,all-year,all-week,late-peak,5.16670000000
-4,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-4,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-5,heat,2040,0,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2040,1,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,heat,2040,2,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,heat,2045,0,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2045,2,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,heat,2045,3,R1,heatpump,2040,all-year,all-week,evening,3.44440000000
-5,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
-5,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2040,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2040,1,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,2,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,heat,2045,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2045,2,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,CO2f,2040,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+0,CO2f,2045,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+1,heat,2040,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2040,1,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,heat,2045,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2045,2,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,CO2f,2040,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+1,CO2f,2045,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+2,heat,2040,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2040,1,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,heat,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2045,2,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,CO2f,2040,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+2,CO2f,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+3,heat,2040,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2040,1,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,heat,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2045,2,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,CO2f,2040,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+3,CO2f,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+4,heat,2040,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2040,1,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,heat,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2045,2,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,CO2f,2040,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+4,CO2f,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+5,heat,2040,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2040,1,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,heat,2045,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2045,2,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,CO2f,2040,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
+5,CO2f,2045,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2045.csv
index 6e2884e67..c7be86b20 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2045.csv
@@ -1,37 +1,37 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2045,0,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2045,1,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,heat,2045,2,R1,heatpump,2040,all-year,all-week,night,1.72220000000
-0,heat,2050,2,R1,heatpump,2040,all-year,all-week,night,1.72220000000
-0,heat,2050,3,R1,heatpump,2045,all-year,all-week,night,1.27780000000
-0,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-1,heat,2045,0,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2045,1,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,heat,2045,2,R1,heatpump,2040,all-year,all-week,morning,2.58330000000
-1,heat,2050,2,R1,heatpump,2040,all-year,all-week,morning,2.58330000000
-1,heat,2050,3,R1,heatpump,2045,all-year,all-week,morning,1.91670000000
-1,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-2,heat,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2045,1,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,heat,2045,2,R1,heatpump,2040,all-year,all-week,afternoon,1.72220000000
-2,heat,2050,2,R1,heatpump,2040,all-year,all-week,afternoon,1.72220000000
-2,heat,2050,3,R1,heatpump,2045,all-year,all-week,afternoon,1.27780000000
-2,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-3,heat,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2045,1,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,heat,2045,2,R1,heatpump,2040,all-year,all-week,early-peak,2.58330000000
-3,heat,2050,2,R1,heatpump,2040,all-year,all-week,early-peak,2.58330000000
-3,heat,2050,3,R1,heatpump,2045,all-year,all-week,early-peak,1.91670000000
-3,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-4,heat,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2045,1,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,heat,2045,2,R1,heatpump,2040,all-year,all-week,late-peak,5.16670000000
-4,heat,2050,2,R1,heatpump,2040,all-year,all-week,late-peak,5.16670000000
-4,heat,2050,3,R1,heatpump,2045,all-year,all-week,late-peak,3.83330000000
-4,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-5,heat,2045,0,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2045,1,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,heat,2045,2,R1,heatpump,2040,all-year,all-week,evening,3.44440000000
-5,heat,2050,2,R1,heatpump,2040,all-year,all-week,evening,3.44440000000
-5,heat,2050,3,R1,heatpump,2045,all-year,all-week,evening,2.55560000000
-5,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2045,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2045,1,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,heat,2045,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,CO2f,2045,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+1,heat,2045,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2045,1,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,heat,2045,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,CO2f,2045,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+2,heat,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2045,1,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,heat,2045,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,CO2f,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+3,heat,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2045,1,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,heat,2045,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,CO2f,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+4,heat,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2045,1,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,heat,2045,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,CO2f,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+5,heat,2045,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2045,1,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,heat,2045,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,CO2f,2045,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2050.csv
index 61004cae8..8c1871538 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/1-min-constraint/Results/Residential/Supply/2050.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,heat,2050,2,R1,2040,heatpump,all-year,all-week,night,1.72220000000
-0,heat,2050,3,R1,2045,heatpump,all-year,all-week,night,1.27780000000
-0,heat,2055,3,R1,2045,heatpump,all-year,all-week,night,1.27780000000
-0,heat,2055,4,R1,2050,heatpump,all-year,all-week,night,1.72220000000
-1,heat,2050,2,R1,2040,heatpump,all-year,all-week,morning,2.58330000000
-1,heat,2050,3,R1,2045,heatpump,all-year,all-week,morning,1.91670000000
-1,heat,2055,3,R1,2045,heatpump,all-year,all-week,morning,1.91670000000
-1,heat,2055,4,R1,2050,heatpump,all-year,all-week,morning,2.58330000000
-2,heat,2050,2,R1,2040,heatpump,all-year,all-week,afternoon,1.72220000000
-2,heat,2050,3,R1,2045,heatpump,all-year,all-week,afternoon,1.27780000000
-2,heat,2055,3,R1,2045,heatpump,all-year,all-week,afternoon,1.27780000000
-2,heat,2055,4,R1,2050,heatpump,all-year,all-week,afternoon,1.72220000000
-3,heat,2050,2,R1,2040,heatpump,all-year,all-week,early-peak,2.58330000000
-3,heat,2050,3,R1,2045,heatpump,all-year,all-week,early-peak,1.91670000000
-3,heat,2055,3,R1,2045,heatpump,all-year,all-week,early-peak,1.91670000000
-3,heat,2055,4,R1,2050,heatpump,all-year,all-week,early-peak,2.58330000000
-4,heat,2050,2,R1,2040,heatpump,all-year,all-week,late-peak,5.16670000000
-4,heat,2050,3,R1,2045,heatpump,all-year,all-week,late-peak,3.83330000000
-4,heat,2055,3,R1,2045,heatpump,all-year,all-week,late-peak,3.83330000000
-4,heat,2055,4,R1,2050,heatpump,all-year,all-week,late-peak,5.16670000000
-5,heat,2050,2,R1,2040,heatpump,all-year,all-week,evening,3.44440000000
-5,heat,2050,3,R1,2045,heatpump,all-year,all-week,evening,2.55560000000
-5,heat,2055,3,R1,2045,heatpump,all-year,all-week,evening,2.55560000000
-5,heat,2055,4,R1,2050,heatpump,all-year,all-week,evening,3.44440000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2050,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,4,R1,all-year,all-week,night,heatpump,2050,1.72220000000
+1,heat,2050,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,4,R1,all-year,all-week,morning,heatpump,2050,2.58330000000
+2,heat,2050,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,4,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
+3,heat,2050,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,4,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
+4,heat,2050,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,4,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
+5,heat,2050,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,4,R1,all-year,all-week,evening,heatpump,2050,3.44440000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2020.csv
index 5c04a79fe..33bbbed35 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2020.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2020.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gassupply1,15.00000000000
-0,2025,R1,2020,gassupply1,15.42960000000
-0,2030,R1,2020,gassupply1,7.92960000000
-0,2035,R1,2020,gassupply1,0.42960000000
-0,2040,R1,2020,gassupply1,0.42960000000
-0,2045,R1,2020,gassupply1,0.42960000000
-0,2050,R1,2020,gassupply1,0.42960000000
-0,2059,R1,2020,gassupply1,0.42960000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.42960000000
+0,2030,R1,gassupply1,2020,7.92960000000
+0,2035,R1,gassupply1,2020,0.42960000000
+0,2040,R1,gassupply1,2020,0.42960000000
+0,2045,R1,gassupply1,2020,0.42960000000
+0,2050,R1,gassupply1,2020,0.42960000000
+0,2059,R1,gassupply1,2020,0.42960000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2025.csv
index 83f68b799..9d035dfd3 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2025.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2025.csv
@@ -1,8 +1,8 @@
-asset,year,region,installed,technology,capacity
-0,2025,R1,2020,gassupply1,15.42960000000
-0,2030,R1,2020,gassupply1,7.92960000000
-0,2035,R1,2020,gassupply1,0.42960000000
-0,2040,R1,2020,gassupply1,0.42960000000
-0,2045,R1,2020,gassupply1,0.42960000000
-0,2050,R1,2020,gassupply1,0.42960000000
-0,2059,R1,2020,gassupply1,0.42960000000
+asset,year,region,technology,installed,capacity
+0,2025,R1,gassupply1,2020,15.42960000000
+0,2030,R1,gassupply1,2020,7.92960000000
+0,2035,R1,gassupply1,2020,0.42960000000
+0,2040,R1,gassupply1,2020,0.42960000000
+0,2045,R1,gassupply1,2020,0.42960000000
+0,2050,R1,gassupply1,2020,0.42960000000
+0,2059,R1,gassupply1,2020,0.42960000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2030.csv
index ec7a9590e..4cae28844 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2030.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2030.csv
@@ -1,14 +1,14 @@
-asset,year,region,installed,technology,capacity
-0,2030,R1,2020,gassupply1,7.92960000000
-0,2035,R1,2020,gassupply1,0.42960000000
-0,2040,R1,2020,gassupply1,0.42960000000
-0,2045,R1,2020,gassupply1,0.42960000000
-0,2050,R1,2020,gassupply1,0.42960000000
-0,2059,R1,2020,gassupply1,0.42960000000
-1,2035,R1,2030,gassupply1,4.85480000000
-1,2040,R1,2030,gassupply1,4.85480000000
-1,2045,R1,2030,gassupply1,4.85480000000
-1,2050,R1,2030,gassupply1,4.85480000000
-1,2059,R1,2030,gassupply1,4.85480000000
-1,2060,R1,2030,gassupply1,4.85480000000
-1,2069,R1,2030,gassupply1,4.85480000000
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,7.92960000000
+0,2035,R1,gassupply1,2020,0.42960000000
+0,2040,R1,gassupply1,2020,0.42960000000
+0,2045,R1,gassupply1,2020,0.42960000000
+0,2050,R1,gassupply1,2020,0.42960000000
+0,2059,R1,gassupply1,2020,0.42960000000
+1,2035,R1,gassupply1,2030,4.85480000000
+1,2040,R1,gassupply1,2030,4.85480000000
+1,2045,R1,gassupply1,2030,4.85480000000
+1,2050,R1,gassupply1,2030,4.85480000000
+1,2059,R1,gassupply1,2030,4.85480000000
+1,2060,R1,gassupply1,2030,4.85480000000
+1,2069,R1,gassupply1,2030,4.85480000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2035.csv
index 5c5b3b30d..772418b79 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2035.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2035.csv
@@ -1,13 +1,13 @@
-asset,year,region,installed,technology,capacity
-0,2035,R1,2020,gassupply1,0.42960000000
-0,2040,R1,2020,gassupply1,0.42960000000
-0,2045,R1,2020,gassupply1,0.42960000000
-0,2050,R1,2020,gassupply1,0.42960000000
-0,2059,R1,2020,gassupply1,0.42960000000
-1,2035,R1,2030,gassupply1,4.85480000000
-1,2040,R1,2030,gassupply1,4.85480000000
-1,2045,R1,2030,gassupply1,4.85480000000
-1,2050,R1,2030,gassupply1,4.85480000000
-1,2059,R1,2030,gassupply1,4.85480000000
-1,2060,R1,2030,gassupply1,4.85480000000
-1,2069,R1,2030,gassupply1,4.85480000000
+asset,year,region,technology,installed,capacity
+0,2035,R1,gassupply1,2020,0.42960000000
+0,2040,R1,gassupply1,2020,0.42960000000
+0,2045,R1,gassupply1,2020,0.42960000000
+0,2050,R1,gassupply1,2020,0.42960000000
+0,2059,R1,gassupply1,2020,0.42960000000
+1,2035,R1,gassupply1,2030,4.85480000000
+1,2040,R1,gassupply1,2030,4.85480000000
+1,2045,R1,gassupply1,2030,4.85480000000
+1,2050,R1,gassupply1,2030,4.85480000000
+1,2059,R1,gassupply1,2030,4.85480000000
+1,2060,R1,gassupply1,2030,4.85480000000
+1,2069,R1,gassupply1,2030,4.85480000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2040.csv
index b2702c268..70eb04b5b 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2040.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2040.csv
@@ -1,11 +1,11 @@
-asset,year,region,installed,technology,capacity
-0,2040,R1,2020,gassupply1,0.42960000000
-0,2045,R1,2020,gassupply1,0.42960000000
-0,2050,R1,2020,gassupply1,0.42960000000
-0,2059,R1,2020,gassupply1,0.42960000000
-1,2040,R1,2030,gassupply1,4.85480000000
-1,2045,R1,2030,gassupply1,4.85480000000
-1,2050,R1,2030,gassupply1,4.85480000000
-1,2059,R1,2030,gassupply1,4.85480000000
-1,2060,R1,2030,gassupply1,4.85480000000
-1,2069,R1,2030,gassupply1,4.85480000000
+asset,year,region,technology,installed,capacity
+0,2040,R1,gassupply1,2020,0.42960000000
+0,2045,R1,gassupply1,2020,0.42960000000
+0,2050,R1,gassupply1,2020,0.42960000000
+0,2059,R1,gassupply1,2020,0.42960000000
+1,2040,R1,gassupply1,2030,4.85480000000
+1,2045,R1,gassupply1,2030,4.85480000000
+1,2050,R1,gassupply1,2030,4.85480000000
+1,2059,R1,gassupply1,2030,4.85480000000
+1,2060,R1,gassupply1,2030,4.85480000000
+1,2069,R1,gassupply1,2030,4.85480000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2045.csv
index e8be0bbde..fdf6b01bb 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2045.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2045.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-0,2045,R1,2020,gassupply1,0.42960000000
-0,2050,R1,2020,gassupply1,0.42960000000
-0,2059,R1,2020,gassupply1,0.42960000000
-1,2045,R1,2030,gassupply1,4.85480000000
-1,2050,R1,2030,gassupply1,4.85480000000
-1,2059,R1,2030,gassupply1,4.85480000000
-1,2060,R1,2030,gassupply1,4.85480000000
-1,2069,R1,2030,gassupply1,4.85480000000
+asset,year,region,technology,installed,capacity
+0,2045,R1,gassupply1,2020,0.42960000000
+0,2050,R1,gassupply1,2020,0.42960000000
+0,2059,R1,gassupply1,2020,0.42960000000
+1,2045,R1,gassupply1,2030,4.85480000000
+1,2050,R1,gassupply1,2030,4.85480000000
+1,2059,R1,gassupply1,2030,4.85480000000
+1,2060,R1,gassupply1,2030,4.85480000000
+1,2069,R1,gassupply1,2030,4.85480000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2050.csv
index cd8cdf35d..ed1ed9d4b 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2050.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Gas/Capacity/2050.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-0,2050,R1,2020,gassupply1,0.42960000000
-0,2055,R1,2020,gassupply1,0.42960000000
-0,2059,R1,2020,gassupply1,0.42960000000
-1,2050,R1,2030,gassupply1,4.85480000000
-1,2055,R1,2030,gassupply1,4.85480000000
-1,2059,R1,2030,gassupply1,4.85480000000
-1,2060,R1,2030,gassupply1,4.85480000000
-1,2069,R1,2030,gassupply1,4.85480000000
+asset,year,region,technology,installed,capacity
+0,2050,R1,gassupply1,2020,0.42960000000
+0,2055,R1,gassupply1,2020,0.42960000000
+0,2059,R1,gassupply1,2020,0.42960000000
+1,2050,R1,gassupply1,2030,4.85480000000
+1,2055,R1,gassupply1,2030,4.85480000000
+1,2059,R1,gassupply1,2030,4.85480000000
+1,2060,R1,gassupply1,2030,4.85480000000
+1,2069,R1,gassupply1,2030,4.85480000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv
index 55d57422c..07d7b4ce0 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCACapacity.csv
@@ -5,47 +5,47 @@ A1,15.00000000000,R1,0,2020,R1,gas,gassupply1,retrofit,2020
 A1,5.00000000000,R1,0,2020,R1,residential,gasboiler,retrofit,2025
 A1,19.00000000000,R1,16,2020,R1,residential,heatpump,retrofit,2025
 A1,1.00000000000,R1,0,2020,R1,power,gasCCGT,retrofit,2025
-A1,1.10000000000,R1,9,2020,R1,power,windturbine,retrofit,2025
+A1,1.35560000000,R1,9,2020,R1,power,windturbine,retrofit,2025
 A1,15.42960000000,R1,0,2020,R1,gas,gassupply1,retrofit,2025
 A1,4.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2030
 A1,19.00000000000,R1,8,2020,R1,residential,heatpump,retrofit,2030
 A1,6.90000000000,R1,9,2025,R1,residential,heatpump,retrofit,2030
-A1,1.10000000000,R1,0,2020,R1,power,windturbine,retrofit,2030
-A1,1.62110000000,R1,1,2025,R1,power,windturbine,retrofit,2030
+A1,1.35560000000,R1,0,2020,R1,power,windturbine,retrofit,2030
+A1,1.85040000000,R1,1,2025,R1,power,windturbine,retrofit,2030
 A1,7.92960000000,R1,0,2020,R1,gas,gassupply1,retrofit,2030
 A1,4.10000000000,R1,0,2025,R1,residential,gasboiler,retrofit,2035
 A1,6.90000000000,R1,14,2025,R1,residential,heatpump,retrofit,2035
 A1,25.00000000000,R1,15,2030,R1,residential,heatpump,retrofit,2035
-A1,1.10000000000,R1,0,2020,R1,power,windturbine,retrofit,2035
-A1,1.62110000000,R1,1,2025,R1,power,windturbine,retrofit,2035
-A1,1.67320000000,R1,2,2030,R1,power,windturbine,retrofit,2035
+A1,1.35560000000,R1,0,2020,R1,power,windturbine,retrofit,2035
+A1,1.85040000000,R1,1,2025,R1,power,windturbine,retrofit,2035
+A1,1.76690000000,R1,2,2030,R1,power,windturbine,retrofit,2035
 A1,0.42960000000,R1,0,2020,R1,gas,gassupply1,retrofit,2035
 A1,4.85480000000,R1,1,2030,R1,gas,gassupply1,retrofit,2035
 A1,0.91000000000,R1,0,2035,R1,residential,gasboiler,retrofit,2040
 A1,25.00000000000,R1,7,2030,R1,residential,heatpump,retrofit,2040
 A1,16.09000000000,R1,8,2035,R1,residential,heatpump,retrofit,2040
-A1,1.10000000000,R1,0,2020,R1,power,windturbine,retrofit,2040
-A1,1.62110000000,R1,1,2025,R1,power,windturbine,retrofit,2040
-A1,1.67320000000,R1,2,2030,R1,power,windturbine,retrofit,2040
-A1,2.00700000000,R1,3,2035,R1,power,windturbine,retrofit,2040
+A1,1.35560000000,R1,0,2020,R1,power,windturbine,retrofit,2040
+A1,1.85040000000,R1,1,2025,R1,power,windturbine,retrofit,2040
+A1,1.76690000000,R1,2,2030,R1,power,windturbine,retrofit,2040
+A1,2.11470000000,R1,3,2035,R1,power,windturbine,retrofit,2040
 A1,0.42960000000,R1,0,2020,R1,gas,gassupply1,retrofit,2040
 A1,4.85480000000,R1,1,2030,R1,gas,gassupply1,retrofit,2040
 A1,0.91000000000,R1,0,2035,R1,residential,gasboiler,retrofit,2045
 A1,16.09000000000,R1,7,2035,R1,residential,heatpump,retrofit,2045
 A1,31.00000000000,R1,8,2040,R1,residential,heatpump,retrofit,2045
-A1,1.10000000000,R1,0,2020,R1,power,windturbine,retrofit,2045
-A1,1.62110000000,R1,1,2025,R1,power,windturbine,retrofit,2045
-A1,1.67320000000,R1,2,2030,R1,power,windturbine,retrofit,2045
-A1,2.00700000000,R1,3,2035,R1,power,windturbine,retrofit,2045
-A1,2.07250000000,R1,4,2040,R1,power,windturbine,retrofit,2045
+A1,1.35560000000,R1,0,2020,R1,power,windturbine,retrofit,2045
+A1,1.85040000000,R1,1,2025,R1,power,windturbine,retrofit,2045
+A1,1.76690000000,R1,2,2030,R1,power,windturbine,retrofit,2045
+A1,2.11470000000,R1,3,2035,R1,power,windturbine,retrofit,2045
+A1,2.09140000000,R1,4,2040,R1,power,windturbine,retrofit,2045
 A1,0.42960000000,R1,0,2020,R1,gas,gassupply1,retrofit,2045
 A1,4.85480000000,R1,1,2030,R1,gas,gassupply1,retrofit,2045
 A1,31.00000000000,R1,0,2040,R1,residential,heatpump,retrofit,2050
 A1,23.00000000000,R1,1,2045,R1,residential,heatpump,retrofit,2050
-A1,1.62110000000,R1,0,2025,R1,power,windturbine,retrofit,2050
-A1,1.67320000000,R1,1,2030,R1,power,windturbine,retrofit,2050
-A1,2.00700000000,R1,2,2035,R1,power,windturbine,retrofit,2050
-A1,2.07250000000,R1,3,2040,R1,power,windturbine,retrofit,2050
-A1,2.37110000000,R1,4,2045,R1,power,windturbine,retrofit,2050
+A1,1.85040000000,R1,0,2025,R1,power,windturbine,retrofit,2050
+A1,1.76690000000,R1,1,2030,R1,power,windturbine,retrofit,2050
+A1,2.11470000000,R1,2,2035,R1,power,windturbine,retrofit,2050
+A1,2.09140000000,R1,3,2040,R1,power,windturbine,retrofit,2050
+A1,2.44960000000,R1,4,2045,R1,power,windturbine,retrofit,2050
 A1,0.42960000000,R1,0,2020,R1,gas,gassupply1,retrofit,2050
 A1,4.85480000000,R1,1,2030,R1,gas,gassupply1,retrofit,2050
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Consumption.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Consumption.csv
index f024353b6..203194bce 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Consumption.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Consumption.csv
@@ -1,229 +1,229 @@
 agent,asset,category,comm_usage,commodity,consumption,dst_region,index,installed,region,sector,technology,timeslice,units_prices,year
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.16000000000,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.74000000000,R1,9,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.16000000000,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.74000000000,R1,25,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,3.48000000000,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,2.32000000000,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.32222222222,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R1,4,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.48333333333,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R1,20,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.32222222222,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R1,36,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.48333333333,R1,49,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R1,52,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.96666666667,R1,65,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.26666666667,R1,68,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.64444444444,R1,81,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.84444444444,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.33576719577,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22116402116,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.68236559140,R1,13,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22473118280,R1,19,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.45491039427,R1,25,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.14982078853,R1,31,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50365079365,R1,37,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33174603175,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.00730158730,R1,49,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66349206349,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.67153439153,R1,61,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.44232804233,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R1,0,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.26422222222,R1,5,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15333333333,R1,8,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R1,16,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.39633333333,R1,21,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.23000000000,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R1,32,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.26422222222,R1,37,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15333333333,R1,40,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R1,48,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.39633333333,R1,53,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.23000000000,R1,56,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.26666666667,R1,64,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.79266666667,R1,69,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.46000000000,R1,72,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.84444444444,R1,80,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.52844444444,R1,85,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30666666667,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.23267077262,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.34288478293,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.34900615894,R1,15,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.51432717440,R1,19,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.23267077262,R1,27,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.34288478293,R1,31,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.34900615894,R1,39,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.51432717440,R1,43,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.69801231787,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,1.02865434880,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.46534154525,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.68576956586,R1,67,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.26422222222,R1,1,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15333333333,R1,4,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,8,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.39633333333,R1,21,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.23000000000,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R1,28,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.26422222222,R1,41,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15333333333,R1,44,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.39633333333,R1,61,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.23000000000,R1,64,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R1,68,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.79266666667,R1,81,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.46000000000,R1,84,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.66666666667,R1,88,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.52844444444,R1,101,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30666666667,R1,104,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.11111111111,R1,108,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.17745547172,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26151450057,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26991891660,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26618320757,R1,19,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.39227175085,R1,23,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40487837491,R1,27,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.17745547172,R1,35,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26151450057,R1,39,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26991891660,R1,43,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.26618320757,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.39227175085,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40487837491,R1,59,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.53236641515,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.78454350171,R1,71,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.80975674981,R1,75,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.35491094343,R1,83,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.52302900114,R1,87,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.53983783321,R1,91,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,0,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05864444444,R1,5,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.35755555556,R1,8,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R1,16,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08796666667,R1,21,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.53633333333,R1,24,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,32,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05864444444,R1,37,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.35755555556,R1,40,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08796666667,R1,53,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.53633333333,R1,56,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.66666666667,R1,64,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17593333333,R1,69,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.07266666667,R1,72,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.11111111111,R1,80,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11728888889,R1,85,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.71511111111,R1,88,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.15691202952,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.23123981828,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.23867128243,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.28628798089,R1,15,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.23536804427,R1,23,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.34685972741,R1,27,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.35800692365,R1,31,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.42943197133,R1,35,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.15691202952,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.23123981828,R1,47,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.23867128243,R1,51,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.28628798089,R1,55,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.23536804427,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.34685972741,R1,67,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.35800692365,R1,71,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.42943197133,R1,75,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.47073608855,R1,83,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.69371945483,R1,87,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.71601384729,R1,91,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.85886394267,R1,95,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.31382405903,R1,103,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.46247963655,R1,107,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.47734256486,R1,111,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.57257596178,R1,115,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05864444444,R1,1,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.35755555556,R1,4,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R1,8,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08796666667,R1,17,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.53633333333,R1,20,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R1,24,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05864444444,R1,33,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.35755555556,R1,36,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R1,40,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08796666667,R1,49,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.53633333333,R1,52,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R1,56,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17593333333,R1,65,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.07266666667,R1,68,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,2.06666666667,R1,72,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11728888889,R1,81,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.71511111111,R1,84,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.37777777778,R1,88,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13584333000,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.20019106910,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.20662470481,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24784787236,R1,15,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25593746818,R1,19,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.20376499500,R1,27,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.30028660365,R1,31,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.30993705722,R1,35,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.37177180854,R1,39,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.38390620226,R1,43,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13584333000,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.20019106910,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.20662470481,R1,59,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24784787236,R1,63,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25593746818,R1,67,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.20376499500,R1,75,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.30028660365,R1,79,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.30993705722,R1,83,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.37177180854,R1,87,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.38390620226,R1,91,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40752999000,R1,99,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.60057320729,R1,103,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.61987411444,R1,107,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.74354361707,R1,111,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.76781240453,R1,115,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.27168666000,R1,123,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40038213820,R1,127,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.41324940963,R1,131,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.49569574471,R1,135,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.51187493635,R1,139,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R1,0,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51111111111,R1,4,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R1,12,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.76666666667,R1,16,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R1,24,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51111111111,R1,28,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R1,36,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.76666666667,R1,40,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,2.06666666667,R1,48,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.53333333333,R1,52,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.37777777778,R1,60,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.02222222222,R1,64,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19962340121,R1,3,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.20603879351,R1,7,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24714506738,R1,11,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25521172410,R1,15,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.29198101381,R1,19,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.29943510181,R1,27,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.30905819026,R1,31,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.37071760107,R1,35,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.38281758615,R1,39,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.43797152071,R1,43,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19962340121,R1,51,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.20603879351,R1,55,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24714506738,R1,59,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25521172410,R1,63,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.29198101381,R1,67,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.29943510181,R1,75,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.30905819026,R1,79,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.37071760107,R1,83,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.38281758615,R1,87,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.43797152071,R1,91,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.59887020362,R1,99,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.61811638053,R1,103,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.74143520215,R1,107,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.76563517229,R1,111,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.87594304142,R1,115,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.39924680241,R1,123,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.41207758702,R1,127,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.49429013476,R1,131,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.51042344819,R1,135,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.58396202761,R1,139,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,R1,9,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,R1,25,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,3.48000000000,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,2.32000000000,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,4,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,20,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,36,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,R1,49,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,52,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,R1,65,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,R1,68,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,R1,81,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.29933962264,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24297693920,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.63039735099,R1,13,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25584988962,R1,19,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.42026490066,R1,25,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.17056659308,R1,31,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.44900943396,R1,37,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.36446540881,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.89801886792,R1,49,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.72893081761,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.59867924528,R1,61,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.48595387841,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,0,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,R1,5,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,R1,8,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,16,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,R1,21,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,32,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,R1,37,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,R1,40,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,48,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,R1,53,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,R1,56,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,R1,64,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,R1,69,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,R1,72,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,R1,80,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,R1,85,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24336105977,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33219449579,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.36504158965,R1,15,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.49829174368,R1,19,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24336105977,R1,27,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33219449579,R1,31,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.36504158965,R1,39,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.49829174368,R1,43,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.73008317930,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.99658348737,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.48672211953,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.66438899158,R1,67,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,R1,1,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,R1,4,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,R1,8,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,R1,21,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,R1,28,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,R1,41,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,R1,44,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,R1,61,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,R1,64,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,R1,68,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,R1,81,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,R1,84,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,R1,88,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,R1,101,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,R1,104,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,R1,108,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.19323733863,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.26377424694,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25187730332,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.28985600794,R1,19,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.39566137041,R1,23,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37781595498,R1,27,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.19323733863,R1,35,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.26377424694,R1,39,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25187730332,R1,43,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.28985600794,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.39566137041,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37781595498,R1,59,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.57971201589,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.79132274081,R1,71,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.75563190996,R1,75,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.38647467726,R1,83,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.52754849388,R1,87,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.50375460664,R1,91,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,R1,0,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,R1,5,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,R1,8,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,R1,16,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,R1,21,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,R1,24,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,R1,32,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,R1,37,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,R1,40,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,R1,53,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,R1,56,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,R1,64,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,R1,69,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,R1,72,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,R1,80,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,R1,85,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,R1,88,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.17463949035,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.23838767590,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22763573642,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.27244820844,R1,15,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.26195923553,R1,23,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.35758151385,R1,27,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.34145360463,R1,31,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.40867231266,R1,35,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.17463949035,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.23838767590,R1,47,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22763573642,R1,51,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.27244820844,R1,55,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.26195923553,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.35758151385,R1,67,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.34145360463,R1,71,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.40867231266,R1,75,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.52391847105,R1,83,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.71516302770,R1,87,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.68290720926,R1,91,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.81734462532,R1,95,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.34927898070,R1,103,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.47677535180,R1,107,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.45527147284,R1,111,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.54489641688,R1,115,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,R1,1,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,R1,4,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,R1,8,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,R1,17,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,R1,20,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,R1,24,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,R1,33,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,R1,36,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,R1,40,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,R1,49,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,R1,52,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,R1,56,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,R1,65,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,R1,68,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,R1,72,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,R1,81,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,R1,84,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,R1,88,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15453917248,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.21095019281,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20143575924,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24109049213,R1,15,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.23842882778,R1,19,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.23180875871,R1,27,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.31642528922,R1,31,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.30215363886,R1,35,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.36163573820,R1,39,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.35764324167,R1,43,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15453917248,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.21095019281,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20143575924,R1,59,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24109049213,R1,63,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.23842882778,R1,67,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.23180875871,R1,75,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.31642528922,R1,79,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.30215363886,R1,83,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.36163573820,R1,87,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.35764324167,R1,91,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.46361751743,R1,99,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.63285057844,R1,103,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.60430727773,R1,107,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.72327147640,R1,111,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.71528648334,R1,115,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.30907834495,R1,123,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.42190038562,R1,127,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.40287151849,R1,131,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.48218098427,R1,135,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.47685765556,R1,139,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,R1,0,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,R1,4,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,R1,12,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,R1,16,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,R1,24,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,R1,28,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,R1,36,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,R1,40,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,R1,48,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.53333333333,R1,52,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,R1,60,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.02222222222,R1,64,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.21614194109,R1,3,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20639334540,R1,7,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24702403090,R1,11,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24429685966,R1,15,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.28614382294,R1,19,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.32421291164,R1,27,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.30959001810,R1,31,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37053604636,R1,35,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.36644528949,R1,39,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.42921573441,R1,43,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.21614194109,R1,51,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20639334540,R1,55,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24702403090,R1,59,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24429685966,R1,63,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.28614382294,R1,67,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.32421291164,R1,75,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.30959001810,R1,79,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37053604636,R1,83,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.36644528949,R1,87,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.42921573441,R1,91,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.64842582327,R1,99,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.61918003621,R1,103,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.74107209271,R1,107,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.73289057897,R1,111,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.85843146883,R1,115,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.43228388218,R1,123,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.41278669081,R1,127,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.49404806181,R1,131,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.48859371932,R1,135,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.57228764589,R1,139,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Supply.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Supply.csv
index a6d6edc53..d24d8c309 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Supply.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/MCAMetric_Supply.csv
@@ -1,325 +1,325 @@
 agent,asset,category,comm_usage,commodity,dst_region,index,installed,region,sector,supply,technology,timeslice,units_prices,year
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,4,2020.00000000000,R1,residential,1.00000000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,6,2020.00000000000,R1,residential,64.71000000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2020.00000000000,R1,residential,1.50000000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,14,2020.00000000000,R1,residential,97.06500000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,20,2020.00000000000,R1,residential,1.00000000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2020.00000000000,R1,residential,64.71000000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,28,2020.00000000000,R1,residential,1.50000000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,30,2020.00000000000,R1,residential,97.06500000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,36,2020.00000000000,R1,residential,3.00000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,38,2020.00000000000,R1,residential,194.13000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2020.00000000000,R1,residential,2.00000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,46,2020.00000000000,R1,residential,129.42000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,1.16732260678,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2020.00000000000,R1,gas,1.88146776247,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,1.68925801597,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2020.00000000000,R1,gas,1.88146776247,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,3.76293552495,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2020.00000000000,R1,gas,3.11754832735,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2020.00000000000,R1,residential,0.83333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2020.00000000000,R1,residential,3.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,76,2020.00000000000,R1,residential,53.92500000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2020.00000000000,R1,residential,0.55555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2020.00000000000,R1,residential,35.95000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.20105820106,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2020.00000000000,R1,power,0.22116402116,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,6,2020.00000000000,R1,power,18.43100529101,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,12,2020.00000000000,R1,power,0.40860215054,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,13,2020.00000000000,R1,power,0.22473118280,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,18,2020.00000000000,R1,power,37.45655913978,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,24,2020.00000000000,R1,power,0.27240143369,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,25,2020.00000000000,R1,power,0.14982078853,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,30,2020.00000000000,R1,power,24.97103942652,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,36,2020.00000000000,R1,power,0.30158730159,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,37,2020.00000000000,R1,power,0.33174603175,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,42,2020.00000000000,R1,power,27.64650793651,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,48,2020.00000000000,R1,power,0.60317460317,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,49,2020.00000000000,R1,power,0.66349206349,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,54,2020.00000000000,R1,power,55.29301587302,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,60,2020.00000000000,R1,power,0.40211640212,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,61,2020.00000000000,R1,power,0.44232804233,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,66,2020.00000000000,R1,power,36.86201058201,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.65622222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2020.00000000000,R1,gas,1.15133333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,1.32422222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2020.00000000000,R1,gas,1.15133333333,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,2.30266666667,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2020.00000000000,R1,gas,2.31444444444,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,13,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,26,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,29,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,45,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,58,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,61,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2020.00000000000,R1,residential,3.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2025.00000000000,R1,residential,0.68333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2025.00000000000,R1,residential,1.15000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,77,2025.00000000000,R1,residential,44.21850000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2025.00000000000,R1,residential,0.45555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2025.00000000000,R1,residential,0.76666666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,93,2025.00000000000,R1,residential,29.47900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.23267077262,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2025.00000000000,R1,power,0.34288478293,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,12,2020.00000000000,R1,power,0.34900615894,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,13,2025.00000000000,R1,power,0.51432717440,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,24,2020.00000000000,R1,power,0.23267077262,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,25,2025.00000000000,R1,power,0.34288478293,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,36,2020.00000000000,R1,power,0.34900615894,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,37,2025.00000000000,R1,power,0.51432717440,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,48,2020.00000000000,R1,power,0.69801231787,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,49,2025.00000000000,R1,power,1.02865434880,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,60,2020.00000000000,R1,power,0.46534154525,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,61,2025.00000000000,R1,power,0.68576956586,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.26422222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,0.39633333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,0.26422222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,0.39633333333,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2020.00000000000,R1,gas,0.79266666667,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2020.00000000000,R1,gas,0.52844444444,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,11,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,15,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,32,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,35,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,50,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,51,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,52,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,55,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,70,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,71,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,75,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2025.00000000000,R1,residential,0.68333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,91,2025.00000000000,R1,residential,1.15000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,92,2030.00000000000,R1,residential,4.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,95,2025.00000000000,R1,residential,44.21850000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,110,2025.00000000000,R1,residential,0.45555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,111,2025.00000000000,R1,residential,0.76666666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,112,2030.00000000000,R1,residential,2.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,115,2025.00000000000,R1,residential,29.47900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.17745547172,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2025.00000000000,R1,power,0.26151450057,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2030.00000000000,R1,power,0.26991891660,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,16,2020.00000000000,R1,power,0.26618320757,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,17,2025.00000000000,R1,power,0.39227175085,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,18,2030.00000000000,R1,power,0.40487837491,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,32,2020.00000000000,R1,power,0.17745547172,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,33,2025.00000000000,R1,power,0.26151450057,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,34,2030.00000000000,R1,power,0.26991891660,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,48,2020.00000000000,R1,power,0.26618320757,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,49,2025.00000000000,R1,power,0.39227175085,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2030.00000000000,R1,power,0.40487837491,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,64,2020.00000000000,R1,power,0.53236641515,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,65,2025.00000000000,R1,power,0.78454350171,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,66,2030.00000000000,R1,power,0.80975674981,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,80,2020.00000000000,R1,power,0.35491094343,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,81,2025.00000000000,R1,power,0.52302900114,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,82,2030.00000000000,R1,power,0.53983783321,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.02148148148,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2030.00000000000,R1,gas,0.24274074074,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,0.03222222222,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2030.00000000000,R1,gas,0.36411111111,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,0.02148148148,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.24274074074,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,0.03222222222,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2030.00000000000,R1,gas,0.36411111111,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2020.00000000000,R1,gas,0.06444444444,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2030.00000000000,R1,gas,0.72822222222,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2020.00000000000,R1,gas,0.04296296296,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,11,2030.00000000000,R1,gas,0.48548148148,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,13,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,26,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,29,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,45,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,58,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,61,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2030.00000000000,R1,residential,4.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2035.00000000000,R1,residential,0.15166666667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2035.00000000000,R1,residential,2.68166666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,77,2035.00000000000,R1,residential,9.81435000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2030.00000000000,R1,residential,2.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2035.00000000000,R1,residential,0.10111111111,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2035.00000000000,R1,residential,1.78777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,93,2035.00000000000,R1,residential,6.54290000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.15691202952,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2025.00000000000,R1,power,0.23123981828,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2030.00000000000,R1,power,0.23867128243,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2035.00000000000,R1,power,0.28628798089,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,20,2020.00000000000,R1,power,0.23536804427,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,21,2025.00000000000,R1,power,0.34685972741,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,22,2030.00000000000,R1,power,0.35800692365,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,23,2035.00000000000,R1,power,0.42943197133,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,40,2020.00000000000,R1,power,0.15691202952,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,41,2025.00000000000,R1,power,0.23123981828,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,42,2030.00000000000,R1,power,0.23867128243,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,43,2035.00000000000,R1,power,0.28628798089,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,60,2020.00000000000,R1,power,0.23536804427,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,61,2025.00000000000,R1,power,0.34685972741,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,62,2030.00000000000,R1,power,0.35800692365,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,63,2035.00000000000,R1,power,0.42943197133,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,80,2020.00000000000,R1,power,0.47073608855,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,81,2025.00000000000,R1,power,0.69371945483,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,82,2030.00000000000,R1,power,0.71601384729,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,83,2035.00000000000,R1,power,0.85886394267,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,100,2020.00000000000,R1,power,0.31382405903,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,101,2025.00000000000,R1,power,0.46247963655,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,102,2030.00000000000,R1,power,0.47734256486,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,103,2035.00000000000,R1,power,0.57257596178,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.00476784101,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2030.00000000000,R1,gas,0.05387660343,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,0.00715176152,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2030.00000000000,R1,gas,0.08081490515,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,0.00476784101,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.05387660343,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,0.00715176152,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2030.00000000000,R1,gas,0.08081490515,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2020.00000000000,R1,gas,0.01430352304,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2030.00000000000,R1,gas,0.16162981030,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2020.00000000000,R1,gas,0.00953568202,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,11,2030.00000000000,R1,gas,0.10775320687,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,26,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,58,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2035.00000000000,R1,residential,0.15166666667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2035.00000000000,R1,residential,2.68166666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2040.00000000000,R1,residential,5.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,76,2035.00000000000,R1,residential,9.81435000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2035.00000000000,R1,residential,0.10111111111,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2035.00000000000,R1,residential,1.78777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2040.00000000000,R1,residential,3.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2035.00000000000,R1,residential,6.54290000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.13584333000,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2025.00000000000,R1,power,0.20019106910,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2030.00000000000,R1,power,0.20662470481,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2035.00000000000,R1,power,0.24784787236,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2040.00000000000,R1,power,0.25593746818,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,24,2020.00000000000,R1,power,0.20376499500,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,25,2025.00000000000,R1,power,0.30028660365,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,26,2030.00000000000,R1,power,0.30993705722,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,27,2035.00000000000,R1,power,0.37177180854,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,28,2040.00000000000,R1,power,0.38390620226,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,48,2020.00000000000,R1,power,0.13584333000,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,49,2025.00000000000,R1,power,0.20019106910,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2030.00000000000,R1,power,0.20662470481,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,51,2035.00000000000,R1,power,0.24784787236,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,52,2040.00000000000,R1,power,0.25593746818,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,72,2020.00000000000,R1,power,0.20376499500,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,73,2025.00000000000,R1,power,0.30028660365,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,74,2030.00000000000,R1,power,0.30993705722,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2035.00000000000,R1,power,0.37177180854,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,76,2040.00000000000,R1,power,0.38390620226,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,96,2020.00000000000,R1,power,0.40752999000,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,97,2025.00000000000,R1,power,0.60057320729,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,98,2030.00000000000,R1,power,0.61987411444,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,99,2035.00000000000,R1,power,0.74354361707,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,100,2040.00000000000,R1,power,0.76781240453,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2020.00000000000,R1,power,0.27168666000,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2025.00000000000,R1,power,0.40038213820,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,122,2030.00000000000,R1,power,0.41324940963,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2035.00000000000,R1,power,0.49569574471,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,124,2040.00000000000,R1,power,0.51187493635,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.00476784101,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2030.00000000000,R1,gas,0.05387660343,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,0.00715176152,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2030.00000000000,R1,gas,0.08081490515,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,0.00476784101,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.05387660343,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,0.00715176152,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2030.00000000000,R1,gas,0.08081490515,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2020.00000000000,R1,gas,0.01430352304,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2030.00000000000,R1,gas,0.16162981030,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2020.00000000000,R1,gas,0.00953568202,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,11,2030.00000000000,R1,gas,0.10775320687,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,7,2045.00000000000,R1,residential,1.27777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2045.00000000000,R1,residential,1.91666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2045.00000000000,R1,residential,1.27777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2045.00000000000,R1,residential,1.91666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,54,2040.00000000000,R1,residential,5.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,55,2045.00000000000,R1,residential,3.83333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,66,2040.00000000000,R1,residential,3.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,67,2045.00000000000,R1,residential,2.55555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2025.00000000000,R1,power,0.19962340121,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2030.00000000000,R1,power,0.20603879351,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2035.00000000000,R1,power,0.24714506738,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2040.00000000000,R1,power,0.25521172410,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2045.00000000000,R1,power,0.29198101381,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,24,2025.00000000000,R1,power,0.29943510181,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,25,2030.00000000000,R1,power,0.30905819026,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,26,2035.00000000000,R1,power,0.37071760107,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,27,2040.00000000000,R1,power,0.38281758615,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,28,2045.00000000000,R1,power,0.43797152071,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,48,2025.00000000000,R1,power,0.19962340121,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,49,2030.00000000000,R1,power,0.20603879351,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2035.00000000000,R1,power,0.24714506738,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,51,2040.00000000000,R1,power,0.25521172410,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,52,2045.00000000000,R1,power,0.29198101381,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,72,2025.00000000000,R1,power,0.29943510181,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,73,2030.00000000000,R1,power,0.30905819026,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,74,2035.00000000000,R1,power,0.37071760107,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2040.00000000000,R1,power,0.38281758615,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,76,2045.00000000000,R1,power,0.43797152071,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,96,2025.00000000000,R1,power,0.59887020362,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,97,2030.00000000000,R1,power,0.61811638053,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,98,2035.00000000000,R1,power,0.74143520215,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,99,2040.00000000000,R1,power,0.76563517229,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,100,2045.00000000000,R1,power,0.87594304142,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2025.00000000000,R1,power,0.39924680241,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2030.00000000000,R1,power,0.41207758702,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,122,2035.00000000000,R1,power,0.49429013476,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2040.00000000000,R1,power,0.51042344819,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,124,2045.00000000000,R1,power,0.58396202761,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,4,2020.00000000000,R1,residential,1.00000000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,6,2020.00000000000,R1,residential,64.71000000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,12,2020.00000000000,R1,residential,1.50000000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,14,2020.00000000000,R1,residential,97.06500000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,20,2020.00000000000,R1,residential,1.00000000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,22,2020.00000000000,R1,residential,64.71000000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,28,2020.00000000000,R1,residential,1.50000000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,30,2020.00000000000,R1,residential,97.06500000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,36,2020.00000000000,R1,residential,3.00000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,38,2020.00000000000,R1,residential,194.13000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,44,2020.00000000000,R1,residential,2.00000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,46,2020.00000000000,R1,residential,129.42000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,1.16732260678,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2020.00000000000,R1,gas,1.88146776247,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,1.68925801597,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2020.00000000000,R1,gas,1.88146776247,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,3.76293552495,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2020.00000000000,R1,gas,3.11754832735,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,8,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,9,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,12,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,24,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,25,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,28,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,40,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,41,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,44,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,56,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,57,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,60,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,72,2020.00000000000,R1,residential,0.83333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,73,2020.00000000000,R1,residential,3.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,76,2020.00000000000,R1,residential,53.92500000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2020.00000000000,R1,residential,0.55555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,89,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,92,2020.00000000000,R1,residential,35.95000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.17924528302,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.24297693920,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,6,2020.00000000000,R1,power,16.43141509434,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,12,2020.00000000000,R1,power,0.37748344371,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,13,2020.00000000000,R1,power,0.25584988962,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,18,2020.00000000000,R1,power,34.60390728477,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,0.25165562914,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2020.00000000000,R1,power,0.17056659308,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,30,2020.00000000000,R1,power,23.06927152318,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,36,2020.00000000000,R1,power,0.26886792453,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,37,2020.00000000000,R1,power,0.36446540881,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,42,2020.00000000000,R1,power,24.64712264151,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.53773584906,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2020.00000000000,R1,power,0.72893081761,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,54,2020.00000000000,R1,power,49.29424528302,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,0.35849056604,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,61,2020.00000000000,R1,power,0.48595387841,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,66,2020.00000000000,R1,power,32.86283018868,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.65622222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2020.00000000000,R1,gas,1.15133333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,1.32422222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2020.00000000000,R1,gas,1.15133333333,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,2.30266666667,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2020.00000000000,R1,gas,2.31444444444,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,8,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,9,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,10,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,13,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,24,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,25,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,26,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,29,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,40,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,41,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,42,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,45,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,56,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,57,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,58,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,61,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,72,2020.00000000000,R1,residential,3.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,73,2025.00000000000,R1,residential,0.68333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,74,2025.00000000000,R1,residential,1.15000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,77,2025.00000000000,R1,residential,44.21850000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,89,2025.00000000000,R1,residential,0.45555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,90,2025.00000000000,R1,residential,0.76666666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,93,2025.00000000000,R1,residential,29.47900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.24336105977,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2025.00000000000,R1,power,0.33219449579,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,12,2020.00000000000,R1,power,0.36504158965,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,13,2025.00000000000,R1,power,0.49829174368,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,0.24336105977,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2025.00000000000,R1,power,0.33219449579,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,36,2020.00000000000,R1,power,0.36504158965,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,37,2025.00000000000,R1,power,0.49829174368,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.73008317930,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2025.00000000000,R1,power,0.99658348737,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,0.48672211953,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,61,2025.00000000000,R1,power,0.66438899158,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.26422222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,0.39633333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,0.26422222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2020.00000000000,R1,gas,0.39633333333,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,8,2020.00000000000,R1,gas,0.79266666667,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2020.00000000000,R1,gas,0.52844444444,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,10,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,11,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,12,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,15,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,30,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,31,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,32,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,35,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,50,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,51,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,52,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,55,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,70,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,71,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,72,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,75,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,90,2025.00000000000,R1,residential,0.68333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,91,2025.00000000000,R1,residential,1.15000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,92,2030.00000000000,R1,residential,4.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,95,2025.00000000000,R1,residential,44.21850000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,110,2025.00000000000,R1,residential,0.45555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,111,2025.00000000000,R1,residential,0.76666666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,112,2030.00000000000,R1,residential,2.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,115,2025.00000000000,R1,residential,29.47900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.19323733863,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2025.00000000000,R1,power,0.26377424694,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2030.00000000000,R1,power,0.25187730332,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,16,2020.00000000000,R1,power,0.28985600794,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,17,2025.00000000000,R1,power,0.39566137041,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,18,2030.00000000000,R1,power,0.37781595498,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,32,2020.00000000000,R1,power,0.19323733863,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,33,2025.00000000000,R1,power,0.26377424694,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,34,2030.00000000000,R1,power,0.25187730332,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.28985600794,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2025.00000000000,R1,power,0.39566137041,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,50,2030.00000000000,R1,power,0.37781595498,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,64,2020.00000000000,R1,power,0.57971201589,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,65,2025.00000000000,R1,power,0.79132274081,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,66,2030.00000000000,R1,power,0.75563190996,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,80,2020.00000000000,R1,power,0.38647467726,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,81,2025.00000000000,R1,power,0.52754849388,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,82,2030.00000000000,R1,power,0.50375460664,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.02148148148,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2030.00000000000,R1,gas,0.24274074074,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,0.03222222222,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2030.00000000000,R1,gas,0.36411111111,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,0.02148148148,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2030.00000000000,R1,gas,0.24274074074,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2020.00000000000,R1,gas,0.03222222222,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,7,2030.00000000000,R1,gas,0.36411111111,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,8,2020.00000000000,R1,gas,0.06444444444,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,9,2030.00000000000,R1,gas,0.72822222222,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2020.00000000000,R1,gas,0.04296296296,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,11,2030.00000000000,R1,gas,0.48548148148,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,8,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,9,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,10,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,13,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,24,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,25,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,26,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,29,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,40,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,41,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,42,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,45,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,56,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,57,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,58,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,61,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,72,2030.00000000000,R1,residential,4.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,73,2035.00000000000,R1,residential,0.15166666667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,74,2035.00000000000,R1,residential,2.68166666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,77,2035.00000000000,R1,residential,9.81435000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2030.00000000000,R1,residential,2.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,89,2035.00000000000,R1,residential,0.10111111111,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,90,2035.00000000000,R1,residential,1.78777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,93,2035.00000000000,R1,residential,6.54290000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.17463949035,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2025.00000000000,R1,power,0.23838767590,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2030.00000000000,R1,power,0.22763573642,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2035.00000000000,R1,power,0.27244820844,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,20,2020.00000000000,R1,power,0.26195923553,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,21,2025.00000000000,R1,power,0.35758151385,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,22,2030.00000000000,R1,power,0.34145360463,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,23,2035.00000000000,R1,power,0.40867231266,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,40,2020.00000000000,R1,power,0.17463949035,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,41,2025.00000000000,R1,power,0.23838767590,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,42,2030.00000000000,R1,power,0.22763573642,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,43,2035.00000000000,R1,power,0.27244820844,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,0.26195923553,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,61,2025.00000000000,R1,power,0.35758151385,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,62,2030.00000000000,R1,power,0.34145360463,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,63,2035.00000000000,R1,power,0.40867231266,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,80,2020.00000000000,R1,power,0.52391847105,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,81,2025.00000000000,R1,power,0.71516302770,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,82,2030.00000000000,R1,power,0.68290720926,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,83,2035.00000000000,R1,power,0.81734462532,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,100,2020.00000000000,R1,power,0.34927898070,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,101,2025.00000000000,R1,power,0.47677535180,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,102,2030.00000000000,R1,power,0.45527147284,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,103,2035.00000000000,R1,power,0.54489641688,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.00476784101,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2030.00000000000,R1,gas,0.05387660343,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,0.00715176152,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2030.00000000000,R1,gas,0.08081490515,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,0.00476784101,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2030.00000000000,R1,gas,0.05387660343,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2020.00000000000,R1,gas,0.00715176152,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,7,2030.00000000000,R1,gas,0.08081490515,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,8,2020.00000000000,R1,gas,0.01430352304,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,9,2030.00000000000,R1,gas,0.16162981030,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2020.00000000000,R1,gas,0.00953568202,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,11,2030.00000000000,R1,gas,0.10775320687,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,8,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,9,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,10,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,12,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,24,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,25,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,26,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,28,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,40,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,41,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,42,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,44,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,56,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,57,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,58,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,60,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,72,2035.00000000000,R1,residential,0.15166666667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,73,2035.00000000000,R1,residential,2.68166666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,74,2040.00000000000,R1,residential,5.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,76,2035.00000000000,R1,residential,9.81435000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2035.00000000000,R1,residential,0.10111111111,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,89,2035.00000000000,R1,residential,1.78777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,90,2040.00000000000,R1,residential,3.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,92,2035.00000000000,R1,residential,6.54290000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.15453917248,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2025.00000000000,R1,power,0.21095019281,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2030.00000000000,R1,power,0.20143575924,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2035.00000000000,R1,power,0.24109049213,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,4,2040.00000000000,R1,power,0.23842882778,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,0.23180875871,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2025.00000000000,R1,power,0.31642528922,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,26,2030.00000000000,R1,power,0.30215363886,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,27,2035.00000000000,R1,power,0.36163573820,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,28,2040.00000000000,R1,power,0.35764324167,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.15453917248,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2025.00000000000,R1,power,0.21095019281,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,50,2030.00000000000,R1,power,0.20143575924,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,51,2035.00000000000,R1,power,0.24109049213,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,52,2040.00000000000,R1,power,0.23842882778,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,72,2020.00000000000,R1,power,0.23180875871,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,73,2025.00000000000,R1,power,0.31642528922,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,74,2030.00000000000,R1,power,0.30215363886,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,75,2035.00000000000,R1,power,0.36163573820,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,76,2040.00000000000,R1,power,0.35764324167,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,96,2020.00000000000,R1,power,0.46361751743,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,97,2025.00000000000,R1,power,0.63285057844,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,98,2030.00000000000,R1,power,0.60430727773,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,99,2035.00000000000,R1,power,0.72327147640,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,100,2040.00000000000,R1,power,0.71528648334,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,120,2020.00000000000,R1,power,0.30907834495,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,121,2025.00000000000,R1,power,0.42190038562,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,122,2030.00000000000,R1,power,0.40287151849,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,123,2035.00000000000,R1,power,0.48218098427,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,124,2040.00000000000,R1,power,0.47685765556,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.00476784101,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2030.00000000000,R1,gas,0.05387660343,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,0.00715176152,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2030.00000000000,R1,gas,0.08081490515,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,0.00476784101,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2030.00000000000,R1,gas,0.05387660343,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2020.00000000000,R1,gas,0.00715176152,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,7,2030.00000000000,R1,gas,0.08081490515,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,8,2020.00000000000,R1,gas,0.01430352304,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,9,2030.00000000000,R1,gas,0.16162981030,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2020.00000000000,R1,gas,0.00953568202,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,11,2030.00000000000,R1,gas,0.10775320687,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,6,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,7,2045.00000000000,R1,residential,1.27777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,18,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,19,2045.00000000000,R1,residential,1.91666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,30,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,31,2045.00000000000,R1,residential,1.27777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,42,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,43,2045.00000000000,R1,residential,1.91666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,54,2040.00000000000,R1,residential,5.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,55,2045.00000000000,R1,residential,3.83333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,66,2040.00000000000,R1,residential,3.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,67,2045.00000000000,R1,residential,2.55555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2025.00000000000,R1,power,0.21614194109,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2030.00000000000,R1,power,0.20639334540,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2035.00000000000,R1,power,0.24702403090,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2040.00000000000,R1,power,0.24429685966,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,4,2045.00000000000,R1,power,0.28614382294,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2025.00000000000,R1,power,0.32421291164,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2030.00000000000,R1,power,0.30959001810,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,26,2035.00000000000,R1,power,0.37053604636,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,27,2040.00000000000,R1,power,0.36644528949,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,28,2045.00000000000,R1,power,0.42921573441,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2025.00000000000,R1,power,0.21614194109,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2030.00000000000,R1,power,0.20639334540,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,50,2035.00000000000,R1,power,0.24702403090,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,51,2040.00000000000,R1,power,0.24429685966,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,52,2045.00000000000,R1,power,0.28614382294,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,72,2025.00000000000,R1,power,0.32421291164,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,73,2030.00000000000,R1,power,0.30959001810,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,74,2035.00000000000,R1,power,0.37053604636,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,75,2040.00000000000,R1,power,0.36644528949,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,76,2045.00000000000,R1,power,0.42921573441,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,96,2025.00000000000,R1,power,0.64842582327,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,97,2030.00000000000,R1,power,0.61918003621,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,98,2035.00000000000,R1,power,0.74107209271,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,99,2040.00000000000,R1,power,0.73289057897,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,100,2045.00000000000,R1,power,0.85843146883,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,120,2025.00000000000,R1,power,0.43228388218,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,121,2030.00000000000,R1,power,0.41278669081,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,122,2035.00000000000,R1,power,0.49404806181,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,123,2040.00000000000,R1,power,0.48859371932,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,124,2045.00000000000,R1,power,0.57228764589,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2020.csv
index 0745318f6..f79ba32f8 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2020.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2020.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gasCCGT,1.00000000000
-0,2025,R1,2020,gasCCGT,1.00000000000
-1,2025,R1,2020,windturbine,1.10000000000
-1,2030,R1,2020,windturbine,1.10000000000
-1,2035,R1,2020,windturbine,1.10000000000
-1,2040,R1,2020,windturbine,1.10000000000
-1,2045,R1,2020,windturbine,1.10000000000
-1,2049,R1,2020,windturbine,1.10000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2025,R1,windturbine,2020,1.35560000000
+1,2030,R1,windturbine,2020,1.35560000000
+1,2035,R1,windturbine,2020,1.35560000000
+1,2040,R1,windturbine,2020,1.35560000000
+1,2045,R1,windturbine,2020,1.35560000000
+1,2049,R1,windturbine,2020,1.35560000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2025.csv
index 7d9d92783..525499d54 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2025.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2025.csv
@@ -1,15 +1,15 @@
 asset,year,region,technology,installed,capacity
 0,2025,R1,gasCCGT,2020,1.00000000000
-1,2025,R1,windturbine,2020,1.10000000000
-1,2030,R1,windturbine,2020,1.10000000000
-1,2035,R1,windturbine,2020,1.10000000000
-1,2040,R1,windturbine,2020,1.10000000000
-1,2045,R1,windturbine,2020,1.10000000000
-1,2049,R1,windturbine,2020,1.10000000000
-2,2030,R1,windturbine,2025,1.62110000000
-2,2035,R1,windturbine,2025,1.62110000000
-2,2040,R1,windturbine,2025,1.62110000000
-2,2045,R1,windturbine,2025,1.62110000000
-2,2049,R1,windturbine,2025,1.62110000000
-2,2050,R1,windturbine,2025,1.62110000000
-2,2054,R1,windturbine,2025,1.62110000000
+1,2025,R1,windturbine,2020,1.35560000000
+1,2030,R1,windturbine,2020,1.35560000000
+1,2035,R1,windturbine,2020,1.35560000000
+1,2040,R1,windturbine,2020,1.35560000000
+1,2045,R1,windturbine,2020,1.35560000000
+1,2049,R1,windturbine,2020,1.35560000000
+2,2030,R1,windturbine,2025,1.85040000000
+2,2035,R1,windturbine,2025,1.85040000000
+2,2040,R1,windturbine,2025,1.85040000000
+2,2045,R1,windturbine,2025,1.85040000000
+2,2049,R1,windturbine,2025,1.85040000000
+2,2050,R1,windturbine,2025,1.85040000000
+2,2054,R1,windturbine,2025,1.85040000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2030.csv
index 7b5158ef2..98ef6ffe0 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2030.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2030.csv
@@ -1,21 +1,21 @@
 asset,year,region,technology,installed,capacity
-0,2030,R1,windturbine,2020,1.10000000000
-0,2035,R1,windturbine,2020,1.10000000000
-0,2040,R1,windturbine,2020,1.10000000000
-0,2045,R1,windturbine,2020,1.10000000000
-0,2049,R1,windturbine,2020,1.10000000000
-1,2030,R1,windturbine,2025,1.62110000000
-1,2035,R1,windturbine,2025,1.62110000000
-1,2040,R1,windturbine,2025,1.62110000000
-1,2045,R1,windturbine,2025,1.62110000000
-1,2049,R1,windturbine,2025,1.62110000000
-1,2050,R1,windturbine,2025,1.62110000000
-1,2054,R1,windturbine,2025,1.62110000000
-2,2035,R1,windturbine,2030,1.67320000000
-2,2040,R1,windturbine,2030,1.67320000000
-2,2045,R1,windturbine,2030,1.67320000000
-2,2049,R1,windturbine,2030,1.67320000000
-2,2050,R1,windturbine,2030,1.67320000000
-2,2054,R1,windturbine,2030,1.67320000000
-2,2055,R1,windturbine,2030,1.67320000000
-2,2059,R1,windturbine,2030,1.67320000000
+0,2030,R1,windturbine,2020,1.35560000000
+0,2035,R1,windturbine,2020,1.35560000000
+0,2040,R1,windturbine,2020,1.35560000000
+0,2045,R1,windturbine,2020,1.35560000000
+0,2049,R1,windturbine,2020,1.35560000000
+1,2030,R1,windturbine,2025,1.85040000000
+1,2035,R1,windturbine,2025,1.85040000000
+1,2040,R1,windturbine,2025,1.85040000000
+1,2045,R1,windturbine,2025,1.85040000000
+1,2049,R1,windturbine,2025,1.85040000000
+1,2050,R1,windturbine,2025,1.85040000000
+1,2054,R1,windturbine,2025,1.85040000000
+2,2035,R1,windturbine,2030,1.76690000000
+2,2040,R1,windturbine,2030,1.76690000000
+2,2045,R1,windturbine,2030,1.76690000000
+2,2049,R1,windturbine,2030,1.76690000000
+2,2050,R1,windturbine,2030,1.76690000000
+2,2054,R1,windturbine,2030,1.76690000000
+2,2055,R1,windturbine,2030,1.76690000000
+2,2059,R1,windturbine,2030,1.76690000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2035.csv
index a09a20c75..e9cb4c693 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2035.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2035.csv
@@ -1,28 +1,28 @@
 asset,year,region,technology,installed,capacity
-0,2035,R1,windturbine,2020,1.10000000000
-0,2040,R1,windturbine,2020,1.10000000000
-0,2045,R1,windturbine,2020,1.10000000000
-0,2049,R1,windturbine,2020,1.10000000000
-1,2035,R1,windturbine,2025,1.62110000000
-1,2040,R1,windturbine,2025,1.62110000000
-1,2045,R1,windturbine,2025,1.62110000000
-1,2049,R1,windturbine,2025,1.62110000000
-1,2050,R1,windturbine,2025,1.62110000000
-1,2054,R1,windturbine,2025,1.62110000000
-2,2035,R1,windturbine,2030,1.67320000000
-2,2040,R1,windturbine,2030,1.67320000000
-2,2045,R1,windturbine,2030,1.67320000000
-2,2049,R1,windturbine,2030,1.67320000000
-2,2050,R1,windturbine,2030,1.67320000000
-2,2054,R1,windturbine,2030,1.67320000000
-2,2055,R1,windturbine,2030,1.67320000000
-2,2059,R1,windturbine,2030,1.67320000000
-3,2040,R1,windturbine,2035,2.00700000000
-3,2045,R1,windturbine,2035,2.00700000000
-3,2049,R1,windturbine,2035,2.00700000000
-3,2050,R1,windturbine,2035,2.00700000000
-3,2054,R1,windturbine,2035,2.00700000000
-3,2055,R1,windturbine,2035,2.00700000000
-3,2059,R1,windturbine,2035,2.00700000000
-3,2060,R1,windturbine,2035,2.00700000000
-3,2064,R1,windturbine,2035,2.00700000000
+0,2035,R1,windturbine,2020,1.35560000000
+0,2040,R1,windturbine,2020,1.35560000000
+0,2045,R1,windturbine,2020,1.35560000000
+0,2049,R1,windturbine,2020,1.35560000000
+1,2035,R1,windturbine,2025,1.85040000000
+1,2040,R1,windturbine,2025,1.85040000000
+1,2045,R1,windturbine,2025,1.85040000000
+1,2049,R1,windturbine,2025,1.85040000000
+1,2050,R1,windturbine,2025,1.85040000000
+1,2054,R1,windturbine,2025,1.85040000000
+2,2035,R1,windturbine,2030,1.76690000000
+2,2040,R1,windturbine,2030,1.76690000000
+2,2045,R1,windturbine,2030,1.76690000000
+2,2049,R1,windturbine,2030,1.76690000000
+2,2050,R1,windturbine,2030,1.76690000000
+2,2054,R1,windturbine,2030,1.76690000000
+2,2055,R1,windturbine,2030,1.76690000000
+2,2059,R1,windturbine,2030,1.76690000000
+3,2040,R1,windturbine,2035,2.11470000000
+3,2045,R1,windturbine,2035,2.11470000000
+3,2049,R1,windturbine,2035,2.11470000000
+3,2050,R1,windturbine,2035,2.11470000000
+3,2054,R1,windturbine,2035,2.11470000000
+3,2055,R1,windturbine,2035,2.11470000000
+3,2059,R1,windturbine,2035,2.11470000000
+3,2060,R1,windturbine,2035,2.11470000000
+3,2064,R1,windturbine,2035,2.11470000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2040.csv
index 146d05f95..4aa4b7437 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2040.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2040.csv
@@ -1,35 +1,35 @@
 asset,year,region,technology,installed,capacity
-0,2040,R1,windturbine,2020,1.10000000000
-0,2045,R1,windturbine,2020,1.10000000000
-0,2049,R1,windturbine,2020,1.10000000000
-1,2040,R1,windturbine,2025,1.62110000000
-1,2045,R1,windturbine,2025,1.62110000000
-1,2049,R1,windturbine,2025,1.62110000000
-1,2050,R1,windturbine,2025,1.62110000000
-1,2054,R1,windturbine,2025,1.62110000000
-2,2040,R1,windturbine,2030,1.67320000000
-2,2045,R1,windturbine,2030,1.67320000000
-2,2049,R1,windturbine,2030,1.67320000000
-2,2050,R1,windturbine,2030,1.67320000000
-2,2054,R1,windturbine,2030,1.67320000000
-2,2055,R1,windturbine,2030,1.67320000000
-2,2059,R1,windturbine,2030,1.67320000000
-3,2040,R1,windturbine,2035,2.00700000000
-3,2045,R1,windturbine,2035,2.00700000000
-3,2049,R1,windturbine,2035,2.00700000000
-3,2050,R1,windturbine,2035,2.00700000000
-3,2054,R1,windturbine,2035,2.00700000000
-3,2055,R1,windturbine,2035,2.00700000000
-3,2059,R1,windturbine,2035,2.00700000000
-3,2060,R1,windturbine,2035,2.00700000000
-3,2064,R1,windturbine,2035,2.00700000000
-4,2045,R1,windturbine,2040,2.07250000000
-4,2049,R1,windturbine,2040,2.07250000000
-4,2050,R1,windturbine,2040,2.07250000000
-4,2054,R1,windturbine,2040,2.07250000000
-4,2055,R1,windturbine,2040,2.07250000000
-4,2059,R1,windturbine,2040,2.07250000000
-4,2060,R1,windturbine,2040,2.07250000000
-4,2064,R1,windturbine,2040,2.07250000000
-4,2065,R1,windturbine,2040,2.07250000000
-4,2069,R1,windturbine,2040,2.07250000000
+0,2040,R1,windturbine,2020,1.35560000000
+0,2045,R1,windturbine,2020,1.35560000000
+0,2049,R1,windturbine,2020,1.35560000000
+1,2040,R1,windturbine,2025,1.85040000000
+1,2045,R1,windturbine,2025,1.85040000000
+1,2049,R1,windturbine,2025,1.85040000000
+1,2050,R1,windturbine,2025,1.85040000000
+1,2054,R1,windturbine,2025,1.85040000000
+2,2040,R1,windturbine,2030,1.76690000000
+2,2045,R1,windturbine,2030,1.76690000000
+2,2049,R1,windturbine,2030,1.76690000000
+2,2050,R1,windturbine,2030,1.76690000000
+2,2054,R1,windturbine,2030,1.76690000000
+2,2055,R1,windturbine,2030,1.76690000000
+2,2059,R1,windturbine,2030,1.76690000000
+3,2040,R1,windturbine,2035,2.11470000000
+3,2045,R1,windturbine,2035,2.11470000000
+3,2049,R1,windturbine,2035,2.11470000000
+3,2050,R1,windturbine,2035,2.11470000000
+3,2054,R1,windturbine,2035,2.11470000000
+3,2055,R1,windturbine,2035,2.11470000000
+3,2059,R1,windturbine,2035,2.11470000000
+3,2060,R1,windturbine,2035,2.11470000000
+3,2064,R1,windturbine,2035,2.11470000000
+4,2045,R1,windturbine,2040,2.09140000000
+4,2049,R1,windturbine,2040,2.09140000000
+4,2050,R1,windturbine,2040,2.09140000000
+4,2054,R1,windturbine,2040,2.09140000000
+4,2055,R1,windturbine,2040,2.09140000000
+4,2059,R1,windturbine,2040,2.09140000000
+4,2060,R1,windturbine,2040,2.09140000000
+4,2064,R1,windturbine,2040,2.09140000000
+4,2065,R1,windturbine,2040,2.09140000000
+4,2069,R1,windturbine,2040,2.09140000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2045.csv
index b1c0a3b79..16a516dc0 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2045.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2045.csv
@@ -1,41 +1,41 @@
 asset,year,region,technology,installed,capacity
-0,2045,R1,windturbine,2020,1.10000000000
-0,2049,R1,windturbine,2020,1.10000000000
-1,2045,R1,windturbine,2025,1.62110000000
-1,2049,R1,windturbine,2025,1.62110000000
-1,2050,R1,windturbine,2025,1.62110000000
-1,2054,R1,windturbine,2025,1.62110000000
-2,2045,R1,windturbine,2030,1.67320000000
-2,2049,R1,windturbine,2030,1.67320000000
-2,2050,R1,windturbine,2030,1.67320000000
-2,2054,R1,windturbine,2030,1.67320000000
-2,2055,R1,windturbine,2030,1.67320000000
-2,2059,R1,windturbine,2030,1.67320000000
-3,2045,R1,windturbine,2035,2.00700000000
-3,2049,R1,windturbine,2035,2.00700000000
-3,2050,R1,windturbine,2035,2.00700000000
-3,2054,R1,windturbine,2035,2.00700000000
-3,2055,R1,windturbine,2035,2.00700000000
-3,2059,R1,windturbine,2035,2.00700000000
-3,2060,R1,windturbine,2035,2.00700000000
-3,2064,R1,windturbine,2035,2.00700000000
-4,2045,R1,windturbine,2040,2.07250000000
-4,2049,R1,windturbine,2040,2.07250000000
-4,2050,R1,windturbine,2040,2.07250000000
-4,2054,R1,windturbine,2040,2.07250000000
-4,2055,R1,windturbine,2040,2.07250000000
-4,2059,R1,windturbine,2040,2.07250000000
-4,2060,R1,windturbine,2040,2.07250000000
-4,2064,R1,windturbine,2040,2.07250000000
-4,2065,R1,windturbine,2040,2.07250000000
-4,2069,R1,windturbine,2040,2.07250000000
-5,2050,R1,windturbine,2045,2.37110000000
-5,2054,R1,windturbine,2045,2.37110000000
-5,2055,R1,windturbine,2045,2.37110000000
-5,2059,R1,windturbine,2045,2.37110000000
-5,2060,R1,windturbine,2045,2.37110000000
-5,2064,R1,windturbine,2045,2.37110000000
-5,2065,R1,windturbine,2045,2.37110000000
-5,2069,R1,windturbine,2045,2.37110000000
-5,2070,R1,windturbine,2045,2.37110000000
-5,2074,R1,windturbine,2045,2.37110000000
+0,2045,R1,windturbine,2020,1.35560000000
+0,2049,R1,windturbine,2020,1.35560000000
+1,2045,R1,windturbine,2025,1.85040000000
+1,2049,R1,windturbine,2025,1.85040000000
+1,2050,R1,windturbine,2025,1.85040000000
+1,2054,R1,windturbine,2025,1.85040000000
+2,2045,R1,windturbine,2030,1.76690000000
+2,2049,R1,windturbine,2030,1.76690000000
+2,2050,R1,windturbine,2030,1.76690000000
+2,2054,R1,windturbine,2030,1.76690000000
+2,2055,R1,windturbine,2030,1.76690000000
+2,2059,R1,windturbine,2030,1.76690000000
+3,2045,R1,windturbine,2035,2.11470000000
+3,2049,R1,windturbine,2035,2.11470000000
+3,2050,R1,windturbine,2035,2.11470000000
+3,2054,R1,windturbine,2035,2.11470000000
+3,2055,R1,windturbine,2035,2.11470000000
+3,2059,R1,windturbine,2035,2.11470000000
+3,2060,R1,windturbine,2035,2.11470000000
+3,2064,R1,windturbine,2035,2.11470000000
+4,2045,R1,windturbine,2040,2.09140000000
+4,2049,R1,windturbine,2040,2.09140000000
+4,2050,R1,windturbine,2040,2.09140000000
+4,2054,R1,windturbine,2040,2.09140000000
+4,2055,R1,windturbine,2040,2.09140000000
+4,2059,R1,windturbine,2040,2.09140000000
+4,2060,R1,windturbine,2040,2.09140000000
+4,2064,R1,windturbine,2040,2.09140000000
+4,2065,R1,windturbine,2040,2.09140000000
+4,2069,R1,windturbine,2040,2.09140000000
+5,2050,R1,windturbine,2045,2.44960000000
+5,2054,R1,windturbine,2045,2.44960000000
+5,2055,R1,windturbine,2045,2.44960000000
+5,2059,R1,windturbine,2045,2.44960000000
+5,2060,R1,windturbine,2045,2.44960000000
+5,2064,R1,windturbine,2045,2.44960000000
+5,2065,R1,windturbine,2045,2.44960000000
+5,2069,R1,windturbine,2045,2.44960000000
+5,2070,R1,windturbine,2045,2.44960000000
+5,2074,R1,windturbine,2045,2.44960000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2050.csv
index b69d9788c..bc4155595 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2050.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Capacity/2050.csv
@@ -1,41 +1,41 @@
-asset,year,region,installed,technology,capacity
-1,2050,R1,2025,windturbine,1.62110000000
-1,2054,R1,2025,windturbine,1.62110000000
-2,2050,R1,2030,windturbine,1.67320000000
-2,2054,R1,2030,windturbine,1.67320000000
-2,2055,R1,2030,windturbine,1.67320000000
-2,2059,R1,2030,windturbine,1.67320000000
-3,2050,R1,2035,windturbine,2.00700000000
-3,2054,R1,2035,windturbine,2.00700000000
-3,2055,R1,2035,windturbine,2.00700000000
-3,2059,R1,2035,windturbine,2.00700000000
-3,2060,R1,2035,windturbine,2.00700000000
-3,2064,R1,2035,windturbine,2.00700000000
-4,2050,R1,2040,windturbine,2.07250000000
-4,2054,R1,2040,windturbine,2.07250000000
-4,2055,R1,2040,windturbine,2.07250000000
-4,2059,R1,2040,windturbine,2.07250000000
-4,2060,R1,2040,windturbine,2.07250000000
-4,2064,R1,2040,windturbine,2.07250000000
-4,2065,R1,2040,windturbine,2.07250000000
-4,2069,R1,2040,windturbine,2.07250000000
-5,2050,R1,2045,windturbine,2.37110000000
-5,2054,R1,2045,windturbine,2.37110000000
-5,2055,R1,2045,windturbine,2.37110000000
-5,2059,R1,2045,windturbine,2.37110000000
-5,2060,R1,2045,windturbine,2.37110000000
-5,2064,R1,2045,windturbine,2.37110000000
-5,2065,R1,2045,windturbine,2.37110000000
-5,2069,R1,2045,windturbine,2.37110000000
-5,2070,R1,2045,windturbine,2.37110000000
-5,2074,R1,2045,windturbine,2.37110000000
-6,2055,R1,2050,windturbine,2.24610000000
-6,2059,R1,2050,windturbine,2.24610000000
-6,2060,R1,2050,windturbine,2.24610000000
-6,2064,R1,2050,windturbine,2.24610000000
-6,2065,R1,2050,windturbine,2.24610000000
-6,2069,R1,2050,windturbine,2.24610000000
-6,2070,R1,2050,windturbine,2.24610000000
-6,2074,R1,2050,windturbine,2.24610000000
-6,2075,R1,2050,windturbine,2.24610000000
-6,2079,R1,2050,windturbine,2.24610000000
+asset,year,region,technology,installed,capacity
+1,2050,R1,windturbine,2025,1.85040000000
+1,2054,R1,windturbine,2025,1.85040000000
+2,2050,R1,windturbine,2030,1.76690000000
+2,2054,R1,windturbine,2030,1.76690000000
+2,2055,R1,windturbine,2030,1.76690000000
+2,2059,R1,windturbine,2030,1.76690000000
+3,2050,R1,windturbine,2035,2.11470000000
+3,2054,R1,windturbine,2035,2.11470000000
+3,2055,R1,windturbine,2035,2.11470000000
+3,2059,R1,windturbine,2035,2.11470000000
+3,2060,R1,windturbine,2035,2.11470000000
+3,2064,R1,windturbine,2035,2.11470000000
+4,2050,R1,windturbine,2040,2.09140000000
+4,2054,R1,windturbine,2040,2.09140000000
+4,2055,R1,windturbine,2040,2.09140000000
+4,2059,R1,windturbine,2040,2.09140000000
+4,2060,R1,windturbine,2040,2.09140000000
+4,2064,R1,windturbine,2040,2.09140000000
+4,2065,R1,windturbine,2040,2.09140000000
+4,2069,R1,windturbine,2040,2.09140000000
+5,2050,R1,windturbine,2045,2.44960000000
+5,2054,R1,windturbine,2045,2.44960000000
+5,2055,R1,windturbine,2045,2.44960000000
+5,2059,R1,windturbine,2045,2.44960000000
+5,2060,R1,windturbine,2045,2.44960000000
+5,2064,R1,windturbine,2045,2.44960000000
+5,2065,R1,windturbine,2045,2.44960000000
+5,2069,R1,windturbine,2045,2.44960000000
+5,2070,R1,windturbine,2045,2.44960000000
+5,2074,R1,windturbine,2045,2.44960000000
+6,2055,R1,windturbine,2050,2.19620000000
+6,2059,R1,windturbine,2050,2.19620000000
+6,2060,R1,windturbine,2050,2.19620000000
+6,2064,R1,windturbine,2050,2.19620000000
+6,2065,R1,windturbine,2050,2.19620000000
+6,2069,R1,windturbine,2050,2.19620000000
+6,2070,R1,windturbine,2050,2.19620000000
+6,2074,R1,windturbine,2050,2.19620000000
+6,2075,R1,windturbine,2050,2.19620000000
+6,2079,R1,windturbine,2050,2.19620000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2020.csv
index cb7d1aae2..aa3821f8d 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2020.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2020.csv
@@ -1,29 +1,29 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,supply
-0,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,night,0.20000000000
-0,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,night,18.33400000000
-0,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,night,0.20000000000
-0,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,night,18.33400000000
-0,1,2025,electricity,R1,2020,windturbine,all-year,all-week,night,0.22220000000
-1,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,morning,0.40000000000
-1,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,morning,36.66800000000
-1,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,morning,0.40000000000
-1,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,morning,36.66800000000
-1,1,2025,electricity,R1,2020,windturbine,all-year,all-week,morning,0.23330000000
-2,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,afternoon,0.60000000000
-2,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,afternoon,55.00200000000
-2,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,afternoon,0.60000000000
-2,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,afternoon,55.00200000000
-3,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,early-peak,0.40000000000
-3,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,early-peak,36.66800000000
-3,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,early-peak,0.40000000000
-3,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,early-peak,36.66800000000
-3,1,2025,electricity,R1,2020,windturbine,all-year,all-week,early-peak,0.23330000000
-4,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,late-peak,0.80000000000
-4,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,late-peak,73.33600000000
-4,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,late-peak,0.80000000000
-4,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,late-peak,73.33600000000
-4,1,2025,electricity,R1,2020,windturbine,all-year,all-week,late-peak,0.46670000000
-5,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,evening,1.00000000000
-5,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,evening,91.67000000000
-5,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,evening,1.00000000000
-5,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,evening,91.67000000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2020,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.20000000000
+0,0,2020,CO2f,all-year,all-week,night,R1,gasCCGT,2020,18.33400000000
+0,0,2025,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.20000000000
+0,0,2025,CO2f,all-year,all-week,night,R1,gasCCGT,2020,18.33400000000
+0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,0.22220000000
+1,0,2020,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.40000000000
+1,0,2020,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,36.66800000000
+1,0,2025,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.40000000000
+1,0,2025,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,36.66800000000
+1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23330000000
+2,0,2020,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
+2,0,2020,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
+2,0,2025,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
+2,0,2025,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
+3,0,2020,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.40000000000
+3,0,2020,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,36.66800000000
+3,0,2025,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.40000000000
+3,0,2025,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,36.66800000000
+3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
+4,0,2020,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.80000000000
+4,0,2020,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,73.33600000000
+4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.80000000000
+4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,73.33600000000
+4,1,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
+5,0,2020,electricity,all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
+5,0,2020,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
+5,0,2025,electricity,all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
+5,0,2025,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2025.csv
index 8f130d01c..e841617ec 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2025.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2025.csv
@@ -1,29 +1,29 @@
-timeslice,asset,year,commodity,region,technology,installed,month,day,hour,supply
-0,0,2025,electricity,R1,gasCCGT,2020,all-year,all-week,night,0.20000000000
-0,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,night,18.33400000000
-0,1,2025,electricity,R1,windturbine,2020,all-year,all-week,night,0.22220000000
-0,1,2030,electricity,R1,windturbine,2020,all-year,all-week,night,0.23270000000
-0,2,2030,electricity,R1,windturbine,2025,all-year,all-week,night,0.34290000000
-1,0,2025,electricity,R1,gasCCGT,2020,all-year,all-week,morning,0.40000000000
-1,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,morning,36.66800000000
-1,1,2025,electricity,R1,windturbine,2020,all-year,all-week,morning,0.23330000000
-1,1,2030,electricity,R1,windturbine,2020,all-year,all-week,morning,0.34900000000
-1,2,2030,electricity,R1,windturbine,2025,all-year,all-week,morning,0.51430000000
-2,0,2025,electricity,R1,gasCCGT,2020,all-year,all-week,afternoon,0.60000000000
-2,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,afternoon,55.00200000000
-2,1,2030,electricity,R1,windturbine,2020,all-year,all-week,afternoon,0.23270000000
-2,2,2030,electricity,R1,windturbine,2025,all-year,all-week,afternoon,0.34290000000
-3,0,2025,electricity,R1,gasCCGT,2020,all-year,all-week,early-peak,0.40000000000
-3,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,early-peak,36.66800000000
-3,1,2025,electricity,R1,windturbine,2020,all-year,all-week,early-peak,0.23330000000
-3,1,2030,electricity,R1,windturbine,2020,all-year,all-week,early-peak,0.34900000000
-3,2,2030,electricity,R1,windturbine,2025,all-year,all-week,early-peak,0.51430000000
-4,0,2025,electricity,R1,gasCCGT,2020,all-year,all-week,late-peak,0.80000000000
-4,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,late-peak,73.33600000000
-4,1,2025,electricity,R1,windturbine,2020,all-year,all-week,late-peak,0.46670000000
-4,1,2030,electricity,R1,windturbine,2020,all-year,all-week,late-peak,0.69800000000
-4,2,2030,electricity,R1,windturbine,2025,all-year,all-week,late-peak,1.02870000000
-5,0,2025,electricity,R1,gasCCGT,2020,all-year,all-week,evening,1.00000000000
-5,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,evening,91.67000000000
-5,1,2030,electricity,R1,windturbine,2020,all-year,all-week,evening,0.46530000000
-5,2,2030,electricity,R1,windturbine,2025,all-year,all-week,evening,0.68580000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2025,electricity,all-year,all-week,night,R1,gasCCGT,2020,0.20000000000
+0,0,2025,CO2f,all-year,all-week,night,R1,gasCCGT,2020,18.33400000000
+0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,0.22220000000
+0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.24340000000
+0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33220000000
+1,0,2025,electricity,all-year,all-week,morning,R1,gasCCGT,2020,0.40000000000
+1,0,2025,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,36.66800000000
+1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23330000000
+1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.36500000000
+1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.49830000000
+2,0,2025,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,0.60000000000
+2,0,2025,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,55.00200000000
+2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.24340000000
+2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33220000000
+3,0,2025,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,0.40000000000
+3,0,2025,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,36.66800000000
+3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23330000000
+3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.36500000000
+3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.49830000000
+4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,0.80000000000
+4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,73.33600000000
+4,1,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46670000000
+4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.73010000000
+4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.99660000000
+5,0,2025,electricity,all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
+5,0,2025,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
+5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.48670000000
+5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.66440000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2030.csv
index 3c07d73d5..0480fdeed 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2030.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2030.csv
@@ -1,31 +1,31 @@
-timeslice,asset,year,commodity,region,technology,installed,month,day,hour,supply
-0,0,2030,electricity,R1,windturbine,2020,all-year,all-week,night,0.23270000000
-0,0,2035,electricity,R1,windturbine,2020,all-year,all-week,night,0.17750000000
-0,1,2030,electricity,R1,windturbine,2025,all-year,all-week,night,0.34290000000
-0,1,2035,electricity,R1,windturbine,2025,all-year,all-week,night,0.26150000000
-0,2,2035,electricity,R1,windturbine,2030,all-year,all-week,night,0.26990000000
-1,0,2030,electricity,R1,windturbine,2020,all-year,all-week,morning,0.34900000000
-1,0,2035,electricity,R1,windturbine,2020,all-year,all-week,morning,0.26620000000
-1,1,2030,electricity,R1,windturbine,2025,all-year,all-week,morning,0.51430000000
-1,1,2035,electricity,R1,windturbine,2025,all-year,all-week,morning,0.39230000000
-1,2,2035,electricity,R1,windturbine,2030,all-year,all-week,morning,0.40490000000
-2,0,2030,electricity,R1,windturbine,2020,all-year,all-week,afternoon,0.23270000000
-2,0,2035,electricity,R1,windturbine,2020,all-year,all-week,afternoon,0.17750000000
-2,1,2030,electricity,R1,windturbine,2025,all-year,all-week,afternoon,0.34290000000
-2,1,2035,electricity,R1,windturbine,2025,all-year,all-week,afternoon,0.26150000000
-2,2,2035,electricity,R1,windturbine,2030,all-year,all-week,afternoon,0.26990000000
-3,0,2030,electricity,R1,windturbine,2020,all-year,all-week,early-peak,0.34900000000
-3,0,2035,electricity,R1,windturbine,2020,all-year,all-week,early-peak,0.26620000000
-3,1,2030,electricity,R1,windturbine,2025,all-year,all-week,early-peak,0.51430000000
-3,1,2035,electricity,R1,windturbine,2025,all-year,all-week,early-peak,0.39230000000
-3,2,2035,electricity,R1,windturbine,2030,all-year,all-week,early-peak,0.40490000000
-4,0,2030,electricity,R1,windturbine,2020,all-year,all-week,late-peak,0.69800000000
-4,0,2035,electricity,R1,windturbine,2020,all-year,all-week,late-peak,0.53240000000
-4,1,2030,electricity,R1,windturbine,2025,all-year,all-week,late-peak,1.02870000000
-4,1,2035,electricity,R1,windturbine,2025,all-year,all-week,late-peak,0.78450000000
-4,2,2035,electricity,R1,windturbine,2030,all-year,all-week,late-peak,0.80980000000
-5,0,2030,electricity,R1,windturbine,2020,all-year,all-week,evening,0.46530000000
-5,0,2035,electricity,R1,windturbine,2020,all-year,all-week,evening,0.35490000000
-5,1,2030,electricity,R1,windturbine,2025,all-year,all-week,evening,0.68580000000
-5,1,2035,electricity,R1,windturbine,2025,all-year,all-week,evening,0.52300000000
-5,2,2035,electricity,R1,windturbine,2030,all-year,all-week,evening,0.53980000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2030,electricity,all-year,all-week,night,R1,windturbine,2020,0.24340000000
+0,0,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.19320000000
+0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2025,0.33220000000
+0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.26380000000
+0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.25190000000
+1,0,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,0.36500000000
+1,0,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.28990000000
+1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,0.49830000000
+1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.39570000000
+1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.37780000000
+2,0,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.24340000000
+2,0,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.19320000000
+2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.33220000000
+2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.26380000000
+2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.25190000000
+3,0,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.36500000000
+3,0,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.28990000000
+3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.49830000000
+3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.39570000000
+3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.37780000000
+4,0,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.73010000000
+4,0,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.57970000000
+4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.99660000000
+4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.79130000000
+4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.75560000000
+5,0,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,0.48670000000
+5,0,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.38650000000
+5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,0.66440000000
+5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.52750000000
+5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.50380000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2035.csv
index 5324d2559..8d7d43bd3 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2035.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2035.csv
@@ -1,43 +1,43 @@
-timeslice,asset,year,commodity,region,technology,installed,month,day,hour,supply
-0,0,2035,electricity,R1,windturbine,2020,all-year,all-week,night,0.17750000000
-0,0,2040,electricity,R1,windturbine,2020,all-year,all-week,night,0.15690000000
-0,1,2035,electricity,R1,windturbine,2025,all-year,all-week,night,0.26150000000
-0,1,2040,electricity,R1,windturbine,2025,all-year,all-week,night,0.23120000000
-0,2,2035,electricity,R1,windturbine,2030,all-year,all-week,night,0.26990000000
-0,2,2040,electricity,R1,windturbine,2030,all-year,all-week,night,0.23870000000
-0,3,2040,electricity,R1,windturbine,2035,all-year,all-week,night,0.28630000000
-1,0,2035,electricity,R1,windturbine,2020,all-year,all-week,morning,0.26620000000
-1,0,2040,electricity,R1,windturbine,2020,all-year,all-week,morning,0.23540000000
-1,1,2035,electricity,R1,windturbine,2025,all-year,all-week,morning,0.39230000000
-1,1,2040,electricity,R1,windturbine,2025,all-year,all-week,morning,0.34690000000
-1,2,2035,electricity,R1,windturbine,2030,all-year,all-week,morning,0.40490000000
-1,2,2040,electricity,R1,windturbine,2030,all-year,all-week,morning,0.35800000000
-1,3,2040,electricity,R1,windturbine,2035,all-year,all-week,morning,0.42940000000
-2,0,2035,electricity,R1,windturbine,2020,all-year,all-week,afternoon,0.17750000000
-2,0,2040,electricity,R1,windturbine,2020,all-year,all-week,afternoon,0.15690000000
-2,1,2035,electricity,R1,windturbine,2025,all-year,all-week,afternoon,0.26150000000
-2,1,2040,electricity,R1,windturbine,2025,all-year,all-week,afternoon,0.23120000000
-2,2,2035,electricity,R1,windturbine,2030,all-year,all-week,afternoon,0.26990000000
-2,2,2040,electricity,R1,windturbine,2030,all-year,all-week,afternoon,0.23870000000
-2,3,2040,electricity,R1,windturbine,2035,all-year,all-week,afternoon,0.28630000000
-3,0,2035,electricity,R1,windturbine,2020,all-year,all-week,early-peak,0.26620000000
-3,0,2040,electricity,R1,windturbine,2020,all-year,all-week,early-peak,0.23540000000
-3,1,2035,electricity,R1,windturbine,2025,all-year,all-week,early-peak,0.39230000000
-3,1,2040,electricity,R1,windturbine,2025,all-year,all-week,early-peak,0.34690000000
-3,2,2035,electricity,R1,windturbine,2030,all-year,all-week,early-peak,0.40490000000
-3,2,2040,electricity,R1,windturbine,2030,all-year,all-week,early-peak,0.35800000000
-3,3,2040,electricity,R1,windturbine,2035,all-year,all-week,early-peak,0.42940000000
-4,0,2035,electricity,R1,windturbine,2020,all-year,all-week,late-peak,0.53240000000
-4,0,2040,electricity,R1,windturbine,2020,all-year,all-week,late-peak,0.47070000000
-4,1,2035,electricity,R1,windturbine,2025,all-year,all-week,late-peak,0.78450000000
-4,1,2040,electricity,R1,windturbine,2025,all-year,all-week,late-peak,0.69370000000
-4,2,2035,electricity,R1,windturbine,2030,all-year,all-week,late-peak,0.80980000000
-4,2,2040,electricity,R1,windturbine,2030,all-year,all-week,late-peak,0.71600000000
-4,3,2040,electricity,R1,windturbine,2035,all-year,all-week,late-peak,0.85890000000
-5,0,2035,electricity,R1,windturbine,2020,all-year,all-week,evening,0.35490000000
-5,0,2040,electricity,R1,windturbine,2020,all-year,all-week,evening,0.31380000000
-5,1,2035,electricity,R1,windturbine,2025,all-year,all-week,evening,0.52300000000
-5,1,2040,electricity,R1,windturbine,2025,all-year,all-week,evening,0.46250000000
-5,2,2035,electricity,R1,windturbine,2030,all-year,all-week,evening,0.53980000000
-5,2,2040,electricity,R1,windturbine,2030,all-year,all-week,evening,0.47730000000
-5,3,2040,electricity,R1,windturbine,2035,all-year,all-week,evening,0.57260000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2035,electricity,all-year,all-week,night,R1,windturbine,2020,0.19320000000
+0,0,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.17460000000
+0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2025,0.26380000000
+0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.23840000000
+0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2030,0.25190000000
+0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.22760000000
+0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.27240000000
+1,0,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,0.28990000000
+1,0,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.26200000000
+1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,0.39570000000
+1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.35760000000
+1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,0.37780000000
+1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.34150000000
+1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40870000000
+2,0,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.19320000000
+2,0,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.17460000000
+2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.26380000000
+2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.23840000000
+2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.25190000000
+2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.22760000000
+2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.27240000000
+3,0,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.28990000000
+3,0,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.26200000000
+3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.39570000000
+3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.35760000000
+3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.37780000000
+3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.34150000000
+3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40870000000
+4,0,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.57970000000
+4,0,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.52390000000
+4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.79130000000
+4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.71520000000
+4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.75560000000
+4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.68290000000
+4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.81730000000
+5,0,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,0.38650000000
+5,0,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.34930000000
+5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,0.52750000000
+5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.47680000000
+5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,0.50380000000
+5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.45530000000
+5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.54490000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2040.csv
index f300181bf..cb0ec8b61 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2040.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2040.csv
@@ -1,55 +1,55 @@
-timeslice,asset,year,commodity,region,technology,installed,month,day,hour,supply
-0,0,2040,electricity,R1,windturbine,2020,all-year,all-week,night,0.15690000000
-0,0,2045,electricity,R1,windturbine,2020,all-year,all-week,night,0.13580000000
-0,1,2040,electricity,R1,windturbine,2025,all-year,all-week,night,0.23120000000
-0,1,2045,electricity,R1,windturbine,2025,all-year,all-week,night,0.20020000000
-0,2,2040,electricity,R1,windturbine,2030,all-year,all-week,night,0.23870000000
-0,2,2045,electricity,R1,windturbine,2030,all-year,all-week,night,0.20660000000
-0,3,2040,electricity,R1,windturbine,2035,all-year,all-week,night,0.28630000000
-0,3,2045,electricity,R1,windturbine,2035,all-year,all-week,night,0.24780000000
-0,4,2045,electricity,R1,windturbine,2040,all-year,all-week,night,0.25590000000
-1,0,2040,electricity,R1,windturbine,2020,all-year,all-week,morning,0.23540000000
-1,0,2045,electricity,R1,windturbine,2020,all-year,all-week,morning,0.20380000000
-1,1,2040,electricity,R1,windturbine,2025,all-year,all-week,morning,0.34690000000
-1,1,2045,electricity,R1,windturbine,2025,all-year,all-week,morning,0.30030000000
-1,2,2040,electricity,R1,windturbine,2030,all-year,all-week,morning,0.35800000000
-1,2,2045,electricity,R1,windturbine,2030,all-year,all-week,morning,0.30990000000
-1,3,2040,electricity,R1,windturbine,2035,all-year,all-week,morning,0.42940000000
-1,3,2045,electricity,R1,windturbine,2035,all-year,all-week,morning,0.37180000000
-1,4,2045,electricity,R1,windturbine,2040,all-year,all-week,morning,0.38390000000
-2,0,2040,electricity,R1,windturbine,2020,all-year,all-week,afternoon,0.15690000000
-2,0,2045,electricity,R1,windturbine,2020,all-year,all-week,afternoon,0.13580000000
-2,1,2040,electricity,R1,windturbine,2025,all-year,all-week,afternoon,0.23120000000
-2,1,2045,electricity,R1,windturbine,2025,all-year,all-week,afternoon,0.20020000000
-2,2,2040,electricity,R1,windturbine,2030,all-year,all-week,afternoon,0.23870000000
-2,2,2045,electricity,R1,windturbine,2030,all-year,all-week,afternoon,0.20660000000
-2,3,2040,electricity,R1,windturbine,2035,all-year,all-week,afternoon,0.28630000000
-2,3,2045,electricity,R1,windturbine,2035,all-year,all-week,afternoon,0.24780000000
-2,4,2045,electricity,R1,windturbine,2040,all-year,all-week,afternoon,0.25590000000
-3,0,2040,electricity,R1,windturbine,2020,all-year,all-week,early-peak,0.23540000000
-3,0,2045,electricity,R1,windturbine,2020,all-year,all-week,early-peak,0.20380000000
-3,1,2040,electricity,R1,windturbine,2025,all-year,all-week,early-peak,0.34690000000
-3,1,2045,electricity,R1,windturbine,2025,all-year,all-week,early-peak,0.30030000000
-3,2,2040,electricity,R1,windturbine,2030,all-year,all-week,early-peak,0.35800000000
-3,2,2045,electricity,R1,windturbine,2030,all-year,all-week,early-peak,0.30990000000
-3,3,2040,electricity,R1,windturbine,2035,all-year,all-week,early-peak,0.42940000000
-3,3,2045,electricity,R1,windturbine,2035,all-year,all-week,early-peak,0.37180000000
-3,4,2045,electricity,R1,windturbine,2040,all-year,all-week,early-peak,0.38390000000
-4,0,2040,electricity,R1,windturbine,2020,all-year,all-week,late-peak,0.47070000000
-4,0,2045,electricity,R1,windturbine,2020,all-year,all-week,late-peak,0.40750000000
-4,1,2040,electricity,R1,windturbine,2025,all-year,all-week,late-peak,0.69370000000
-4,1,2045,electricity,R1,windturbine,2025,all-year,all-week,late-peak,0.60060000000
-4,2,2040,electricity,R1,windturbine,2030,all-year,all-week,late-peak,0.71600000000
-4,2,2045,electricity,R1,windturbine,2030,all-year,all-week,late-peak,0.61990000000
-4,3,2040,electricity,R1,windturbine,2035,all-year,all-week,late-peak,0.85890000000
-4,3,2045,electricity,R1,windturbine,2035,all-year,all-week,late-peak,0.74350000000
-4,4,2045,electricity,R1,windturbine,2040,all-year,all-week,late-peak,0.76780000000
-5,0,2040,electricity,R1,windturbine,2020,all-year,all-week,evening,0.31380000000
-5,0,2045,electricity,R1,windturbine,2020,all-year,all-week,evening,0.27170000000
-5,1,2040,electricity,R1,windturbine,2025,all-year,all-week,evening,0.46250000000
-5,1,2045,electricity,R1,windturbine,2025,all-year,all-week,evening,0.40040000000
-5,2,2040,electricity,R1,windturbine,2030,all-year,all-week,evening,0.47730000000
-5,2,2045,electricity,R1,windturbine,2030,all-year,all-week,evening,0.41320000000
-5,3,2040,electricity,R1,windturbine,2035,all-year,all-week,evening,0.57260000000
-5,3,2045,electricity,R1,windturbine,2035,all-year,all-week,evening,0.49570000000
-5,4,2045,electricity,R1,windturbine,2040,all-year,all-week,evening,0.51190000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2040,electricity,all-year,all-week,night,R1,windturbine,2020,0.17460000000
+0,0,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.15450000000
+0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2025,0.23840000000
+0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.21100000000
+0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2030,0.22760000000
+0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.20140000000
+0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2035,0.27240000000
+0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.24110000000
+0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.23840000000
+1,0,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,0.26200000000
+1,0,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23180000000
+1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,0.35760000000
+1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.31640000000
+1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,0.34150000000
+1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.30220000000
+1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,0.40870000000
+1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.36160000000
+1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.35760000000
+2,0,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.17460000000
+2,0,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15450000000
+2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.23840000000
+2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.21100000000
+2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.22760000000
+2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.20140000000
+2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.27240000000
+2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24110000000
+2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.23840000000
+3,0,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.26200000000
+3,0,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23180000000
+3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.35760000000
+3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.31640000000
+3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.34150000000
+3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.30220000000
+3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.40870000000
+3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.36160000000
+3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.35760000000
+4,0,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.52390000000
+4,0,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46360000000
+4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.71520000000
+4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.63290000000
+4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.68290000000
+4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.60430000000
+4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.81730000000
+4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.72330000000
+4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.71530000000
+5,0,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,0.34930000000
+5,0,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.30910000000
+5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,0.47680000000
+5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.42190000000
+5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,0.45530000000
+5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.40290000000
+5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,0.54490000000
+5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.48220000000
+5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.47690000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2045.csv
index c42cbd4cb..4b2628f70 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2045.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2045.csv
@@ -1,61 +1,61 @@
-timeslice,asset,year,commodity,region,technology,installed,month,day,hour,supply
-0,0,2045,electricity,R1,windturbine,2020,all-year,all-week,night,0.13580000000
-0,1,2045,electricity,R1,windturbine,2025,all-year,all-week,night,0.20020000000
-0,1,2050,electricity,R1,windturbine,2025,all-year,all-week,night,0.19960000000
-0,2,2045,electricity,R1,windturbine,2030,all-year,all-week,night,0.20660000000
-0,2,2050,electricity,R1,windturbine,2030,all-year,all-week,night,0.20600000000
-0,3,2045,electricity,R1,windturbine,2035,all-year,all-week,night,0.24780000000
-0,3,2050,electricity,R1,windturbine,2035,all-year,all-week,night,0.24710000000
-0,4,2045,electricity,R1,windturbine,2040,all-year,all-week,night,0.25590000000
-0,4,2050,electricity,R1,windturbine,2040,all-year,all-week,night,0.25520000000
-0,5,2050,electricity,R1,windturbine,2045,all-year,all-week,night,0.29200000000
-1,0,2045,electricity,R1,windturbine,2020,all-year,all-week,morning,0.20380000000
-1,1,2045,electricity,R1,windturbine,2025,all-year,all-week,morning,0.30030000000
-1,1,2050,electricity,R1,windturbine,2025,all-year,all-week,morning,0.29940000000
-1,2,2045,electricity,R1,windturbine,2030,all-year,all-week,morning,0.30990000000
-1,2,2050,electricity,R1,windturbine,2030,all-year,all-week,morning,0.30910000000
-1,3,2045,electricity,R1,windturbine,2035,all-year,all-week,morning,0.37180000000
-1,3,2050,electricity,R1,windturbine,2035,all-year,all-week,morning,0.37070000000
-1,4,2045,electricity,R1,windturbine,2040,all-year,all-week,morning,0.38390000000
-1,4,2050,electricity,R1,windturbine,2040,all-year,all-week,morning,0.38280000000
-1,5,2050,electricity,R1,windturbine,2045,all-year,all-week,morning,0.43800000000
-2,0,2045,electricity,R1,windturbine,2020,all-year,all-week,afternoon,0.13580000000
-2,1,2045,electricity,R1,windturbine,2025,all-year,all-week,afternoon,0.20020000000
-2,1,2050,electricity,R1,windturbine,2025,all-year,all-week,afternoon,0.19960000000
-2,2,2045,electricity,R1,windturbine,2030,all-year,all-week,afternoon,0.20660000000
-2,2,2050,electricity,R1,windturbine,2030,all-year,all-week,afternoon,0.20600000000
-2,3,2045,electricity,R1,windturbine,2035,all-year,all-week,afternoon,0.24780000000
-2,3,2050,electricity,R1,windturbine,2035,all-year,all-week,afternoon,0.24710000000
-2,4,2045,electricity,R1,windturbine,2040,all-year,all-week,afternoon,0.25590000000
-2,4,2050,electricity,R1,windturbine,2040,all-year,all-week,afternoon,0.25520000000
-2,5,2050,electricity,R1,windturbine,2045,all-year,all-week,afternoon,0.29200000000
-3,0,2045,electricity,R1,windturbine,2020,all-year,all-week,early-peak,0.20380000000
-3,1,2045,electricity,R1,windturbine,2025,all-year,all-week,early-peak,0.30030000000
-3,1,2050,electricity,R1,windturbine,2025,all-year,all-week,early-peak,0.29940000000
-3,2,2045,electricity,R1,windturbine,2030,all-year,all-week,early-peak,0.30990000000
-3,2,2050,electricity,R1,windturbine,2030,all-year,all-week,early-peak,0.30910000000
-3,3,2045,electricity,R1,windturbine,2035,all-year,all-week,early-peak,0.37180000000
-3,3,2050,electricity,R1,windturbine,2035,all-year,all-week,early-peak,0.37070000000
-3,4,2045,electricity,R1,windturbine,2040,all-year,all-week,early-peak,0.38390000000
-3,4,2050,electricity,R1,windturbine,2040,all-year,all-week,early-peak,0.38280000000
-3,5,2050,electricity,R1,windturbine,2045,all-year,all-week,early-peak,0.43800000000
-4,0,2045,electricity,R1,windturbine,2020,all-year,all-week,late-peak,0.40750000000
-4,1,2045,electricity,R1,windturbine,2025,all-year,all-week,late-peak,0.60060000000
-4,1,2050,electricity,R1,windturbine,2025,all-year,all-week,late-peak,0.59890000000
-4,2,2045,electricity,R1,windturbine,2030,all-year,all-week,late-peak,0.61990000000
-4,2,2050,electricity,R1,windturbine,2030,all-year,all-week,late-peak,0.61810000000
-4,3,2045,electricity,R1,windturbine,2035,all-year,all-week,late-peak,0.74350000000
-4,3,2050,electricity,R1,windturbine,2035,all-year,all-week,late-peak,0.74140000000
-4,4,2045,electricity,R1,windturbine,2040,all-year,all-week,late-peak,0.76780000000
-4,4,2050,electricity,R1,windturbine,2040,all-year,all-week,late-peak,0.76560000000
-4,5,2050,electricity,R1,windturbine,2045,all-year,all-week,late-peak,0.87590000000
-5,0,2045,electricity,R1,windturbine,2020,all-year,all-week,evening,0.27170000000
-5,1,2045,electricity,R1,windturbine,2025,all-year,all-week,evening,0.40040000000
-5,1,2050,electricity,R1,windturbine,2025,all-year,all-week,evening,0.39920000000
-5,2,2045,electricity,R1,windturbine,2030,all-year,all-week,evening,0.41320000000
-5,2,2050,electricity,R1,windturbine,2030,all-year,all-week,evening,0.41210000000
-5,3,2045,electricity,R1,windturbine,2035,all-year,all-week,evening,0.49570000000
-5,3,2050,electricity,R1,windturbine,2035,all-year,all-week,evening,0.49430000000
-5,4,2045,electricity,R1,windturbine,2040,all-year,all-week,evening,0.51190000000
-5,4,2050,electricity,R1,windturbine,2040,all-year,all-week,evening,0.51040000000
-5,5,2050,electricity,R1,windturbine,2045,all-year,all-week,evening,0.58400000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2045,electricity,all-year,all-week,night,R1,windturbine,2020,0.15450000000
+0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2025,0.21100000000
+0,1,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.21610000000
+0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2030,0.20140000000
+0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.20640000000
+0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2035,0.24110000000
+0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.24700000000
+0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2040,0.23840000000
+0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.24430000000
+0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.28610000000
+1,0,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,0.23180000000
+1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,0.31640000000
+1,1,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.32420000000
+1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,0.30220000000
+1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.30960000000
+1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,0.36160000000
+1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.37050000000
+1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,0.35760000000
+1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.36640000000
+1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.42920000000
+2,0,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,0.15450000000
+2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.21100000000
+2,1,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.21610000000
+2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.20140000000
+2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.20640000000
+2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24110000000
+2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24700000000
+2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.23840000000
+2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.24430000000
+2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.28610000000
+3,0,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,0.23180000000
+3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.31640000000
+3,1,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.32420000000
+3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.30220000000
+3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.30960000000
+3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.36160000000
+3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.37050000000
+3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.35760000000
+3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.36640000000
+3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.42920000000
+4,0,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,0.46360000000
+4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.63290000000
+4,1,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.64840000000
+4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.60430000000
+4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.61920000000
+4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.72330000000
+4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.74110000000
+4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.71530000000
+4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.73290000000
+4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.85840000000
+5,0,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,0.30910000000
+5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,0.42190000000
+5,1,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.43230000000
+5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,0.40290000000
+5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.41280000000
+5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,0.48220000000
+5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.49400000000
+5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,0.47690000000
+5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.48860000000
+5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.57230000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2050.csv
index bd71ce591..05f580952 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2050.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Power/Supply/2050.csv
@@ -1,61 +1,61 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,supply
-0,1,2050,electricity,R1,2025,windturbine,all-year,all-week,night,0.19960000000
-0,2,2050,electricity,R1,2030,windturbine,all-year,all-week,night,0.20600000000
-0,2,2055,electricity,R1,2030,windturbine,all-year,all-week,night,0.19360000000
-0,3,2050,electricity,R1,2035,windturbine,all-year,all-week,night,0.24710000000
-0,3,2055,electricity,R1,2035,windturbine,all-year,all-week,night,0.23220000000
-0,4,2050,electricity,R1,2040,windturbine,all-year,all-week,night,0.25520000000
-0,4,2055,electricity,R1,2040,windturbine,all-year,all-week,night,0.23980000000
-0,5,2050,electricity,R1,2045,windturbine,all-year,all-week,night,0.29200000000
-0,5,2055,electricity,R1,2045,windturbine,all-year,all-week,night,0.27440000000
-0,6,2055,electricity,R1,2050,windturbine,all-year,all-week,night,0.25990000000
-1,1,2050,electricity,R1,2025,windturbine,all-year,all-week,morning,0.29940000000
-1,2,2050,electricity,R1,2030,windturbine,all-year,all-week,morning,0.30910000000
-1,2,2055,electricity,R1,2030,windturbine,all-year,all-week,morning,0.29040000000
-1,3,2050,electricity,R1,2035,windturbine,all-year,all-week,morning,0.37070000000
-1,3,2055,electricity,R1,2035,windturbine,all-year,all-week,morning,0.34840000000
-1,4,2050,electricity,R1,2040,windturbine,all-year,all-week,morning,0.38280000000
-1,4,2055,electricity,R1,2040,windturbine,all-year,all-week,morning,0.35970000000
-1,5,2050,electricity,R1,2045,windturbine,all-year,all-week,morning,0.43800000000
-1,5,2055,electricity,R1,2045,windturbine,all-year,all-week,morning,0.41160000000
-1,6,2055,electricity,R1,2050,windturbine,all-year,all-week,morning,0.38990000000
-2,1,2050,electricity,R1,2025,windturbine,all-year,all-week,afternoon,0.19960000000
-2,2,2050,electricity,R1,2030,windturbine,all-year,all-week,afternoon,0.20600000000
-2,2,2055,electricity,R1,2030,windturbine,all-year,all-week,afternoon,0.19360000000
-2,3,2050,electricity,R1,2035,windturbine,all-year,all-week,afternoon,0.24710000000
-2,3,2055,electricity,R1,2035,windturbine,all-year,all-week,afternoon,0.23220000000
-2,4,2050,electricity,R1,2040,windturbine,all-year,all-week,afternoon,0.25520000000
-2,4,2055,electricity,R1,2040,windturbine,all-year,all-week,afternoon,0.23980000000
-2,5,2050,electricity,R1,2045,windturbine,all-year,all-week,afternoon,0.29200000000
-2,5,2055,electricity,R1,2045,windturbine,all-year,all-week,afternoon,0.27440000000
-2,6,2055,electricity,R1,2050,windturbine,all-year,all-week,afternoon,0.25990000000
-3,1,2050,electricity,R1,2025,windturbine,all-year,all-week,early-peak,0.29940000000
-3,2,2050,electricity,R1,2030,windturbine,all-year,all-week,early-peak,0.30910000000
-3,2,2055,electricity,R1,2030,windturbine,all-year,all-week,early-peak,0.29040000000
-3,3,2050,electricity,R1,2035,windturbine,all-year,all-week,early-peak,0.37070000000
-3,3,2055,electricity,R1,2035,windturbine,all-year,all-week,early-peak,0.34840000000
-3,4,2050,electricity,R1,2040,windturbine,all-year,all-week,early-peak,0.38280000000
-3,4,2055,electricity,R1,2040,windturbine,all-year,all-week,early-peak,0.35970000000
-3,5,2050,electricity,R1,2045,windturbine,all-year,all-week,early-peak,0.43800000000
-3,5,2055,electricity,R1,2045,windturbine,all-year,all-week,early-peak,0.41160000000
-3,6,2055,electricity,R1,2050,windturbine,all-year,all-week,early-peak,0.38990000000
-4,1,2050,electricity,R1,2025,windturbine,all-year,all-week,late-peak,0.59890000000
-4,2,2050,electricity,R1,2030,windturbine,all-year,all-week,late-peak,0.61810000000
-4,2,2055,electricity,R1,2030,windturbine,all-year,all-week,late-peak,0.58090000000
-4,3,2050,electricity,R1,2035,windturbine,all-year,all-week,late-peak,0.74140000000
-4,3,2055,electricity,R1,2035,windturbine,all-year,all-week,late-peak,0.69670000000
-4,4,2050,electricity,R1,2040,windturbine,all-year,all-week,late-peak,0.76560000000
-4,4,2055,electricity,R1,2040,windturbine,all-year,all-week,late-peak,0.71950000000
-4,5,2050,electricity,R1,2045,windturbine,all-year,all-week,late-peak,0.87590000000
-4,5,2055,electricity,R1,2045,windturbine,all-year,all-week,late-peak,0.82310000000
-4,6,2055,electricity,R1,2050,windturbine,all-year,all-week,late-peak,0.77980000000
-5,1,2050,electricity,R1,2025,windturbine,all-year,all-week,evening,0.39920000000
-5,2,2050,electricity,R1,2030,windturbine,all-year,all-week,evening,0.41210000000
-5,2,2055,electricity,R1,2030,windturbine,all-year,all-week,evening,0.38720000000
-5,3,2050,electricity,R1,2035,windturbine,all-year,all-week,evening,0.49430000000
-5,3,2055,electricity,R1,2035,windturbine,all-year,all-week,evening,0.46450000000
-5,4,2050,electricity,R1,2040,windturbine,all-year,all-week,evening,0.51040000000
-5,4,2055,electricity,R1,2040,windturbine,all-year,all-week,evening,0.47970000000
-5,5,2050,electricity,R1,2045,windturbine,all-year,all-week,evening,0.58400000000
-5,5,2055,electricity,R1,2045,windturbine,all-year,all-week,evening,0.54880000000
-5,6,2055,electricity,R1,2050,windturbine,all-year,all-week,evening,0.51980000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,1,2050,electricity,all-year,all-week,night,R1,windturbine,2025,0.21610000000
+0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2030,0.20640000000
+0,2,2055,electricity,all-year,all-week,night,R1,windturbine,2030,0.19970000000
+0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2035,0.24700000000
+0,3,2055,electricity,all-year,all-week,night,R1,windturbine,2035,0.23900000000
+0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2040,0.24430000000
+0,4,2055,electricity,all-year,all-week,night,R1,windturbine,2040,0.23630000000
+0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2045,0.28610000000
+0,5,2055,electricity,all-year,all-week,night,R1,windturbine,2045,0.27680000000
+0,6,2055,electricity,all-year,all-week,night,R1,windturbine,2050,0.24820000000
+1,1,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,0.32420000000
+1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,0.30960000000
+1,2,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,0.29950000000
+1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,0.37050000000
+1,3,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,0.35850000000
+1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,0.36640000000
+1,4,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,0.35450000000
+1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,0.42920000000
+1,5,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,0.41520000000
+1,6,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,0.37230000000
+2,1,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,0.21610000000
+2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.20640000000
+2,2,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,0.19970000000
+2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.24700000000
+2,3,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,0.23900000000
+2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.24430000000
+2,4,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,0.23630000000
+2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.28610000000
+2,5,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,0.27680000000
+2,6,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,0.24820000000
+3,1,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,0.32420000000
+3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.30960000000
+3,2,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,0.29950000000
+3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.37050000000
+3,3,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,0.35850000000
+3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.36640000000
+3,4,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,0.35450000000
+3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.42920000000
+3,5,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,0.41520000000
+3,6,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,0.37230000000
+4,1,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,0.64840000000
+4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.61920000000
+4,2,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,0.59900000000
+4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.74110000000
+4,3,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,0.71690000000
+4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.73290000000
+4,4,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,0.70900000000
+4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.85840000000
+4,5,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,0.83050000000
+4,6,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,0.74460000000
+5,1,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,0.43230000000
+5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,0.41280000000
+5,2,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,0.39930000000
+5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,0.49400000000
+5,3,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,0.47800000000
+5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,0.48860000000
+5,4,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,0.47270000000
+5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,0.57230000000
+5,5,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,0.55360000000
+5,6,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,0.49640000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2050.csv
index 305b627b2..42f4be20c 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2050.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Capacity/2050.csv
@@ -1,11 +1,11 @@
-asset,year,region,installed,technology,capacity
-2,2050,R1,2040,heatpump,31.00000000000
-2,2054,R1,2040,heatpump,31.00000000000
-3,2050,R1,2045,heatpump,23.00000000000
-3,2054,R1,2045,heatpump,23.00000000000
-3,2055,R1,2045,heatpump,23.00000000000
-3,2059,R1,2045,heatpump,23.00000000000
-4,2055,R1,2050,heatpump,31.00000000000
-4,2059,R1,2050,heatpump,31.00000000000
-4,2060,R1,2050,heatpump,31.00000000000
-4,2064,R1,2050,heatpump,31.00000000000
+asset,year,region,technology,installed,capacity
+2,2050,R1,heatpump,2040,31.00000000000
+2,2054,R1,heatpump,2040,31.00000000000
+3,2050,R1,heatpump,2045,23.00000000000
+3,2054,R1,heatpump,2045,23.00000000000
+3,2055,R1,heatpump,2045,23.00000000000
+3,2059,R1,heatpump,2045,23.00000000000
+4,2055,R1,heatpump,2050,31.00000000000
+4,2059,R1,heatpump,2050,31.00000000000
+4,2060,R1,heatpump,2050,31.00000000000
+4,2064,R1,heatpump,2050,31.00000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2020.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2020.csv
index a44059a3e..7b8c4061d 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2020.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2020.csv
@@ -1,31 +1,31 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2020,0,R1,gasboiler,2020,all-year,all-week,night,1.00000000000
-0,heat,2025,0,R1,gasboiler,2020,all-year,all-week,night,0.27780000000
-0,heat,2025,1,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,night,64.71000000000
-0,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,night,17.97500000000
-1,heat,2020,0,R1,gasboiler,2020,all-year,all-week,morning,1.50000000000
-1,heat,2025,0,R1,gasboiler,2020,all-year,all-week,morning,0.41670000000
-1,heat,2025,1,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,morning,97.06500000000
-1,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,morning,26.96250000000
-2,heat,2020,0,R1,gasboiler,2020,all-year,all-week,afternoon,1.00000000000
-2,heat,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.27780000000
-2,heat,2025,1,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,afternoon,64.71000000000
-2,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,17.97500000000
-3,heat,2020,0,R1,gasboiler,2020,all-year,all-week,early-peak,1.50000000000
-3,heat,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.41670000000
-3,heat,2025,1,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,early-peak,97.06500000000
-3,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,26.96250000000
-4,heat,2020,0,R1,gasboiler,2020,all-year,all-week,late-peak,3.00000000000
-4,heat,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,0.83330000000
-4,heat,2025,1,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,late-peak,194.13000000000
-4,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,53.92500000000
-5,heat,2020,0,R1,gasboiler,2020,all-year,all-week,evening,2.00000000000
-5,heat,2025,0,R1,gasboiler,2020,all-year,all-week,evening,0.55560000000
-5,heat,2025,1,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,evening,129.42000000000
-5,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,evening,35.95000000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,1.00000000000
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,64.71000000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2025.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2025.csv
index c9ed8c00b..bfe116d0b 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2025.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2025.csv
@@ -1,43 +1,43 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2025,0,R1,gasboiler,2020,all-year,all-week,night,0.27780000000
-0,heat,2025,2,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,heat,2030,1,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2030,2,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,heat,2030,3,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,night,17.97500000000
-0,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-1,heat,2025,0,R1,gasboiler,2020,all-year,all-week,morning,0.41670000000
-1,heat,2025,2,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,heat,2030,1,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2030,2,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,heat,2030,3,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,morning,26.96250000000
-1,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-2,heat,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.27780000000
-2,heat,2025,2,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,heat,2030,1,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2030,2,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,heat,2030,3,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,17.97500000000
-2,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-3,heat,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.41670000000
-3,heat,2025,2,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,heat,2030,1,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2030,2,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,heat,2030,3,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,26.96250000000
-3,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-4,heat,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,0.83330000000
-4,heat,2025,2,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,heat,2030,1,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2030,2,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,heat,2030,3,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,53.92500000000
-4,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-5,heat,2025,0,R1,gasboiler,2020,all-year,all-week,evening,0.55560000000
-5,heat,2025,2,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,heat,2030,1,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2030,2,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,heat,2030,3,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,evening,35.95000000000
-5,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+0,heat,2025,2,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,3,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+1,heat,2025,2,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,3,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+2,heat,2025,2,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,3,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+3,heat,2025,2,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,3,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+4,heat,2025,2,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,3,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+5,heat,2025,2,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,3,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2030.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2030.csv
index 61ae11982..82873caab 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2030.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2030.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2030,0,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2030,1,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,heat,2030,2,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,heat,2035,0,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2035,2,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,heat,2035,3,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-0,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-1,heat,2030,0,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2030,1,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,heat,2030,2,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,heat,2035,0,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2035,2,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,heat,2035,3,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-1,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-2,heat,2030,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2030,1,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,heat,2030,2,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,heat,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2035,2,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,heat,2035,3,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-2,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-3,heat,2030,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2030,1,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,heat,2030,2,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,heat,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2035,2,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,heat,2035,3,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-3,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-4,heat,2030,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2030,1,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,heat,2030,2,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,heat,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2035,2,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,heat,2035,3,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-4,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-5,heat,2030,0,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2030,1,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,heat,2030,2,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,heat,2035,0,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2035,2,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,heat,2035,3,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
-5,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,CO2f,2030,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,CO2f,2030,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,CO2f,2030,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,CO2f,2030,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,CO2f,2030,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,CO2f,2030,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2035.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2035.csv
index 89e0bd4e1..741ea3c65 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2035.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2035.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2035,0,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2035,2,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,heat,2035,3,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,heat,2040,1,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2040,3,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,heat,2040,4,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-0,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-1,heat,2035,0,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2035,2,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,heat,2035,3,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,heat,2040,1,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2040,3,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,heat,2040,4,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-1,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-2,heat,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2035,2,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,heat,2035,3,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,heat,2040,1,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2040,3,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,heat,2040,4,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-2,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-3,heat,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2035,2,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,heat,2035,3,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,heat,2040,1,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2040,3,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,heat,2040,4,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-3,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-4,heat,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2035,2,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,heat,2035,3,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,heat,2040,1,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2040,3,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,heat,2040,4,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-4,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-5,heat,2035,0,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2035,2,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,heat,2035,3,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,heat,2040,1,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2040,3,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,heat,2040,4,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
-5,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,1,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+0,CO2f,2040,1,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,1,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+1,CO2f,2040,1,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,1,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+2,CO2f,2040,1,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,1,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+3,CO2f,2040,1,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,1,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+4,CO2f,2040,1,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,1,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
+5,CO2f,2040,1,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2040.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2040.csv
index 663e47a5a..c802f3409 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2040.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2040.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2040,0,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2040,1,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,heat,2040,2,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,heat,2045,0,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2045,2,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,heat,2045,3,R1,heatpump,2040,all-year,all-week,night,1.72220000000
-0,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-0,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-1,heat,2040,0,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2040,1,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,heat,2040,2,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,heat,2045,0,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2045,2,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,heat,2045,3,R1,heatpump,2040,all-year,all-week,morning,2.58330000000
-1,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-1,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-2,heat,2040,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2040,1,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,heat,2040,2,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,heat,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2045,2,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,heat,2045,3,R1,heatpump,2040,all-year,all-week,afternoon,1.72220000000
-2,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-2,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-3,heat,2040,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2040,1,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,heat,2040,2,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,heat,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2045,2,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,heat,2045,3,R1,heatpump,2040,all-year,all-week,early-peak,2.58330000000
-3,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-3,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-4,heat,2040,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2040,1,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,heat,2040,2,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,heat,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2045,2,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,heat,2045,3,R1,heatpump,2040,all-year,all-week,late-peak,5.16670000000
-4,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-4,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-5,heat,2040,0,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2040,1,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,heat,2040,2,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,heat,2045,0,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2045,2,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,heat,2045,3,R1,heatpump,2040,all-year,all-week,evening,3.44440000000
-5,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
-5,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2040,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2040,1,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,2,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,heat,2045,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2045,2,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,CO2f,2040,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+0,CO2f,2045,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+1,heat,2040,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2040,1,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,heat,2045,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2045,2,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,CO2f,2040,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+1,CO2f,2045,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+2,heat,2040,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2040,1,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,heat,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2045,2,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,CO2f,2040,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+2,CO2f,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+3,heat,2040,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2040,1,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,heat,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2045,2,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,CO2f,2040,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+3,CO2f,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+4,heat,2040,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2040,1,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,heat,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2045,2,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,CO2f,2040,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+4,CO2f,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+5,heat,2040,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2040,1,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,heat,2045,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2045,2,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,CO2f,2040,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
+5,CO2f,2045,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2045.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2045.csv
index 6e2884e67..c7be86b20 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2045.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2045.csv
@@ -1,37 +1,37 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2045,0,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2045,1,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,heat,2045,2,R1,heatpump,2040,all-year,all-week,night,1.72220000000
-0,heat,2050,2,R1,heatpump,2040,all-year,all-week,night,1.72220000000
-0,heat,2050,3,R1,heatpump,2045,all-year,all-week,night,1.27780000000
-0,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-1,heat,2045,0,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2045,1,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,heat,2045,2,R1,heatpump,2040,all-year,all-week,morning,2.58330000000
-1,heat,2050,2,R1,heatpump,2040,all-year,all-week,morning,2.58330000000
-1,heat,2050,3,R1,heatpump,2045,all-year,all-week,morning,1.91670000000
-1,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-2,heat,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2045,1,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,heat,2045,2,R1,heatpump,2040,all-year,all-week,afternoon,1.72220000000
-2,heat,2050,2,R1,heatpump,2040,all-year,all-week,afternoon,1.72220000000
-2,heat,2050,3,R1,heatpump,2045,all-year,all-week,afternoon,1.27780000000
-2,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-3,heat,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2045,1,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,heat,2045,2,R1,heatpump,2040,all-year,all-week,early-peak,2.58330000000
-3,heat,2050,2,R1,heatpump,2040,all-year,all-week,early-peak,2.58330000000
-3,heat,2050,3,R1,heatpump,2045,all-year,all-week,early-peak,1.91670000000
-3,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-4,heat,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2045,1,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,heat,2045,2,R1,heatpump,2040,all-year,all-week,late-peak,5.16670000000
-4,heat,2050,2,R1,heatpump,2040,all-year,all-week,late-peak,5.16670000000
-4,heat,2050,3,R1,heatpump,2045,all-year,all-week,late-peak,3.83330000000
-4,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-5,heat,2045,0,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2045,1,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,heat,2045,2,R1,heatpump,2040,all-year,all-week,evening,3.44440000000
-5,heat,2050,2,R1,heatpump,2040,all-year,all-week,evening,3.44440000000
-5,heat,2050,3,R1,heatpump,2045,all-year,all-week,evening,2.55560000000
-5,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2045,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2045,1,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,heat,2045,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,CO2f,2045,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+1,heat,2045,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2045,1,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,heat,2045,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,CO2f,2045,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+2,heat,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2045,1,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,heat,2045,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,CO2f,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+3,heat,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2045,1,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,heat,2045,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,CO2f,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+4,heat,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2045,1,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,heat,2045,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,CO2f,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+5,heat,2045,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2045,1,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,heat,2045,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,CO2f,2045,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2050.csv b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2050.csv
index 61004cae8..8c1871538 100644
--- a/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2050.csv
+++ b/docs/tutorial-code/7-min-max-timeslice-constraints/2-max-constraint/Results/Residential/Supply/2050.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,heat,2050,2,R1,2040,heatpump,all-year,all-week,night,1.72220000000
-0,heat,2050,3,R1,2045,heatpump,all-year,all-week,night,1.27780000000
-0,heat,2055,3,R1,2045,heatpump,all-year,all-week,night,1.27780000000
-0,heat,2055,4,R1,2050,heatpump,all-year,all-week,night,1.72220000000
-1,heat,2050,2,R1,2040,heatpump,all-year,all-week,morning,2.58330000000
-1,heat,2050,3,R1,2045,heatpump,all-year,all-week,morning,1.91670000000
-1,heat,2055,3,R1,2045,heatpump,all-year,all-week,morning,1.91670000000
-1,heat,2055,4,R1,2050,heatpump,all-year,all-week,morning,2.58330000000
-2,heat,2050,2,R1,2040,heatpump,all-year,all-week,afternoon,1.72220000000
-2,heat,2050,3,R1,2045,heatpump,all-year,all-week,afternoon,1.27780000000
-2,heat,2055,3,R1,2045,heatpump,all-year,all-week,afternoon,1.27780000000
-2,heat,2055,4,R1,2050,heatpump,all-year,all-week,afternoon,1.72220000000
-3,heat,2050,2,R1,2040,heatpump,all-year,all-week,early-peak,2.58330000000
-3,heat,2050,3,R1,2045,heatpump,all-year,all-week,early-peak,1.91670000000
-3,heat,2055,3,R1,2045,heatpump,all-year,all-week,early-peak,1.91670000000
-3,heat,2055,4,R1,2050,heatpump,all-year,all-week,early-peak,2.58330000000
-4,heat,2050,2,R1,2040,heatpump,all-year,all-week,late-peak,5.16670000000
-4,heat,2050,3,R1,2045,heatpump,all-year,all-week,late-peak,3.83330000000
-4,heat,2055,3,R1,2045,heatpump,all-year,all-week,late-peak,3.83330000000
-4,heat,2055,4,R1,2050,heatpump,all-year,all-week,late-peak,5.16670000000
-5,heat,2050,2,R1,2040,heatpump,all-year,all-week,evening,3.44440000000
-5,heat,2050,3,R1,2045,heatpump,all-year,all-week,evening,2.55560000000
-5,heat,2055,3,R1,2045,heatpump,all-year,all-week,evening,2.55560000000
-5,heat,2055,4,R1,2050,heatpump,all-year,all-week,evening,3.44440000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2050,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,4,R1,all-year,all-week,night,heatpump,2050,1.72220000000
+1,heat,2050,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,4,R1,all-year,all-week,morning,heatpump,2050,2.58330000000
+2,heat,2050,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,4,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
+3,heat,2050,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,4,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
+4,heat,2050,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,4,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
+5,heat,2050,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,4,R1,all-year,all-week,evening,heatpump,2050,3.44440000000
diff --git a/pyproject.toml b/pyproject.toml
index 53d9c3d19..9023d3064 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -8,25 +8,27 @@ name = "MUSE_OS"
 description = "Energy System Model"
 readme = "README.md"
 license = {file = "LICENSE"}
-requires-python = ">= 3.8, <3.10"
+requires-python = ">= 3.9, <3.13"
 keywords = ["energy", "modelling"]
 classifiers = [
     "Development Status :: 4 - Beta",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Intended Audience :: Science/Research",
     "Intended Audience :: Other Audience",
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)"
 ]
 dependencies = [
-    "numpy==1.23.0",
+    "numpy",
     "scipy",
-    "pandas<=1.3",
-    "xarray==2022.3.0",
+    "pandas",
+    "xarray",
     "bottleneck",
     "coloredlogs",
     "toml",
-    "xlrd==1.2.0",
+    "xlrd",
     "mypy-extensions",
     "pypubsub",
     "tomlkit"
@@ -88,8 +90,10 @@ addopts = "--doctest-modules -rfE -n auto --dist=loadscope"
 markers = [
     "sgidata: test that require legacy data",
     "legacy: test that require legacy modules",
-    "regression: a regression test",
-    "notebook: a test which consist in running a jupyter notebook"
+    "regression: a regression test, including examples and tutorials",
+    "notebook: a test which consist in running a jupyter notebook",
+    "example: a test which consist in running an example",
+    "tutorial: a test which consist in running a tutorial"
 ]
 
 [tool.mypy]
diff --git a/src/muse/agents/agent.py b/src/muse/agents/agent.py
index 9ac6cb4b7..c5b27d8e1 100644
--- a/src/muse/agents/agent.py
+++ b/src/muse/agents/agent.py
@@ -414,7 +414,10 @@ def next(
         if search is None:
             return None
 
-        search["demand"] = demand
+        if "timeslice" in search.dims:
+            search["demand"] = demand.drop_vars(["timeslice", "month", "day", "hour"])
+        else:
+            search["demand"] = demand
         not_assets = [u for u in search.demand.dims if u != "asset"]
         condtechs = (
             search.demand.sum(not_assets) > getattr(self, "tolerance", 1e-8)
diff --git a/src/muse/commodities.py b/src/muse/commodities.py
index 383b505cb..6ff27f597 100644
--- a/src/muse/commodities.py
+++ b/src/muse/commodities.py
@@ -40,6 +40,21 @@ class CommodityUsage(IntFlag):
     """Commodity which is a fuel for this or another sector."""
     # BYPRODUCT = auto()
 
+    @property
+    def name(self) -> Text:
+        """Hack to get the name of the flag consistently across python versions."""
+        return (
+            self._name_
+            if self._name_ is not None
+            else "|".join(
+                [
+                    com._name_
+                    for com in CommodityUsage
+                    if com in self and com != CommodityUsage.OTHER
+                ]
+            )
+        )
+
     @staticmethod
     def from_technologies(technologies: Dataset) -> DataArray:
         from numpy import array, bitwise_or
diff --git a/src/muse/constraints.py b/src/muse/constraints.py
index 6ac3c7255..67701269c 100644
--- a/src/muse/constraints.py
+++ b/src/muse/constraints.py
@@ -335,8 +335,8 @@ def max_capacity_expansion(
         index = pd.MultiIndex.from_arrays(
             [capacity[u].values for u in names], names=names
         )
-        capacity = capacity.drop_vars(names)
-        capacity["asset"] = index
+        mindex_coords = xr.Coordinates.from_pandas_multiindex(index, "asset")
+        capacity = capacity.drop_vars(names).assign_coords(mindex_coords)
         capacity = capacity.unstack("asset", fill_value=0).rename(
             technology=search_space.replacement.name
         )
@@ -629,6 +629,7 @@ def lp_costs(
     production = zeros_like(ts_costs * fouts)
     for dim in production.dims:
         if isinstance(production.get_index(dim), pd.MultiIndex):
+            production = production.drop_vars(["timeslice", "month", "day", "hour"])
             production[dim] = pd.Index(production.get_index(dim), tupleize_cols=False)
 
     return xr.Dataset(dict(capacity=costs, production=production))
@@ -695,6 +696,7 @@ def lp_constraint(constraint: Constraint, lpcosts: xr.Dataset) -> Constraint:
     constraint = constraint.copy(deep=False)
     for dim in constraint.dims:
         if isinstance(constraint.get_index(dim), pd.MultiIndex):
+            constraint = constraint.drop_vars(["timeslice", "month", "day", "hour"])
             constraint[dim] = pd.Index(constraint.get_index(dim), tupleize_cols=False)
     b = constraint.b.drop_vars(set(constraint.b.coords) - set(constraint.b.dims))
     b = b.rename({k: f"c({k})" for k in b.dims})
@@ -801,6 +803,9 @@ def lp_constraint_matrix(
          ... )
          >>> decision_dims = {f"d({x})" for x in lpcosts.production.dims}
          >>> assert set(result.dims) == decision_dims.union(constraint_dims)
+         >>> result = result.reset_index("d(timeslice)", drop=True).assign_coords(
+         ...        {"d(timeslice)": result["d(timeslice)"].values}
+         ... )
          >>> stacked = result.stack(d=sorted(decision_dims), c=sorted(constraint_dims))
          >>> assert stacked.shape[0] == stacked.shape[1]
          >>> assert stacked.values == approx(np.eye(stacked.shape[0]))
@@ -822,10 +827,14 @@ def lp_constraint_matrix(
     if expand == {"timeslice", "asset", "commodity"}:
         expand = ["asset", "timeslice", "commodity"]
 
-    result = result.expand_dims({f"d({k})": lpcosts[k] for k in expand})
+    result = result.expand_dims(
+        {f"d({k})": lpcosts[k].rename({k: f"d({k})"}).set_index() for k in expand}
+    )
     expand = set(b.dims) - set(constraint.dims) - set(lpcosts.dims)
 
-    result = result.expand_dims({f"c({k})": b[k] for k in expand})
+    result = result.expand_dims(
+        {f"c({k})": b[k].rename({k: f"c({k})"}).set_index() for k in expand}
+    )
 
     diag_dims = set(b.dims).intersection(lpcosts.dims)
 
@@ -848,8 +857,10 @@ def get_dimension(dim):
             )
             for k in diag_dims
         ]
-
-        result = result * reduce(xr.DataArray.__mul__, diagonal_submats)
+        reduced = reduce(xr.DataArray.__mul__, diagonal_submats)
+        if "d(timeslice)" in reduced.dims:
+            reduced = reduced.drop_vars("d(timeslice)")
+        result = result * reduced
 
     return result
 
diff --git a/src/muse/demand_matching.py b/src/muse/demand_matching.py
index c7fb4d1b8..270c2594a 100644
--- a/src/muse/demand_matching.py
+++ b/src/muse/demand_matching.py
@@ -48,6 +48,7 @@
 
 from typing import Optional, Set
 
+import pandas as pd
 from xarray import DataArray
 
 
@@ -247,7 +248,8 @@ def demand_matching(
 
     if len(multics) > 0:
         for k in multics:
-            ds.coords[k] = list(range(len(ds[k])))
+            ds = ds.drop_vars(["timeslice", "month", "day", "hour"])
+            ds[k] = pd.Index(constraint.get_index(k), tupleize_cols=False)
         result = demand_matching(  # type: ignore
             ds.demand, ds.cost, *(ds[f"constraint{i}"] for i in range(len(constraints)))
         )
diff --git a/src/muse/examples.py b/src/muse/examples.py
index 0253ed8ad..5db4e6c3c 100644
--- a/src/muse/examples.py
+++ b/src/muse/examples.py
@@ -192,8 +192,12 @@ def mca_market(model: Text = "default") -> xr.Dataset:
             .sel(region=settings.regions)
             .interp(year=settings.time_framework, method=settings.interpolation_mode)
         )
-        market["supply"] = zeros_like(market.exports)
-        market["consumption"] = zeros_like(market.exports)
+        market["supply"] = zeros_like(market.exports).drop_vars(
+            ["timeslice", "month", "day", "hour"]
+        )
+        market["consumption"] = zeros_like(market.exports).drop_vars(
+            ["timeslice", "month", "day", "hour"]
+        )
 
         return cast(xr.Dataset, market)
 
@@ -264,7 +268,7 @@ def matching_market(sector: Text, model: Text = "default") -> xr.Dataset:
                 {"asset", "dst_region"}.intersection(consump.dims)
             )
             + market.supply
-        )
+        ).drop_vars(["timeslice", "month", "day", "hour"])
     else:
         market["consumption"] = (
             consumption(loaded_sector.technologies, production).sum(
diff --git a/src/muse/filters.py b/src/muse/filters.py
index 536824bff..111d79c00 100644
--- a/src/muse/filters.py
+++ b/src/muse/filters.py
@@ -476,7 +476,10 @@ def initialize_from_assets(
     )
     if "asset" not in agent.assets.dims or len(agent.assets.asset) == 0:
         return replacement
-    assets = xr.ones_like(
-        reduce_assets(agent.assets.asset, coords=coords), dtype=bool
-    ).rename(technology="asset")
+
+    assets = (
+        xr.ones_like(reduce_assets(agent.assets.asset, coords=coords), dtype=bool)
+        .rename(technology="asset")
+        .set_index()
+    )
     return (assets * replacement).transpose("asset", "replacement")
diff --git a/src/muse/investments.py b/src/muse/investments.py
index f5f4bed26..41a85385b 100644
--- a/src/muse/investments.py
+++ b/src/muse/investments.py
@@ -317,7 +317,11 @@ def scipy_match_demand(
 
     from muse.constraints import ScipyAdapter
 
-    df_technologies = technologies.to_dataframe().reset_index()
+    df_technologies = (
+        technologies.to_dataframe()
+        .drop(["month", "day", "hour"], axis=1, errors="ignore")
+        .reset_index()
+    )
 
     if "timeslice" in costs.dims and timeslice_op is not None:
         costs = timeslice_op(costs)
diff --git a/src/muse/mca.py b/src/muse/mca.py
index bd64649e2..fde3735e6 100644
--- a/src/muse/mca.py
+++ b/src/muse/mca.py
@@ -64,8 +64,12 @@ def factory(cls, settings: Union[Text, Path, Mapping, Any]) -> MCA:
             ).sel(region=settings.regions)
         ).interp(year=settings.time_framework, method=settings.interpolation_mode)
 
-        market["supply"] = zeros_like(market.exports)
-        market["consumption"] = zeros_like(market.exports)
+        market["supply"] = zeros_like(market.exports).drop_vars(
+            ["timeslice", "month", "day", "hour"]
+        )
+        market["consumption"] = zeros_like(market.exports).drop_vars(
+            ["timeslice", "month", "day", "hour"]
+        )
 
         # We create the sectors
         sectors = []
@@ -462,7 +466,9 @@ def single_year_iteration(
     sectors = deepcopy(sectors)
     market = market.copy(deep=True)
     if "updated_prices" not in market.data_vars:
-        market["updated_prices"] = market.prices.copy()
+        market["updated_prices"] = market.prices.copy().drop_vars(
+            ["timeslice", "month", "day", "hour"]
+        )
 
     # eventually, the first market should be one that creates the initial demand
     for sector in sectors:
@@ -550,12 +556,16 @@ def find_equilibrium(
     else:
         included = ones(len(market.commodity), dtype=bool)
 
-    market["updated_prices"] = market.prices.copy()
+    market["updated_prices"] = market.prices.copy().drop_vars(
+        ["timeslice", "month", "day", "hour"]
+    )
     prior_market = market.copy(deep=True)
     converged = False
     equilibrium_sectors = sectors
     for i in range(maxiter):
-        market["prices"] = market.updated_prices
+        market["prices"] = market.updated_prices.drop_vars(
+            ["timeslice", "month", "day", "hour"]
+        )
         prior_market, market = market, prior_market
         market.consumption[:] = 0.0
         market.supply[:] = 0.0
@@ -579,7 +589,7 @@ def find_equilibrium(
             )
             market["prices"] = future_propagation(  # type: ignore
                 market["prices"], new_price
-            )
+            ).drop_vars(["timeslice", "month", "day", "hour"])
 
             break
 
@@ -596,7 +606,7 @@ def find_equilibrium(
             )
             market["prices"] = future_propagation(  # type: ignore
                 market["prices"], new_price
-            )
+            ).drop_vars(["timeslice", "month", "day", "hour"])
         if not equilibrium:
             equilibrium_reached = True
             converged = True
@@ -623,7 +633,7 @@ def find_equilibrium(
         )
         market["prices"] = future_propagation(  # type: ignore
             market["prices"], new_price
-        )
+        ).drop_vars(["timeslice", "month", "day", "hour"])
         getLogger(__name__).critical(msg)
 
     return FindEquilibriumResults(
diff --git a/src/muse/objectives.py b/src/muse/objectives.py
index d73dec4e1..cfc6d0605 100644
--- a/src/muse/objectives.py
+++ b/src/muse/objectives.py
@@ -140,7 +140,10 @@ def objectives(
     ) -> xr.Dataset:
         result = xr.Dataset(coords=search_space.coords)
         for name, objective in functions:
-            result[name] = objective(agent, demand, search_space, *args, **kwargs)
+            obj = objective(agent, demand, search_space, *args, **kwargs)
+            if "timeslice" in obj.dims and "timeslice" in result.dims:
+                obj = obj.drop_vars(["timeslice", "month", "day", "hour"])
+            result[name] = obj
         return result
 
     return objectives
diff --git a/src/muse/outputs/cache.py b/src/muse/outputs/cache.py
index 99e3bbe09..76d018e31 100644
--- a/src/muse/outputs/cache.py
+++ b/src/muse/outputs/cache.py
@@ -382,7 +382,7 @@ def _aggregate_cache(quantity: Text, data: List[xr.DataArray]) -> pd.DataFrame:
         pd.DataFrame: A Dataframe with the data aggregated.
     """
     data = [da.to_dataframe().reset_index() for da in data]
-    cols = list(
+    cols = sorted(
         set.intersection(
             *map(set, [[c for c in d.columns if c != quantity] for d in data])
         )
@@ -395,8 +395,9 @@ def check_col(colname: str) -> str:
 
     return reduce(
         lambda left, right: pd.DataFrame.merge(left, right, how="outer", on=cols)
-        .groupby(check_col, axis=1)
-        .last(),
+        .T.groupby(check_col)
+        .last()
+        .T,
         data,
     )
 
@@ -432,6 +433,7 @@ def consolidate_quantity(
     data = (
         data.groupby(group_cols)
         .sum()
+        .infer_objects()
         .fillna(0)
         .reset_index()
         .drop("asset", axis=1, errors="ignore")
diff --git a/src/muse/outputs/mca.py b/src/muse/outputs/mca.py
index 8f75b06aa..9424ea314 100644
--- a/src/muse/outputs/mca.py
+++ b/src/muse/outputs/mca.py
@@ -182,13 +182,23 @@ def prices(
     """Current MCA market prices."""
     from muse.outputs.sector import market_quantity
 
+    ts_coords = list(market.indexes["timeslice"].names)
     result = market_quantity(market.prices, **kwargs).to_dataframe()
     if drop_empty:
         result = result[result.prices != 0]
+
     if isinstance(keep_columns, Text):
-        result = result[[keep_columns]]
+        result = result[[*ts_coords, keep_columns]]
+
     elif keep_columns is not None and len(keep_columns) > 0:
-        result = result[[u for u in result.columns if u in keep_columns]]
+        result = result[ts_coords + [u for u in result.columns if u in keep_columns]]
+
+    # We assign back a timeslice column with the original coordinate names
+    # Each timeslice is a tuple of the original coordinates (month, day, hour)
+    index_names = result.index.names
+    result = result.reset_index()
+    result["timeslice"] = list(zip(*[result[name] for name in ts_coords]))
+    result = result.set_index(index_names, drop=True).drop(ts_coords, axis=1)
     return result
 
 
@@ -332,7 +342,7 @@ def __call__(
         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
+        return aggregate <= limits.assign_coords(timeslice=aggregate.timeslice)
 
 
 @register_output_quantity(name=["timeslice_supply"])
@@ -358,7 +368,9 @@ def sector_supply(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Da
             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
+            agent_market["consumption"] = (
+                agent_market.consumption * a.quantity
+            ).drop_vars(["timeslice", "month", "day", "hour"])
             included = [
                 i
                 for i in agent_market["commodity"].values
@@ -391,8 +403,11 @@ def sector_supply(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Da
             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 = a.drop(
+                    ["month", "day", "hour"], axis=1, errors="ignore"
+                ).reset_index()
                 b = b[b["supply"] != 0]
                 data_sector.append(b)
     if len(data_sector) > 0:
@@ -400,9 +415,13 @@ def sector_supply(sector: AbstractSector, market: xr.Dataset, **kwargs) -> pd.Da
 
     else:
         output = pd.DataFrame()
-    output = output.reset_index()
 
-    return output
+    # Combine timeslice columns into a single column, if present
+    if "hour" in output.columns:
+        output["timeslice"] = list(zip(output["month"], output["day"], output["hour"]))
+        output = output.drop(["month", "day", "hour"], axis=1)
+
+    return output.reset_index()
 
 
 @register_output_quantity(name=["yearly_supply"])
@@ -510,6 +529,7 @@ def capacity(agents):
             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]
@@ -551,6 +571,7 @@ def capacity(agents):
                 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]
@@ -592,7 +613,9 @@ def sector_consumption(
             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
+            agent_market["consumption"] = (
+                agent_market.consumption * a.quantity
+            ).drop_vars(["timeslice", "month", "day", "hour"])
             included = [
                 i
                 for i in agent_market["commodity"].values
@@ -627,8 +650,11 @@ def sector_consumption(
             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 = a.drop(
+                    ["month", "day", "hour"], axis=1, errors="ignore"
+                ).reset_index()
                 b = b[b["consumption"] != 0]
                 data_sector.append(b)
     if len(data_sector) > 0:
@@ -636,9 +662,13 @@ def sector_consumption(
 
     else:
         output = pd.DataFrame()
-    output = output.reset_index()
 
-    return output
+    # Combine timeslice columns into a single column, if present
+    if "hour" in output.columns:
+        output["timeslice"] = list(zip(output["month"], output["day"], output["hour"]))
+        output = output.drop(["month", "day", "hour"], axis=1)
+
+    return output.reset_index()
 
 
 @register_output_quantity(name=["yearly_consumption"])
@@ -699,6 +729,7 @@ def sectory_consumption(
             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]
diff --git a/src/muse/outputs/sector.py b/src/muse/outputs/sector.py
index d6a308483..bf69de166 100644
--- a/src/muse/outputs/sector.py
+++ b/src/muse/outputs/sector.py
@@ -165,7 +165,9 @@ def market_quantity(
         sum_over = [s for s in sum_over if s in quantity.coords]
     if sum_over:
         quantity = quantity.sum(sum_over)
-    if "timeslice" in quantity.dims and isinstance(quantity.timeslice, MultiIndex):
+    if "timeslice" in quantity.coords and isinstance(
+        quantity.indexes["timeslice"], MultiIndex
+    ):
         quantity = multiindex_to_coords(quantity, "timeslice")
     if drop:
         quantity = quantity.drop_vars([d for d in drop if d in quantity.coords])
diff --git a/src/muse/readers/csv.py b/src/muse/readers/csv.py
index a7bc5ba71..44af8d966 100644
--- a/src/muse/readers/csv.py
+++ b/src/muse/readers/csv.py
@@ -17,7 +17,7 @@
 ]
 
 from pathlib import Path
-from typing import Hashable, List, Optional, Sequence, Text, Union, cast
+from typing import List, Optional, Sequence, Text, Union, cast
 
 import numpy as np
 import pandas as pd
@@ -27,6 +27,21 @@
 from muse.errors import UnitsConflictInCommodities
 
 
+def to_numeric(x):
+    """Converts a value to numeric if possible.
+
+    Args:
+        x: The value to convert.
+
+    Returns:
+        The value converted to numeric if possible, otherwise the original value.
+    """
+    try:
+        return pd.to_numeric(x)
+    except ValueError:
+        return x
+
+
 def find_sectors_file(
     filename: Union[Text, Path],
     sector: Optional[Text] = None,
@@ -83,7 +98,7 @@ def to_agent_share(name):
     data.index.name = "technology"
     data = data.drop(["process_name", "region_name", "time"], axis=1)
 
-    data = data.apply(lambda x: pd.to_numeric(x, errors="ignore"), axis=0)
+    data = data.apply(to_numeric, axis=0)
 
     result = xr.Dataset.from_dataframe(data.sort_index())
     if "fuel" in result.variables:
@@ -128,7 +143,7 @@ def read_technodata_timeslices(filename: Union[Text, Path]) -> xr.Dataset:
     )
     data = csv[csv.technology != "Unit"]
 
-    data = data.apply(lambda x: pd.to_numeric(x, errors="ignore"))
+    data = data.apply(to_numeric)
     data = check_utilization_not_all_zero(data, filename)
 
     ts = pd.MultiIndex.from_frame(
@@ -160,8 +175,6 @@ def read_io_technodata(filename: Union[Text, Path]) -> xr.Dataset:
 
     There are four axes: (technology, region, year, commodity)
     """
-    from functools import partial
-
     from muse.readers import camel_to_snake
 
     csv = pd.read_csv(filename, float_precision="high", low_memory=False)
@@ -180,7 +193,7 @@ def read_io_technodata(filename: Union[Text, Path]) -> xr.Dataset:
     data.columns.name = "commodity"
     data.index.name = "technology"
     data = data.rename(columns=camel_to_snake)
-    data = data.apply(partial(pd.to_numeric, errors="ignore"), axis=0)
+    data = data.apply(to_numeric, axis=0)
 
     fixed_set = xr.Dataset.from_dataframe(data[data.level == "fixed"]).drop_vars(
         "level"
@@ -489,7 +502,6 @@ def read_timeslice_shares(
         result = result.drop_vars("timeslice")
     elif isinstance(timeslice, xr.DataArray) and hasattr(timeslice, "timeslice"):
         result["timeslice"] = timeslice.timeslice
-        result[cast(Hashable, timeslice.name)] = timeslice
     else:
         result["timeslice"] = timeslice
     return result.shares
@@ -658,7 +670,9 @@ def read_initial_market(
     result = result.rename(
         commodity_price="prices", units_commodity_price="units_prices"
     )
-    result["prices"] = result["prices"].expand_dims({"timeslice": timeslices})
+    result["prices"] = (
+        result["prices"].expand_dims({"timeslice": timeslices}).drop_vars("timeslice")
+    )
 
     return result
 
@@ -827,8 +841,6 @@ def read_trade(
     drop: Optional[Union[Text, Sequence[Text]]] = None,
 ) -> Union[xr.DataArray, xr.Dataset]:
     """Read CSV table with source and destination regions."""
-    from functools import partial
-
     from muse.readers import camel_to_snake
 
     if not isinstance(data, pd.DataFrame):
@@ -842,7 +854,7 @@ def read_trade(
     else:
         row_region = "src_region"
         col_region = "dst_region"
-    data = data.apply(partial(pd.to_numeric, errors="ignore"), axis=0)
+    data = data.apply(to_numeric, axis=0)
     if isinstance(drop, Text):
         drop = [drop]
     if drop:
diff --git a/src/muse/readers/toml.py b/src/muse/readers/toml.py
index 0ea713f3e..f05d47881 100644
--- a/src/muse/readers/toml.py
+++ b/src/muse/readers/toml.py
@@ -539,17 +539,14 @@ def read_timeslices(
         >>> from muse.readers.toml import read_timeslices
         >>> ref = reference_timeslice(toml)
         >>> transforms = aggregate_transforms(toml, ref)
-        >>> read_timeslices(toml, ref, transforms)
-        <xarray.Dataset>
-        Dimensions:          (timeslice: 6)
-        Coordinates:
-          * timeslice        (timeslice) MultiIndex
-          - semester         (timeslice) object 'summer' 'summer' ... 'winter'
-          - week             (timeslice) object 'weekday' 'weekend' ... 'weekend'
-          - day              (timeslice) object 'allday' 'dusk' ... 'dusk' 'allday'
-            represent_hours  (timeslice) ... 10 1 4 10 1 4
-        Data variables:
-            *empty*
+        >>> ts = read_timeslices(toml, ref, transforms)
+        >>> assert "semester" in ts.coords
+        >>> assert "week" in ts.coords
+        >>> assert "day" in ts.coords
+        >>> assert "represent_hours" in ts.coords
+        >>> assert set(ts.coords["day"].data) == {"dusk", "allday"}
+        >>> assert set(ts.coords["week"].data) == {"weekday", "weekend"}
+        >>> assert set(ts.coords["semester"].data) == {"summer", "winter"}
     '''
     from muse.timeslices import TIMESLICE, timeslice_projector
 
diff --git a/src/muse/sectors/preset_sector.py b/src/muse/sectors/preset_sector.py
index b1f1fddbd..67327c5d0 100644
--- a/src/muse/sectors/preset_sector.py
+++ b/src/muse/sectors/preset_sector.py
@@ -35,13 +35,12 @@ def factory(cls, name: Text, settings: Any) -> PresetSector:
         sector_conf = getattr(settings.sectors, name)
         presets = Dataset()
 
-        presets["timeslice"] = read_timeslices(
+        timeslice = read_timeslices(
             getattr(sector_conf, "timeslice_levels", None)
         ).timeslice
         if getattr(sector_conf, "consumption_path", None) is not None:
             consumption = read_csv_outputs(sector_conf.consumption_path)
-            consumption.coords["timeslice"] = presets.timeslice
-            presets["consumption"] = consumption
+            presets["consumption"] = consumption.assign_coords(timeslice=timeslice)
         elif getattr(sector_conf, "demand_path", None) is not None:
             presets["consumption"] = read_attribute_table(sector_conf.demand_path)
         elif (
@@ -70,17 +69,23 @@ def factory(cls, name: Text, settings: Any) -> PresetSector:
                 consumption = consumption.sum("sector")
 
             if getattr(sector_conf, "timeslice_shares_path", None) is not None:
-                timeslice = presets["timeslice"]
                 assert isinstance(timeslice, DataArray)
                 shares = read_timeslice_shares(
                     sector_conf.timeslice_shares_path, timeslice=timeslice
                 )
                 assert consumption.commodity.isin(shares.commodity).all()
                 assert consumption.region.isin(shares.region).all()
-                consumption = consumption * shares.sel(
-                    region=consumption.region, commodity=consumption.commodity
-                )
-            presets["consumption"] = consumption
+                if "timeslice" in shares.dims:
+                    ts = shares.timeslice
+                    shares = shares.drop_vars(["timeslice", "month", "day", "hour"])
+                    consumption = (shares * consumption).assign_coords(timeslice=ts)
+                else:
+                    consumption = consumption * shares.sel(
+                        region=consumption.region, commodity=consumption.commodity
+                    )
+            presets["consumption"] = consumption.drop_vars(
+                ["timeslice", "month", "day", "hour"]
+            ).assign_coords(timeslice=timeslice)
 
         if getattr(sector_conf, "supply_path", None) is not None:
             supply = read_csv_outputs(sector_conf.supply_path)
@@ -110,7 +115,9 @@ def factory(cls, name: Text, settings: Any) -> PresetSector:
         for component in components:
             others = components.intersection(presets.data_vars).difference({component})
             if component not in presets and len(others) > 0:
-                presets[component] = zeros_like(presets[others.pop()])
+                presets[component] = zeros_like(presets[others.pop()]).drop_vars(
+                    ["timeslice", "month", "day", "hour"]
+                )
         # add timeslice, if missing
         for component in {"supply", "consumption"}:
             if "timeslice" not in presets[component].dims:
@@ -161,7 +168,7 @@ def next(self, mca_market: Dataset) -> Dataset:
         )
         result["costs"] = convert_timeslice(
             costs, mca_market.timeslice, QuantityType.INTENSIVE
-        )
+        ).drop_vars(["timeslice", "month", "day", "hour"])
         assert isinstance(result, Dataset)
         return result
 
diff --git a/src/muse/sectors/subsector.py b/src/muse/sectors/subsector.py
index dd088e044..4c8f221fe 100644
--- a/src/muse/sectors/subsector.py
+++ b/src/muse/sectors/subsector.py
@@ -66,7 +66,7 @@ def invest(
             market = market.copy()
             market["prices"] = np.maximum(
                 market.prices, market.prices.rename(region="dst_region")
-            )
+            ).drop_vars(["timeslice", "month", "day", "hour"])
 
         for agent in self.agents:
             agent.asset_housekeeping()
diff --git a/src/muse/timeslices.py b/src/muse/timeslices.py
index 74eba786a..0255a6a83 100644
--- a/src/muse/timeslices.py
+++ b/src/muse/timeslices.py
@@ -12,6 +12,7 @@
 from enum import Enum, unique
 from typing import Dict, Mapping, Optional, Sequence, Text, Tuple, Union
 
+import xarray as xr
 from numpy import ndarray
 from pandas import MultiIndex
 from xarray import DataArray, Dataset
@@ -103,13 +104,13 @@ def reference_timeslice(
         ...     summer.weekend = 2
         ...     level_names = ["season", "week"]
         ...     """
-        ... )
-        <xarray.DataArray (timeslice: 8)>
+        ... )  # doctest: +SKIP
+        <xarray.DataArray (timeslice: 8)> Size: 32B
         array([5, 2, 5, 2, 5, 2, 5, 2])
         Coordinates:
-          * timeslice  (timeslice) MultiIndex
-          - season     (timeslice) object 'spring' 'spring' ... 'summer' 'summer'
-          - week       (timeslice) object 'weekday' 'weekend' ... 'weekday' 'weekend'
+          * timeslice  (timeslice) object 64B MultiIndex
+          * season     (timeslice) object 64B 'spring' 'spring' ... 'summer' 'summer'
+          * week       (timeslice) object 64B 'weekday' 'weekend' ... 'weekend'
     '''
     from functools import reduce
     from typing import List, Tuple
@@ -293,22 +294,22 @@ def timeslice_projector(
         ...     },
         ...     dims="timeslice"
         ... )
-        >>> input_ts
-        <xarray.DataArray (timeslice: 3)>
+        >>> input_ts  # doctest: +SKIP
+        <xarray.DataArray (timeslice: 3)> Size: 12B
         array([1, 2, 3])
         Coordinates:
-          * timeslice  (timeslice) MultiIndex
-          - semester   (timeslice) object 'winter' 'winter' 'summer'
-          - week       (timeslice) object 'weekday' 'weekend' 'weekend'
-          - day        (timeslice) object 'allday' 'dusk' 'night'
+          * timeslice  (timeslice) object 24B MultiIndex
+          * semester   (timeslice) object 24B 'winter' 'winter' 'summer'
+          * week       (timeslice) object 24B 'weekday' 'weekend' 'weekend'
+          * day        (timeslice) object 24B 'allday' 'dusk' 'night'
 
         The input timeslice does not have to be complete. In any case, we can now
         compute a transform, i.e. a matrix that will take this timeslice and transform
         it to the equivalent times in the finest timeslice:
 
         >>> from muse.timeslices import timeslice_projector
-        >>> timeslice_projector(input_ts, ref, transforms)
-        <xarray.DataArray 'projector' (finest_timeslice: 10, timeslice: 3)>
+        >>> timeslice_projector(input_ts, ref, transforms)  # doctest: +SKIP
+        <xarray.DataArray 'projector' (finest_timeslice: 10, timeslice: 3)> Size: 120B
         array([[1, 0, 0],
                [1, 0, 0],
                [0, 0, 0],
@@ -320,27 +321,27 @@ def timeslice_projector(
                [0, 0, 1],
                [0, 0, 0]])
         Coordinates:
-          * finest_timeslice  (finest_timeslice) MultiIndex
-          - finest_semester   (finest_timeslice) object 'winter' 'winter' ... 'summer'
-          - finest_week       (finest_timeslice) object 'weekday' ... 'weekend'
-          - finest_day        (finest_timeslice) object 'day' 'night' ... 'night' 'dusk'
-          * timeslice         (timeslice) MultiIndex
-          - semester          (timeslice) object 'winter' 'winter' 'summer'
-          - week              (timeslice) object 'weekday' 'weekend' 'weekend'
-          - day               (timeslice) object 'allday' 'dusk' 'night'
+          * finest_timeslice  (finest_timeslice) object 80B MultiIndex
+          * finest_semester   (finest_timeslice) object 80B 'winter' ... 'summer'
+          * finest_week       (finest_timeslice) object 80B 'weekday' ... 'weekend'
+          * finest_day        (finest_timeslice) object 80B 'day' 'night' ... 'dusk'
+          * timeslice         (timeslice) object 24B MultiIndex
+          * semester          (timeslice) object 24B 'winter' 'winter' 'summer'
+          * week              (timeslice) object 24B 'weekday' 'weekend' 'weekend'
+          * day               (timeslice) object 24B 'allday' 'dusk' 'night'
 
         It is possible to give as input an array which does not have a timeslice of its
         own:
 
         >>> nots = DataArray([5.0, 1.0, 2.0], dims="a", coords={'a': [1, 2, 3]})
-        >>> timeslice_projector(nots, ref, transforms).T
-        <xarray.DataArray (timeslice: 1, finest_timeslice: 10)>
+        >>> timeslice_projector(nots, ref, transforms).T  # doctest: +SKIP
+        <xarray.DataArray (timeslice: 1, finest_timeslice: 10)> Size: 40B
         array([[1, 1, 1, 1, 1, 1, 1, 1, 1, 1]])
         Coordinates:
-          * finest_timeslice  (finest_timeslice) MultiIndex
-          - finest_semester   (finest_timeslice) object 'winter' 'winter' ... 'summer'
-          - finest_week       (finest_timeslice) object 'weekday' ... 'weekend'
-          - finest_day        (finest_timeslice) object 'day' 'night' ... 'night' 'dusk'
+          * finest_timeslice  (finest_timeslice) object 80B MultiIndex
+          * finest_semester   (finest_timeslice) object 80B 'winter' ... 'summer'
+          * finest_week       (finest_timeslice) object 80B 'weekday' ... 'weekend'
+          * finest_day        (finest_timeslice) object 80B 'day' 'night' ... 'dusk'
         Dimensions without coordinates: timeslice
     '''
     from numpy import concatenate, ones_like
@@ -450,7 +451,7 @@ def convert_timeslice(
         >>> from muse.timeslices import convert_timeslice, QuantityType
         >>> z = convert_timeslice(x, finest_ts, QuantityType.EXTENSIVE)
         >>> z.round(6)
-        <xarray.DataArray (timeslice: 8, a: 3)>
+        <xarray.DataArray (timeslice: 8, a: 3)> Size: 192B
         array([[0.892857, 0.357143, 0.535714],
                [0.892857, 0.357143, 0.535714],
                [0.357143, 0.142857, 0.214286],
@@ -460,16 +461,16 @@ def convert_timeslice(
                [0.357143, 0.142857, 0.214286],
                [0.357143, 0.142857, 0.214286]])
         Coordinates:
-          * timeslice  (timeslice) MultiIndex
-          - semester   (timeslice) object 'winter' 'winter' ... 'summer' 'summer'
-          - week       (timeslice) object 'weekday' 'weekday' ... 'weekend' 'weekend'
-          - day        (timeslice) object 'day' 'night' 'day' ... 'night' 'day' 'night'
-          * a          (a) int64 1 2 3
+          * timeslice  (timeslice) object 64B MultiIndex
+          * semester   (timeslice) object 64B 'winter' 'winter' ... 'summer' 'summer'
+          * week       (timeslice) object 64B 'weekday' 'weekday' ... 'weekend'
+          * day        (timeslice) object 64B 'day' 'night' 'day' ... 'day' 'night'
+          * a          (a) int64 24B 1 2 3
         >>> z.sum("timeslice")
-        <xarray.DataArray (a: 3)>
+        <xarray.DataArray (a: 3)> Size: 24B
         array([5., 2., 3.])
         Coordinates:
-          * a        (a) int64 1 2 3
+          * a        (a) int64 24B 1 2 3
 
         As expected, the sum over timeslices recovers the original array.
 
@@ -485,7 +486,7 @@ def convert_timeslice(
         >>> zfine = x + y + zeros_like(fine_ts.timeslice, dtype=int)
         >>> zrough = convert_timeslice(zfine, rough_ts)
         >>> zrough.round(6)
-        <xarray.DataArray (timeslice: 2, a: 3, b: 3)>
+        <xarray.DataArray (timeslice: 2, a: 3, b: 3)> Size: 144B
         array([[[17.142857, 17.142857, 20.      ],
                 [ 8.571429,  8.571429, 11.428571],
                 [11.428571, 11.428571, 14.285714]],
@@ -494,19 +495,19 @@ def convert_timeslice(
                 [ 3.428571,  3.428571,  4.571429],
                 [ 4.571429,  4.571429,  5.714286]]])
         Coordinates:
-          * timeslice  (timeslice) MultiIndex
-          - semester   (timeslice) object 'allyear' 'allyear'
-          - week       (timeslice) object 'weekday' 'weekend'
-          - day        (timeslice) object 'allday' 'allday'
-          * a          (a) int64 1 2 3
-          * b          (b) <U1 'd' 'e' 'f'
+          * timeslice  (timeslice) object 16B MultiIndex
+          * semester   (timeslice) object 16B 'allyear' 'allyear'
+          * week       (timeslice) object 16B 'weekday' 'weekend'
+          * day        (timeslice) object 16B 'allday' 'allday'
+          * a          (a) int64 24B 1 2 3
+          * b          (b) <U1 12B 'd' 'e' 'f'
 
         We can check that nothing has been added to z (the quantity is ``EXTENSIVE`` by
         default):
 
         >>> from numpy import all
         >>> all(zfine.sum("timeslice").round(6) == zrough.sum("timeslice").round(6))
-        <xarray.DataArray ()>
+        <xarray.DataArray ()> Size: 1B
         array(True)
 
         Or that the ratio of weekdays to weekends makes sense:
@@ -546,13 +547,22 @@ def convert_timeslice(
         finest = finest.rename(timeslice="finest_timeslice")
         index = finest.get_index("finest_timeslice")
         index = index.set_names((f"finest_{u}" for u in index.names))
-        finest.coords["finest_timeslice"] = index
+        mindex_coords = xr.Coordinates.from_pandas_multiindex(index, "finest_timeslice")
+        finest = finest.drop_vars(list(finest.coords)).assign_coords(mindex_coords)
         proj0 *= finest
         proj0 = proj0 / proj0.sum("finest_timeslice")
     elif quantity is QuantityType.INTENSIVE:
         proj1 = proj1 / proj1.sum("finest_timeslice")
-    P = (proj1.rename(timeslice="final_ts") * proj0).sum("finest_timeslice")
-    return (P * x).sum("timeslice").rename(final_ts="timeslice")
+
+    new_names = {"timeslice": "final_ts"} | {
+        c: f"{c}_ts" for c in proj1.timeslice.coords if c != "timeslice"
+    }
+    P = (proj1.rename(**new_names) * proj0).sum("finest_timeslice")
+
+    final_names = {"final_ts": "timeslice"} | {
+        c: c.replace("_ts", "") for c in P.final_ts.coords if c != "final_ts"
+    }
+    return (P * x).sum("timeslice").rename(**final_names)
 
 
 def new_to_old_timeslice(ts: DataArray, ag_level="Month") -> dict:
diff --git a/src/muse/utilities.py b/src/muse/utilities.py
index 411f9fb51..de377c097 100644
--- a/src/muse/utilities.py
+++ b/src/muse/utilities.py
@@ -29,7 +29,7 @@ def multiindex_to_coords(
     assert isinstance(data.indexes[dimension], MultiIndex)
     names = data.indexes[dimension].names
     coords = {n: data[n].values for n in names}
-    result = data.drop_vars(dimension)
+    result = data.drop_vars([dimension, *names])
     for name, coord in coords.items():
         result[name] = dimension, coord
     if isinstance(result, xr.Dataset):
@@ -47,9 +47,8 @@ def coords_to_multiindex(
     assert dimension not in data.indexes
     names = [u for u in data.coords if data[u].dims == (dimension,)]
     index = MultiIndex.from_arrays([data[u].values for u in names], names=names)
-    result = data.drop_vars(names)
-    result[dimension] = index
-    return result
+    mindex_coords = xr.Coordinates.from_pandas_multiindex(index, dimension)
+    return data.drop_vars(names).assign_coords(mindex_coords)
 
 
 def reduce_assets(
@@ -115,16 +114,16 @@ def reduce_assets(
         The point of `reduce_assets` is to aggregate assets that refer to the
         same process:
 
-        >>> reduce_assets(data.capacity)
-        <xarray.DataArray 'capacity' (year: 3, asset: 3)>
+        >>> reduce_assets(data.capacity)  # doctest: +SKIP
+        <xarray.DataArray 'capacity' (year: 3, asset: 3)> Size: 36B
         array([[ 0,  3,  3],
                [ 4,  7, 11],
                [ 8, 11, 19]])
         Coordinates:
-          * year        (year) ... 2010 2015 2017
-            installed   (asset) ... 1990 1990 1991
-            technology  (asset) <U1 'a' 'c' 'b'
-            region      (asset) <U1 'x' 'y' 'x'
+          * year        (year) int32 12B 2010 2015 2017
+            installed   (asset) int32 12B 1990 1990 1991
+            technology  (asset) <U1 12B 'a' 'c' 'b'
+            region      (asset) <U1 12B 'x' 'y' 'x'
         Dimensions without coordinates: asset
 
         We can also specify explicitly which coordinates in the 'asset'
@@ -134,15 +133,15 @@ def reduce_assets(
         ...     data.capacity,
         ...     coords=('technology', 'installed'),
         ...     operation = lambda x: x.mean(dim='asset')
-        ... )
-        <xarray.DataArray 'capacity' (year: 3, asset: 3)>
+        ... )  # doctest: +SKIP
+        <xarray.DataArray 'capacity' (year: 3, asset: 3)> Size: 72B
         array([[ 0. ,  1.5,  3. ],
                [ 4. ,  5.5,  7. ],
                [ 8. ,  9.5, 11. ]])
         Coordinates:
-          * year        (year) ... 2010 2015 2017
-            technology  (asset) <U1 'a' 'b' 'c'
-            installed   (asset) ... 1990 1991 1990
+          * year        (year) int32 12B 2010 2015 2017
+            technology  (asset) <U1 12B 'a' 'b' 'c'
+            installed   (asset) int32 12B 1990 1991 1990
         Dimensions without coordinates: asset
     """
     from copy import copy
@@ -395,7 +394,6 @@ def merge_assets(
     """Merge two capacity arrays."""
     years = sorted(set(capa_a.year.values).union(capa_b.year.values))
 
-    levels = (coord for coord in capa_a.coords if capa_a[coord].dims == (dimension,))
     if len(capa_a.year) == 1:
         result = xr.concat(
             (
@@ -427,7 +425,6 @@ def merge_assets(
             .sum(dimension)
             .clip(min=0)
             .pipe(multiindex_to_coords, dimension=dimension)
-            .rename({"asset_level_%i" % i: coord for i, coord in enumerate(levels)})
         )
     return result
 
@@ -493,13 +490,13 @@ def future_propagation(
         values differed for the current year beyond a given threshold:
 
         >>> from muse.utilities import future_propagation
-        >>> future_propagation(data, future, threshold=0.1)
-        <xarray.DataArray (fuel: 2, year: 4)>
+        >>> future_propagation(data, future, threshold=0.1)  # doctest: +SKIP
+        <xarray.DataArray (fuel: 2, year: 4)> Size: 64B
         array([[ 0. ,  1.2,  1.2,  1.2],
                [-5. , -4. , -3. , -2. ]])
         Coordinates:
-          * year     (year) ... 2020 2025 2030 2035
-          * fuel     (fuel) <U4 'gas' 'coal'
+          * year     (year) int32 16B 2020 2025 2030 2035
+          * fuel     (fuel) <U4 32B 'gas' 'coal'
 
         Above, the data for coal is not sufficiently different given the threshold.
         hence, the future values for coal remain as they where.
@@ -507,20 +504,24 @@ def future_propagation(
         The dimensions of ``future`` do not have to match exactly those of ``data``.
         Standard broadcasting is used if they do not match:
 
-        >>> future_propagation(data, future.sel(fuel="gas", drop=True), threshold=0.1)
-        <xarray.DataArray (fuel: 2, year: 4)>
+        >>> future_propagation(
+        ...    data, future.sel(fuel="gas", drop=True), threshold=0.1
+        ... )  # doctest: +SKIP
+        <xarray.DataArray (fuel: 2, year: 4)> Size: 64B
         array([[ 0. ,  1.2,  1.2,  1.2],
                [-5. ,  1.2,  1.2,  1.2]])
         Coordinates:
-          * year     (year) ... 2020 2025 2030 2035
-          * fuel     (fuel) <U4 'gas' 'coal'
-        >>> future_propagation(data, future.sel(fuel="coal", drop=True), threshold=0.1)
-        <xarray.DataArray (fuel: 2, year: 4)>
+          * year     (year) int32 16B 2020 2025 2030 2035
+          * fuel     (fuel) <U4 32B 'gas' 'coal'
+        >>> future_propagation(
+        ...     data, future.sel(fuel="coal", drop=True), threshold=0.1
+        ... )  # doctest: +SKIP
+        <xarray.DataArray (fuel: 2, year: 4)> Size: 64B
         array([[ 0.  , -3.95, -3.95, -3.95],
                [-5.  , -4.  , -3.  , -2.  ]])
         Coordinates:
-          * year     (year) ... 2020 2025 2030 2035
-          * fuel     (fuel) <U4 'gas' 'coal'
+          * year     (year) int32 16B 2020 2025 2030 2035
+          * fuel     (fuel) <U4 32B 'gas' 'coal'
     """
     if dim not in data.dims or dim not in future.coords:
         raise ValueError("Expected dimension 'year' in `data` and `future`.")
@@ -562,18 +563,18 @@ def agent_concatenation(
 
         >>> from muse.utilities import agent_concatenation
         >>> aggregate = agent_concatenation(assets)
-        >>> aggregate
-        <xarray.Dataset>
+        >>> aggregate # doctest: +SKIP
+        <xarray.Dataset> Size: 4kB
         Dimensions:     (asset: 19, year: 12)
         Coordinates:
-          * year        (year) int64 2033 2035 2036 2037 2039 ... 2046 2047 2048 2049
-            technology  (asset) <U9 'oven' 'stove' 'oven' ... 'stove' 'oven' 'thermomix'
-            region      (asset) <U9 'Brexitham' 'Brexitham' ... 'Brexitham' 'Brexitham'
-            agent       (asset) ... 0 0 0 0 0 1 1 1 2 2 2 2 3 3 3 4 4 4 4
-            installed   (asset) int64 2030 2025 2030 2010 2030 ... 2025 2030 2010 2025
+            agent       (asset) int32 76B 0 0 0 0 0 1 1 1 2 2 2 2 3 3 3 4 4 4 4
+          * year        (year) int64 96B 2033 2035 2036 2037 ... 2046 2047 2048 2049
+            installed   (asset) int64 152B 2030 2025 2030 2010 ... 2025 2030 2010 2025
+            technology  (asset) <U9 684B 'oven' 'stove' 'oven' ... 'oven' 'thermomix'
+            region      (asset) <U9 684B 'Brexitham' 'Brexitham' ... 'Brexitham'
         Dimensions without coordinates: asset
         Data variables:
-            capacity    (asset, year) float64 26.0 26.0 26.0 56.0 ... 62.0 62.0 62.0
+            capacity    (asset, year) float64 2kB 26.0 26.0 26.0 56.0 ... 62.0 62.0 62.0
 
         Note that the `dtype` of the capacity has changed from integers to floating
         points. This is due to how ``xarray`` performs the operation.
diff --git a/tests/conftest.py b/tests/conftest.py
index c6385ee7d..523bea0d8 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -1,6 +1,7 @@
 from pathlib import Path
 from typing import Callable, Mapping, Optional, Sequence, Text
 
+import numpy as np
 from muse.agents import Agent
 from pandas import DataFrame
 from pytest import fixture, mark
@@ -77,9 +78,21 @@ def compare_df(
     for col in floats:
         actual_col = actual.loc[expected.index, col].values
         expected_col = expected[col].values
-        if actual_col != approx(expected_col, rel=rtol, abs=atol, nan_ok=equal_nan):
-            print(f"file: {msg}, column: {col}")
-        assert actual_col == approx(expected_col, rel=rtol, abs=atol, nan_ok=equal_nan)
+        try:
+            assert actual_col == approx(
+                expected_col, rel=rtol, abs=atol, nan_ok=equal_nan
+            )
+        except AssertionError:
+            # if the columns are not equal, we check if the sorted ones are equal as
+            # sometimes the order of the rows is different because of different sorting
+            # algorithms
+            try:
+                assert np.sort(actual_col) == approx(
+                    np.sort(expected_col), rel=rtol, abs=atol, nan_ok=equal_nan
+                )
+            except AssertionError:
+                print(f"file: {msg}, column: {col}")
+                raise
 
 
 @fixture
diff --git a/tests/example_outputs/default/Gas/Capacity/2020.csv b/tests/example_outputs/default/Gas/Capacity/2020.csv
index fdbb2d279..d1ee882b2 100644
--- a/tests/example_outputs/default/Gas/Capacity/2020.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2020.csv
@@ -1,4 +1,4 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gassupply1,15.00000000000
-0,2025,R1,2020,gassupply1,15.00000000000
-0,2030,R1,2020,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2025.csv b/tests/example_outputs/default/Gas/Capacity/2025.csv
index 33746c9c2..d1fb99f56 100644
--- a/tests/example_outputs/default/Gas/Capacity/2025.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2025.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-0,2025,R1,2020,gassupply1,15.00000000000
-0,2030,R1,2020,gassupply1,7.50000000000
-1,2030,R1,2025,gassupply1,2.79440000000
-1,2035,R1,2025,gassupply1,2.79440000000
-1,2040,R1,2025,gassupply1,2.79440000000
-1,2045,R1,2025,gassupply1,2.79440000000
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
+asset,year,region,technology,installed,capacity
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2030,R1,gassupply1,2025,2.79440000000
+1,2035,R1,gassupply1,2025,2.79440000000
+1,2040,R1,gassupply1,2025,2.79440000000
+1,2045,R1,gassupply1,2025,2.79440000000
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2030.csv b/tests/example_outputs/default/Gas/Capacity/2030.csv
index 298f6c891..e84ef6dc7 100644
--- a/tests/example_outputs/default/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2030.csv
@@ -1,15 +1,15 @@
-asset,year,region,installed,technology,capacity
-0,2030,R1,2020,gassupply1,7.50000000000
-1,2030,R1,2025,gassupply1,2.79440000000
-1,2035,R1,2025,gassupply1,2.79440000000
-1,2040,R1,2025,gassupply1,2.79440000000
-1,2045,R1,2025,gassupply1,2.79440000000
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2035,R1,2030,gassupply1,7.50000000000
-2,2040,R1,2030,gassupply1,7.50000000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2030,R1,gassupply1,2025,2.79440000000
+1,2035,R1,gassupply1,2025,2.79440000000
+1,2040,R1,gassupply1,2025,2.79440000000
+1,2045,R1,gassupply1,2025,2.79440000000
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2035,R1,gassupply1,2030,7.50000000000
+2,2040,R1,gassupply1,2030,7.50000000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2035.csv b/tests/example_outputs/default/Gas/Capacity/2035.csv
index e368dd50c..ccf34c3db 100644
--- a/tests/example_outputs/default/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2035.csv
@@ -1,13 +1,13 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2025,gassupply1,2.79440000000
-1,2040,R1,2025,gassupply1,2.79440000000
-1,2045,R1,2025,gassupply1,2.79440000000
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2035,R1,2030,gassupply1,7.50000000000
-2,2040,R1,2030,gassupply1,7.50000000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2035,R1,gassupply1,2025,2.79440000000
+1,2040,R1,gassupply1,2025,2.79440000000
+1,2045,R1,gassupply1,2025,2.79440000000
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2035,R1,gassupply1,2030,7.50000000000
+2,2040,R1,gassupply1,2030,7.50000000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2040.csv b/tests/example_outputs/default/Gas/Capacity/2040.csv
index 4d55f6f79..79fdfddb6 100644
--- a/tests/example_outputs/default/Gas/Capacity/2040.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2040.csv
@@ -1,11 +1,11 @@
-asset,year,region,installed,technology,capacity
-1,2040,R1,2025,gassupply1,2.79440000000
-1,2045,R1,2025,gassupply1,2.79440000000
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2040,R1,2030,gassupply1,7.50000000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2040,R1,gassupply1,2025,2.79440000000
+1,2045,R1,gassupply1,2025,2.79440000000
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2040,R1,gassupply1,2030,7.50000000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2045.csv b/tests/example_outputs/default/Gas/Capacity/2045.csv
index e5d560fce..b2ca194fb 100644
--- a/tests/example_outputs/default/Gas/Capacity/2045.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2045.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-1,2045,R1,2025,gassupply1,2.79440000000
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2045,R1,gassupply1,2025,2.79440000000
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/tests/example_outputs/default/Gas/Capacity/2050.csv b/tests/example_outputs/default/Gas/Capacity/2050.csv
index 4a7d05fa4..4f3e3a180 100644
--- a/tests/example_outputs/default/Gas/Capacity/2050.csv
+++ b/tests/example_outputs/default/Gas/Capacity/2050.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2055,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2055,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2055,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2055,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/tests/example_outputs/default/Power/Capacity/2020.csv b/tests/example_outputs/default/Power/Capacity/2020.csv
index 62349ecf1..bdc2b6a78 100644
--- a/tests/example_outputs/default/Power/Capacity/2020.csv
+++ b/tests/example_outputs/default/Power/Capacity/2020.csv
@@ -1,16 +1,16 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gasCCGT,1.00000000000
-0,2025,R1,2020,gasCCGT,4.00000000000
-0,2030,R1,2020,gasCCGT,3.00000000000
-0,2035,R1,2020,gasCCGT,3.00000000000
-0,2040,R1,2020,gasCCGT,3.00000000000
-0,2045,R1,2020,gasCCGT,3.00000000000
-0,2049,R1,2020,gasCCGT,3.00000000000
-0,2050,R1,2020,gasCCGT,3.00000000000
-0,2059,R1,2020,gasCCGT,3.00000000000
-1,2025,R1,2020,windturbine,10.00000000000
-1,2030,R1,2020,windturbine,10.00000000000
-1,2035,R1,2020,windturbine,10.00000000000
-1,2040,R1,2020,windturbine,10.00000000000
-1,2045,R1,2020,windturbine,10.00000000000
-1,2049,R1,2020,windturbine,10.00000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,4.00000000000
+0,2030,R1,gasCCGT,2020,3.00000000000
+0,2035,R1,gasCCGT,2020,3.00000000000
+0,2040,R1,gasCCGT,2020,3.00000000000
+0,2045,R1,gasCCGT,2020,3.00000000000
+0,2049,R1,gasCCGT,2020,3.00000000000
+0,2050,R1,gasCCGT,2020,3.00000000000
+0,2059,R1,gasCCGT,2020,3.00000000000
+1,2025,R1,windturbine,2020,10.00000000000
+1,2030,R1,windturbine,2020,10.00000000000
+1,2035,R1,windturbine,2020,10.00000000000
+1,2040,R1,windturbine,2020,10.00000000000
+1,2045,R1,windturbine,2020,10.00000000000
+1,2049,R1,windturbine,2020,10.00000000000
diff --git a/tests/example_outputs/default/Power/Capacity/2030.csv b/tests/example_outputs/default/Power/Capacity/2030.csv
index 62db4566a..a6c53c55f 100644
--- a/tests/example_outputs/default/Power/Capacity/2030.csv
+++ b/tests/example_outputs/default/Power/Capacity/2030.csv
@@ -1,30 +1,30 @@
-asset,year,region,installed,technology,capacity
-0,2030,R1,2020,gasCCGT,3.00000000000
-0,2035,R1,2020,gasCCGT,3.00000000000
-0,2040,R1,2020,gasCCGT,3.00000000000
-0,2045,R1,2020,gasCCGT,3.00000000000
-0,2049,R1,2020,gasCCGT,3.00000000000
-0,2050,R1,2020,gasCCGT,3.00000000000
-0,2054,R1,2020,gasCCGT,3.00000000000
-0,2055,R1,2020,gasCCGT,3.00000000000
-0,2059,R1,2020,gasCCGT,3.00000000000
-1,2030,R1,2020,windturbine,10.00000000000
-1,2035,R1,2020,windturbine,10.00000000000
-1,2040,R1,2020,windturbine,10.00000000000
-1,2045,R1,2020,windturbine,10.00000000000
-1,2049,R1,2020,windturbine,10.00000000000
-2,2030,R1,2025,windturbine,9.15000000000
-2,2035,R1,2025,windturbine,9.15000000000
-2,2040,R1,2025,windturbine,9.15000000000
-2,2045,R1,2025,windturbine,9.15000000000
-2,2049,R1,2025,windturbine,9.15000000000
-2,2050,R1,2025,windturbine,9.15000000000
-2,2054,R1,2025,windturbine,9.15000000000
-3,2035,R1,2030,windturbine,6.00000000000
-3,2040,R1,2030,windturbine,6.00000000000
-3,2045,R1,2030,windturbine,6.00000000000
-3,2049,R1,2030,windturbine,6.00000000000
-3,2050,R1,2030,windturbine,6.00000000000
-3,2054,R1,2030,windturbine,6.00000000000
-3,2055,R1,2030,windturbine,6.00000000000
-3,2059,R1,2030,windturbine,6.00000000000
+asset,year,region,technology,installed,capacity
+0,2030,R1,gasCCGT,2020,3.00000000000
+0,2035,R1,gasCCGT,2020,3.00000000000
+0,2040,R1,gasCCGT,2020,3.00000000000
+0,2045,R1,gasCCGT,2020,3.00000000000
+0,2049,R1,gasCCGT,2020,3.00000000000
+0,2050,R1,gasCCGT,2020,3.00000000000
+0,2054,R1,gasCCGT,2020,3.00000000000
+0,2055,R1,gasCCGT,2020,3.00000000000
+0,2059,R1,gasCCGT,2020,3.00000000000
+1,2030,R1,windturbine,2020,10.00000000000
+1,2035,R1,windturbine,2020,10.00000000000
+1,2040,R1,windturbine,2020,10.00000000000
+1,2045,R1,windturbine,2020,10.00000000000
+1,2049,R1,windturbine,2020,10.00000000000
+2,2030,R1,windturbine,2025,9.15000000000
+2,2035,R1,windturbine,2025,9.15000000000
+2,2040,R1,windturbine,2025,9.15000000000
+2,2045,R1,windturbine,2025,9.15000000000
+2,2049,R1,windturbine,2025,9.15000000000
+2,2050,R1,windturbine,2025,9.15000000000
+2,2054,R1,windturbine,2025,9.15000000000
+3,2035,R1,windturbine,2030,6.00000000000
+3,2040,R1,windturbine,2030,6.00000000000
+3,2045,R1,windturbine,2030,6.00000000000
+3,2049,R1,windturbine,2030,6.00000000000
+3,2050,R1,windturbine,2030,6.00000000000
+3,2054,R1,windturbine,2030,6.00000000000
+3,2055,R1,windturbine,2030,6.00000000000
+3,2059,R1,windturbine,2030,6.00000000000
diff --git a/tests/example_outputs/default/Power/Capacity/2035.csv b/tests/example_outputs/default/Power/Capacity/2035.csv
index 048c07aed..60e997eaf 100644
--- a/tests/example_outputs/default/Power/Capacity/2035.csv
+++ b/tests/example_outputs/default/Power/Capacity/2035.csv
@@ -1,36 +1,36 @@
-asset,year,region,installed,technology,capacity
-0,2035,R1,2020,gasCCGT,3.00000000000
-0,2040,R1,2020,gasCCGT,3.00000000000
-0,2045,R1,2020,gasCCGT,3.00000000000
-0,2049,R1,2020,gasCCGT,3.00000000000
-0,2050,R1,2020,gasCCGT,3.00000000000
-0,2054,R1,2020,gasCCGT,3.00000000000
-0,2055,R1,2020,gasCCGT,3.00000000000
-0,2059,R1,2020,gasCCGT,3.00000000000
-1,2035,R1,2020,windturbine,10.00000000000
-1,2040,R1,2020,windturbine,10.00000000000
-1,2045,R1,2020,windturbine,10.00000000000
-1,2049,R1,2020,windturbine,10.00000000000
-2,2035,R1,2025,windturbine,9.15000000000
-2,2040,R1,2025,windturbine,9.15000000000
-2,2045,R1,2025,windturbine,9.15000000000
-2,2049,R1,2025,windturbine,9.15000000000
-2,2050,R1,2025,windturbine,9.15000000000
-2,2054,R1,2025,windturbine,9.15000000000
-3,2035,R1,2030,windturbine,6.00000000000
-3,2040,R1,2030,windturbine,6.00000000000
-3,2045,R1,2030,windturbine,6.00000000000
-3,2049,R1,2030,windturbine,6.00000000000
-3,2050,R1,2030,windturbine,6.00000000000
-3,2054,R1,2030,windturbine,6.00000000000
-3,2055,R1,2030,windturbine,6.00000000000
-3,2059,R1,2030,windturbine,6.00000000000
-4,2040,R1,2035,windturbine,9.19000000000
-4,2045,R1,2035,windturbine,9.19000000000
-4,2049,R1,2035,windturbine,9.19000000000
-4,2050,R1,2035,windturbine,9.19000000000
-4,2054,R1,2035,windturbine,9.19000000000
-4,2055,R1,2035,windturbine,9.19000000000
-4,2059,R1,2035,windturbine,9.19000000000
-4,2060,R1,2035,windturbine,9.19000000000
-4,2064,R1,2035,windturbine,9.19000000000
+asset,year,region,technology,installed,capacity
+0,2035,R1,gasCCGT,2020,3.00000000000
+0,2040,R1,gasCCGT,2020,3.00000000000
+0,2045,R1,gasCCGT,2020,3.00000000000
+0,2049,R1,gasCCGT,2020,3.00000000000
+0,2050,R1,gasCCGT,2020,3.00000000000
+0,2054,R1,gasCCGT,2020,3.00000000000
+0,2055,R1,gasCCGT,2020,3.00000000000
+0,2059,R1,gasCCGT,2020,3.00000000000
+1,2035,R1,windturbine,2020,10.00000000000
+1,2040,R1,windturbine,2020,10.00000000000
+1,2045,R1,windturbine,2020,10.00000000000
+1,2049,R1,windturbine,2020,10.00000000000
+2,2035,R1,windturbine,2025,9.15000000000
+2,2040,R1,windturbine,2025,9.15000000000
+2,2045,R1,windturbine,2025,9.15000000000
+2,2049,R1,windturbine,2025,9.15000000000
+2,2050,R1,windturbine,2025,9.15000000000
+2,2054,R1,windturbine,2025,9.15000000000
+3,2035,R1,windturbine,2030,6.00000000000
+3,2040,R1,windturbine,2030,6.00000000000
+3,2045,R1,windturbine,2030,6.00000000000
+3,2049,R1,windturbine,2030,6.00000000000
+3,2050,R1,windturbine,2030,6.00000000000
+3,2054,R1,windturbine,2030,6.00000000000
+3,2055,R1,windturbine,2030,6.00000000000
+3,2059,R1,windturbine,2030,6.00000000000
+4,2040,R1,windturbine,2035,9.19000000000
+4,2045,R1,windturbine,2035,9.19000000000
+4,2049,R1,windturbine,2035,9.19000000000
+4,2050,R1,windturbine,2035,9.19000000000
+4,2054,R1,windturbine,2035,9.19000000000
+4,2055,R1,windturbine,2035,9.19000000000
+4,2059,R1,windturbine,2035,9.19000000000
+4,2060,R1,windturbine,2035,9.19000000000
+4,2064,R1,windturbine,2035,9.19000000000
diff --git a/tests/example_outputs/default/Power/Capacity/2040.csv b/tests/example_outputs/default/Power/Capacity/2040.csv
index 715ec9ef6..1cba828be 100644
--- a/tests/example_outputs/default/Power/Capacity/2040.csv
+++ b/tests/example_outputs/default/Power/Capacity/2040.csv
@@ -1,42 +1,42 @@
-asset,year,region,installed,technology,capacity
-0,2040,R1,2020,gasCCGT,3.00000000000
-0,2045,R1,2020,gasCCGT,3.00000000000
-0,2049,R1,2020,gasCCGT,3.00000000000
-0,2050,R1,2020,gasCCGT,3.00000000000
-0,2054,R1,2020,gasCCGT,3.00000000000
-0,2055,R1,2020,gasCCGT,3.00000000000
-0,2059,R1,2020,gasCCGT,3.00000000000
-1,2040,R1,2020,windturbine,10.00000000000
-1,2045,R1,2020,windturbine,10.00000000000
-1,2049,R1,2020,windturbine,10.00000000000
-2,2040,R1,2025,windturbine,9.15000000000
-2,2045,R1,2025,windturbine,9.15000000000
-2,2049,R1,2025,windturbine,9.15000000000
-2,2050,R1,2025,windturbine,9.15000000000
-2,2054,R1,2025,windturbine,9.15000000000
-3,2040,R1,2030,windturbine,6.00000000000
-3,2045,R1,2030,windturbine,6.00000000000
-3,2049,R1,2030,windturbine,6.00000000000
-3,2050,R1,2030,windturbine,6.00000000000
-3,2054,R1,2030,windturbine,6.00000000000
-3,2055,R1,2030,windturbine,6.00000000000
-3,2059,R1,2030,windturbine,6.00000000000
-4,2040,R1,2035,windturbine,9.19000000000
-4,2045,R1,2035,windturbine,9.19000000000
-4,2049,R1,2035,windturbine,9.19000000000
-4,2050,R1,2035,windturbine,9.19000000000
-4,2054,R1,2035,windturbine,9.19000000000
-4,2055,R1,2035,windturbine,9.19000000000
-4,2059,R1,2035,windturbine,9.19000000000
-4,2060,R1,2035,windturbine,9.19000000000
-4,2064,R1,2035,windturbine,9.19000000000
-5,2045,R1,2040,windturbine,6.00000000000
-5,2049,R1,2040,windturbine,6.00000000000
-5,2050,R1,2040,windturbine,6.00000000000
-5,2054,R1,2040,windturbine,6.00000000000
-5,2055,R1,2040,windturbine,6.00000000000
-5,2059,R1,2040,windturbine,6.00000000000
-5,2060,R1,2040,windturbine,6.00000000000
-5,2064,R1,2040,windturbine,6.00000000000
-5,2065,R1,2040,windturbine,6.00000000000
-5,2069,R1,2040,windturbine,6.00000000000
+asset,year,region,technology,installed,capacity
+0,2040,R1,gasCCGT,2020,3.00000000000
+0,2045,R1,gasCCGT,2020,3.00000000000
+0,2049,R1,gasCCGT,2020,3.00000000000
+0,2050,R1,gasCCGT,2020,3.00000000000
+0,2054,R1,gasCCGT,2020,3.00000000000
+0,2055,R1,gasCCGT,2020,3.00000000000
+0,2059,R1,gasCCGT,2020,3.00000000000
+1,2040,R1,windturbine,2020,10.00000000000
+1,2045,R1,windturbine,2020,10.00000000000
+1,2049,R1,windturbine,2020,10.00000000000
+2,2040,R1,windturbine,2025,9.15000000000
+2,2045,R1,windturbine,2025,9.15000000000
+2,2049,R1,windturbine,2025,9.15000000000
+2,2050,R1,windturbine,2025,9.15000000000
+2,2054,R1,windturbine,2025,9.15000000000
+3,2040,R1,windturbine,2030,6.00000000000
+3,2045,R1,windturbine,2030,6.00000000000
+3,2049,R1,windturbine,2030,6.00000000000
+3,2050,R1,windturbine,2030,6.00000000000
+3,2054,R1,windturbine,2030,6.00000000000
+3,2055,R1,windturbine,2030,6.00000000000
+3,2059,R1,windturbine,2030,6.00000000000
+4,2040,R1,windturbine,2035,9.19000000000
+4,2045,R1,windturbine,2035,9.19000000000
+4,2049,R1,windturbine,2035,9.19000000000
+4,2050,R1,windturbine,2035,9.19000000000
+4,2054,R1,windturbine,2035,9.19000000000
+4,2055,R1,windturbine,2035,9.19000000000
+4,2059,R1,windturbine,2035,9.19000000000
+4,2060,R1,windturbine,2035,9.19000000000
+4,2064,R1,windturbine,2035,9.19000000000
+5,2045,R1,windturbine,2040,6.00000000000
+5,2049,R1,windturbine,2040,6.00000000000
+5,2050,R1,windturbine,2040,6.00000000000
+5,2054,R1,windturbine,2040,6.00000000000
+5,2055,R1,windturbine,2040,6.00000000000
+5,2059,R1,windturbine,2040,6.00000000000
+5,2060,R1,windturbine,2040,6.00000000000
+5,2064,R1,windturbine,2040,6.00000000000
+5,2065,R1,windturbine,2040,6.00000000000
+5,2069,R1,windturbine,2040,6.00000000000
diff --git a/tests/example_outputs/default/Power/Capacity/2050.csv b/tests/example_outputs/default/Power/Capacity/2050.csv
index 6fa217fce..13bd77c97 100644
--- a/tests/example_outputs/default/Power/Capacity/2050.csv
+++ b/tests/example_outputs/default/Power/Capacity/2050.csv
@@ -1,45 +1,45 @@
-asset,year,region,installed,technology,capacity
-0,2050,R1,2020,gasCCGT,3.00000000000
-0,2054,R1,2020,gasCCGT,3.00000000000
-0,2055,R1,2020,gasCCGT,3.00000000000
-0,2059,R1,2020,gasCCGT,3.00000000000
-2,2050,R1,2025,windturbine,9.15000000000
-2,2054,R1,2025,windturbine,9.15000000000
-3,2050,R1,2030,windturbine,6.00000000000
-3,2054,R1,2030,windturbine,6.00000000000
-3,2055,R1,2030,windturbine,6.00000000000
-3,2059,R1,2030,windturbine,6.00000000000
-4,2050,R1,2035,windturbine,9.19000000000
-4,2054,R1,2035,windturbine,9.19000000000
-4,2055,R1,2035,windturbine,9.19000000000
-4,2059,R1,2035,windturbine,9.19000000000
-4,2060,R1,2035,windturbine,9.19000000000
-4,2064,R1,2035,windturbine,9.19000000000
-5,2050,R1,2040,windturbine,6.00000000000
-5,2054,R1,2040,windturbine,6.00000000000
-5,2055,R1,2040,windturbine,6.00000000000
-5,2059,R1,2040,windturbine,6.00000000000
-5,2060,R1,2040,windturbine,6.00000000000
-5,2064,R1,2040,windturbine,6.00000000000
-5,2065,R1,2040,windturbine,6.00000000000
-5,2069,R1,2040,windturbine,6.00000000000
-6,2050,R1,2045,windturbine,16.91000000000
-6,2054,R1,2045,windturbine,16.91000000000
-6,2055,R1,2045,windturbine,16.91000000000
-6,2059,R1,2045,windturbine,16.91000000000
-6,2060,R1,2045,windturbine,16.91000000000
-6,2064,R1,2045,windturbine,16.91000000000
-6,2065,R1,2045,windturbine,16.91000000000
-6,2069,R1,2045,windturbine,16.91000000000
-6,2070,R1,2045,windturbine,16.91000000000
-6,2074,R1,2045,windturbine,16.91000000000
-7,2055,R1,2050,windturbine,9.15000000000
-7,2059,R1,2050,windturbine,9.15000000000
-7,2060,R1,2050,windturbine,9.15000000000
-7,2064,R1,2050,windturbine,9.15000000000
-7,2065,R1,2050,windturbine,9.15000000000
-7,2069,R1,2050,windturbine,9.15000000000
-7,2070,R1,2050,windturbine,9.15000000000
-7,2074,R1,2050,windturbine,9.15000000000
-7,2075,R1,2050,windturbine,9.15000000000
-7,2079,R1,2050,windturbine,9.15000000000
+asset,year,region,technology,installed,capacity
+0,2050,R1,gasCCGT,2020,3.00000000000
+0,2054,R1,gasCCGT,2020,3.00000000000
+0,2055,R1,gasCCGT,2020,3.00000000000
+0,2059,R1,gasCCGT,2020,3.00000000000
+2,2050,R1,windturbine,2025,9.15000000000
+2,2054,R1,windturbine,2025,9.15000000000
+3,2050,R1,windturbine,2030,6.00000000000
+3,2054,R1,windturbine,2030,6.00000000000
+3,2055,R1,windturbine,2030,6.00000000000
+3,2059,R1,windturbine,2030,6.00000000000
+4,2050,R1,windturbine,2035,9.19000000000
+4,2054,R1,windturbine,2035,9.19000000000
+4,2055,R1,windturbine,2035,9.19000000000
+4,2059,R1,windturbine,2035,9.19000000000
+4,2060,R1,windturbine,2035,9.19000000000
+4,2064,R1,windturbine,2035,9.19000000000
+5,2050,R1,windturbine,2040,6.00000000000
+5,2054,R1,windturbine,2040,6.00000000000
+5,2055,R1,windturbine,2040,6.00000000000
+5,2059,R1,windturbine,2040,6.00000000000
+5,2060,R1,windturbine,2040,6.00000000000
+5,2064,R1,windturbine,2040,6.00000000000
+5,2065,R1,windturbine,2040,6.00000000000
+5,2069,R1,windturbine,2040,6.00000000000
+6,2050,R1,windturbine,2045,16.91000000000
+6,2054,R1,windturbine,2045,16.91000000000
+6,2055,R1,windturbine,2045,16.91000000000
+6,2059,R1,windturbine,2045,16.91000000000
+6,2060,R1,windturbine,2045,16.91000000000
+6,2064,R1,windturbine,2045,16.91000000000
+6,2065,R1,windturbine,2045,16.91000000000
+6,2069,R1,windturbine,2045,16.91000000000
+6,2070,R1,windturbine,2045,16.91000000000
+6,2074,R1,windturbine,2045,16.91000000000
+7,2055,R1,windturbine,2050,9.15000000000
+7,2059,R1,windturbine,2050,9.15000000000
+7,2060,R1,windturbine,2050,9.15000000000
+7,2064,R1,windturbine,2050,9.15000000000
+7,2065,R1,windturbine,2050,9.15000000000
+7,2069,R1,windturbine,2050,9.15000000000
+7,2070,R1,windturbine,2050,9.15000000000
+7,2074,R1,windturbine,2050,9.15000000000
+7,2075,R1,windturbine,2050,9.15000000000
+7,2079,R1,windturbine,2050,9.15000000000
diff --git a/tests/example_outputs/default/Residential/Capacity/2050.csv b/tests/example_outputs/default/Residential/Capacity/2050.csv
index 305b627b2..42f4be20c 100644
--- a/tests/example_outputs/default/Residential/Capacity/2050.csv
+++ b/tests/example_outputs/default/Residential/Capacity/2050.csv
@@ -1,11 +1,11 @@
-asset,year,region,installed,technology,capacity
-2,2050,R1,2040,heatpump,31.00000000000
-2,2054,R1,2040,heatpump,31.00000000000
-3,2050,R1,2045,heatpump,23.00000000000
-3,2054,R1,2045,heatpump,23.00000000000
-3,2055,R1,2045,heatpump,23.00000000000
-3,2059,R1,2045,heatpump,23.00000000000
-4,2055,R1,2050,heatpump,31.00000000000
-4,2059,R1,2050,heatpump,31.00000000000
-4,2060,R1,2050,heatpump,31.00000000000
-4,2064,R1,2050,heatpump,31.00000000000
+asset,year,region,technology,installed,capacity
+2,2050,R1,heatpump,2040,31.00000000000
+2,2054,R1,heatpump,2040,31.00000000000
+3,2050,R1,heatpump,2045,23.00000000000
+3,2054,R1,heatpump,2045,23.00000000000
+3,2055,R1,heatpump,2045,23.00000000000
+3,2059,R1,heatpump,2045,23.00000000000
+4,2055,R1,heatpump,2050,31.00000000000
+4,2059,R1,heatpump,2050,31.00000000000
+4,2060,R1,heatpump,2050,31.00000000000
+4,2064,R1,heatpump,2050,31.00000000000
diff --git a/tests/example_outputs/default/Residential/Supply/2020.csv b/tests/example_outputs/default/Residential/Supply/2020.csv
index a44059a3e..7b8c4061d 100644
--- a/tests/example_outputs/default/Residential/Supply/2020.csv
+++ b/tests/example_outputs/default/Residential/Supply/2020.csv
@@ -1,31 +1,31 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2020,0,R1,gasboiler,2020,all-year,all-week,night,1.00000000000
-0,heat,2025,0,R1,gasboiler,2020,all-year,all-week,night,0.27780000000
-0,heat,2025,1,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,night,64.71000000000
-0,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,night,17.97500000000
-1,heat,2020,0,R1,gasboiler,2020,all-year,all-week,morning,1.50000000000
-1,heat,2025,0,R1,gasboiler,2020,all-year,all-week,morning,0.41670000000
-1,heat,2025,1,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,morning,97.06500000000
-1,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,morning,26.96250000000
-2,heat,2020,0,R1,gasboiler,2020,all-year,all-week,afternoon,1.00000000000
-2,heat,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.27780000000
-2,heat,2025,1,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,afternoon,64.71000000000
-2,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,17.97500000000
-3,heat,2020,0,R1,gasboiler,2020,all-year,all-week,early-peak,1.50000000000
-3,heat,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.41670000000
-3,heat,2025,1,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,early-peak,97.06500000000
-3,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,26.96250000000
-4,heat,2020,0,R1,gasboiler,2020,all-year,all-week,late-peak,3.00000000000
-4,heat,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,0.83330000000
-4,heat,2025,1,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,late-peak,194.13000000000
-4,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,53.92500000000
-5,heat,2020,0,R1,gasboiler,2020,all-year,all-week,evening,2.00000000000
-5,heat,2025,0,R1,gasboiler,2020,all-year,all-week,evening,0.55560000000
-5,heat,2025,1,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,evening,129.42000000000
-5,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,evening,35.95000000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,1.00000000000
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,64.71000000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/tests/example_outputs/default/Residential/Supply/2025.csv b/tests/example_outputs/default/Residential/Supply/2025.csv
index c9ed8c00b..bfe116d0b 100644
--- a/tests/example_outputs/default/Residential/Supply/2025.csv
+++ b/tests/example_outputs/default/Residential/Supply/2025.csv
@@ -1,43 +1,43 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2025,0,R1,gasboiler,2020,all-year,all-week,night,0.27780000000
-0,heat,2025,2,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,heat,2030,1,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2030,2,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,heat,2030,3,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,night,17.97500000000
-0,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-1,heat,2025,0,R1,gasboiler,2020,all-year,all-week,morning,0.41670000000
-1,heat,2025,2,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,heat,2030,1,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2030,2,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,heat,2030,3,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,morning,26.96250000000
-1,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-2,heat,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.27780000000
-2,heat,2025,2,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,heat,2030,1,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2030,2,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,heat,2030,3,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,17.97500000000
-2,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-3,heat,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.41670000000
-3,heat,2025,2,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,heat,2030,1,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2030,2,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,heat,2030,3,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,26.96250000000
-3,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-4,heat,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,0.83330000000
-4,heat,2025,2,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,heat,2030,1,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2030,2,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,heat,2030,3,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,53.92500000000
-4,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-5,heat,2025,0,R1,gasboiler,2020,all-year,all-week,evening,0.55560000000
-5,heat,2025,2,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,heat,2030,1,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2030,2,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,heat,2030,3,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,evening,35.95000000000
-5,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+0,heat,2025,2,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,3,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+1,heat,2025,2,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,3,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+2,heat,2025,2,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,3,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+3,heat,2025,2,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,3,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+4,heat,2025,2,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,3,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+5,heat,2025,2,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,3,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
diff --git a/tests/example_outputs/default/Residential/Supply/2030.csv b/tests/example_outputs/default/Residential/Supply/2030.csv
index 61ae11982..82873caab 100644
--- a/tests/example_outputs/default/Residential/Supply/2030.csv
+++ b/tests/example_outputs/default/Residential/Supply/2030.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2030,0,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2030,1,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,heat,2030,2,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,heat,2035,0,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2035,2,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,heat,2035,3,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-0,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-1,heat,2030,0,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2030,1,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,heat,2030,2,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,heat,2035,0,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2035,2,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,heat,2035,3,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-1,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-2,heat,2030,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2030,1,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,heat,2030,2,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,heat,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2035,2,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,heat,2035,3,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-2,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-3,heat,2030,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2030,1,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,heat,2030,2,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,heat,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2035,2,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,heat,2035,3,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-3,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-4,heat,2030,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2030,1,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,heat,2030,2,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,heat,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2035,2,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,heat,2035,3,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-4,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-5,heat,2030,0,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2030,1,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,heat,2030,2,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,heat,2035,0,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2035,2,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,heat,2035,3,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
-5,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,CO2f,2030,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,CO2f,2030,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,CO2f,2030,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,CO2f,2030,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,CO2f,2030,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,CO2f,2030,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
diff --git a/tests/example_outputs/default/Residential/Supply/2035.csv b/tests/example_outputs/default/Residential/Supply/2035.csv
index 89e0bd4e1..741ea3c65 100644
--- a/tests/example_outputs/default/Residential/Supply/2035.csv
+++ b/tests/example_outputs/default/Residential/Supply/2035.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2035,0,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2035,2,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,heat,2035,3,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,heat,2040,1,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2040,3,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,heat,2040,4,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-0,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-1,heat,2035,0,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2035,2,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,heat,2035,3,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,heat,2040,1,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2040,3,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,heat,2040,4,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-1,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-2,heat,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2035,2,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,heat,2035,3,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,heat,2040,1,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2040,3,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,heat,2040,4,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-2,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-3,heat,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2035,2,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,heat,2035,3,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,heat,2040,1,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2040,3,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,heat,2040,4,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-3,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-4,heat,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2035,2,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,heat,2035,3,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,heat,2040,1,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2040,3,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,heat,2040,4,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-4,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-5,heat,2035,0,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2035,2,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,heat,2035,3,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,heat,2040,1,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2040,3,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,heat,2040,4,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
-5,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,1,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+0,CO2f,2040,1,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,1,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+1,CO2f,2040,1,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,1,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+2,CO2f,2040,1,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,1,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+3,CO2f,2040,1,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,1,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+4,CO2f,2040,1,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,1,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
+5,CO2f,2040,1,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/tests/example_outputs/default/Residential/Supply/2040.csv b/tests/example_outputs/default/Residential/Supply/2040.csv
index 663e47a5a..c802f3409 100644
--- a/tests/example_outputs/default/Residential/Supply/2040.csv
+++ b/tests/example_outputs/default/Residential/Supply/2040.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2040,0,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2040,1,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,heat,2040,2,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,heat,2045,0,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2045,2,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,heat,2045,3,R1,heatpump,2040,all-year,all-week,night,1.72220000000
-0,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-0,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-1,heat,2040,0,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2040,1,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,heat,2040,2,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,heat,2045,0,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2045,2,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,heat,2045,3,R1,heatpump,2040,all-year,all-week,morning,2.58330000000
-1,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-1,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-2,heat,2040,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2040,1,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,heat,2040,2,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,heat,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2045,2,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,heat,2045,3,R1,heatpump,2040,all-year,all-week,afternoon,1.72220000000
-2,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-2,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-3,heat,2040,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2040,1,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,heat,2040,2,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,heat,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2045,2,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,heat,2045,3,R1,heatpump,2040,all-year,all-week,early-peak,2.58330000000
-3,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-3,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-4,heat,2040,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2040,1,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,heat,2040,2,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,heat,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2045,2,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,heat,2045,3,R1,heatpump,2040,all-year,all-week,late-peak,5.16670000000
-4,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-4,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-5,heat,2040,0,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2040,1,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,heat,2040,2,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,heat,2045,0,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2045,2,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,heat,2045,3,R1,heatpump,2040,all-year,all-week,evening,3.44440000000
-5,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
-5,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2040,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2040,1,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,2,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,heat,2045,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2045,2,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,CO2f,2040,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+0,CO2f,2045,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+1,heat,2040,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2040,1,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,heat,2045,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2045,2,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,CO2f,2040,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+1,CO2f,2045,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+2,heat,2040,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2040,1,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,heat,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2045,2,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,CO2f,2040,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+2,CO2f,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+3,heat,2040,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2040,1,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,heat,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2045,2,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,CO2f,2040,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+3,CO2f,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+4,heat,2040,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2040,1,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,heat,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2045,2,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,CO2f,2040,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+4,CO2f,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+5,heat,2040,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2040,1,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,heat,2045,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2045,2,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,CO2f,2040,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
+5,CO2f,2045,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/tests/example_outputs/default/Residential/Supply/2045.csv b/tests/example_outputs/default/Residential/Supply/2045.csv
index 6e2884e67..c7be86b20 100644
--- a/tests/example_outputs/default/Residential/Supply/2045.csv
+++ b/tests/example_outputs/default/Residential/Supply/2045.csv
@@ -1,37 +1,37 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2045,0,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2045,1,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,heat,2045,2,R1,heatpump,2040,all-year,all-week,night,1.72220000000
-0,heat,2050,2,R1,heatpump,2040,all-year,all-week,night,1.72220000000
-0,heat,2050,3,R1,heatpump,2045,all-year,all-week,night,1.27780000000
-0,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-1,heat,2045,0,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2045,1,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,heat,2045,2,R1,heatpump,2040,all-year,all-week,morning,2.58330000000
-1,heat,2050,2,R1,heatpump,2040,all-year,all-week,morning,2.58330000000
-1,heat,2050,3,R1,heatpump,2045,all-year,all-week,morning,1.91670000000
-1,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-2,heat,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2045,1,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,heat,2045,2,R1,heatpump,2040,all-year,all-week,afternoon,1.72220000000
-2,heat,2050,2,R1,heatpump,2040,all-year,all-week,afternoon,1.72220000000
-2,heat,2050,3,R1,heatpump,2045,all-year,all-week,afternoon,1.27780000000
-2,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-3,heat,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2045,1,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,heat,2045,2,R1,heatpump,2040,all-year,all-week,early-peak,2.58330000000
-3,heat,2050,2,R1,heatpump,2040,all-year,all-week,early-peak,2.58330000000
-3,heat,2050,3,R1,heatpump,2045,all-year,all-week,early-peak,1.91670000000
-3,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-4,heat,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2045,1,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,heat,2045,2,R1,heatpump,2040,all-year,all-week,late-peak,5.16670000000
-4,heat,2050,2,R1,heatpump,2040,all-year,all-week,late-peak,5.16670000000
-4,heat,2050,3,R1,heatpump,2045,all-year,all-week,late-peak,3.83330000000
-4,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-5,heat,2045,0,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2045,1,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,heat,2045,2,R1,heatpump,2040,all-year,all-week,evening,3.44440000000
-5,heat,2050,2,R1,heatpump,2040,all-year,all-week,evening,3.44440000000
-5,heat,2050,3,R1,heatpump,2045,all-year,all-week,evening,2.55560000000
-5,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2045,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2045,1,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,heat,2045,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,CO2f,2045,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+1,heat,2045,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2045,1,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,heat,2045,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,CO2f,2045,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+2,heat,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2045,1,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,heat,2045,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,CO2f,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+3,heat,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2045,1,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,heat,2045,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,CO2f,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+4,heat,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2045,1,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,heat,2045,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,CO2f,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+5,heat,2045,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2045,1,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,heat,2045,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,CO2f,2045,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/tests/example_outputs/default/Residential/Supply/2050.csv b/tests/example_outputs/default/Residential/Supply/2050.csv
index 61004cae8..8c1871538 100644
--- a/tests/example_outputs/default/Residential/Supply/2050.csv
+++ b/tests/example_outputs/default/Residential/Supply/2050.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,heat,2050,2,R1,2040,heatpump,all-year,all-week,night,1.72220000000
-0,heat,2050,3,R1,2045,heatpump,all-year,all-week,night,1.27780000000
-0,heat,2055,3,R1,2045,heatpump,all-year,all-week,night,1.27780000000
-0,heat,2055,4,R1,2050,heatpump,all-year,all-week,night,1.72220000000
-1,heat,2050,2,R1,2040,heatpump,all-year,all-week,morning,2.58330000000
-1,heat,2050,3,R1,2045,heatpump,all-year,all-week,morning,1.91670000000
-1,heat,2055,3,R1,2045,heatpump,all-year,all-week,morning,1.91670000000
-1,heat,2055,4,R1,2050,heatpump,all-year,all-week,morning,2.58330000000
-2,heat,2050,2,R1,2040,heatpump,all-year,all-week,afternoon,1.72220000000
-2,heat,2050,3,R1,2045,heatpump,all-year,all-week,afternoon,1.27780000000
-2,heat,2055,3,R1,2045,heatpump,all-year,all-week,afternoon,1.27780000000
-2,heat,2055,4,R1,2050,heatpump,all-year,all-week,afternoon,1.72220000000
-3,heat,2050,2,R1,2040,heatpump,all-year,all-week,early-peak,2.58330000000
-3,heat,2050,3,R1,2045,heatpump,all-year,all-week,early-peak,1.91670000000
-3,heat,2055,3,R1,2045,heatpump,all-year,all-week,early-peak,1.91670000000
-3,heat,2055,4,R1,2050,heatpump,all-year,all-week,early-peak,2.58330000000
-4,heat,2050,2,R1,2040,heatpump,all-year,all-week,late-peak,5.16670000000
-4,heat,2050,3,R1,2045,heatpump,all-year,all-week,late-peak,3.83330000000
-4,heat,2055,3,R1,2045,heatpump,all-year,all-week,late-peak,3.83330000000
-4,heat,2055,4,R1,2050,heatpump,all-year,all-week,late-peak,5.16670000000
-5,heat,2050,2,R1,2040,heatpump,all-year,all-week,evening,3.44440000000
-5,heat,2050,3,R1,2045,heatpump,all-year,all-week,evening,2.55560000000
-5,heat,2055,3,R1,2045,heatpump,all-year,all-week,evening,2.55560000000
-5,heat,2055,4,R1,2050,heatpump,all-year,all-week,evening,3.44440000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2050,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,4,R1,all-year,all-week,night,heatpump,2050,1.72220000000
+1,heat,2050,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,4,R1,all-year,all-week,morning,heatpump,2050,2.58330000000
+2,heat,2050,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,4,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
+3,heat,2050,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,4,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
+4,heat,2050,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,4,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
+5,heat,2050,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,4,R1,all-year,all-week,evening,heatpump,2050,3.44440000000
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv
index 371cd8eab..c62b307ba 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2020.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gassupply1,15.00000000000
-0,2025,R1,2020,gassupply1,17.57780000000
-0,2030,R1,2020,gassupply1,10.07780000000
-0,2035,R1,2020,gassupply1,2.57780000000
-0,2040,R1,2020,gassupply1,2.57780000000
-0,2045,R1,2020,gassupply1,2.57780000000
-0,2050,R1,2020,gassupply1,2.57780000000
-0,2059,R1,2020,gassupply1,2.57780000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,17.57780000000
+0,2030,R1,gassupply1,2020,10.07780000000
+0,2035,R1,gassupply1,2020,2.57780000000
+0,2040,R1,gassupply1,2020,2.57780000000
+0,2045,R1,gassupply1,2020,2.57780000000
+0,2050,R1,gassupply1,2020,2.57780000000
+0,2059,R1,gassupply1,2020,2.57780000000
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2025.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2025.csv
index 2afc1e474..5faecc715 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2025.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2025.csv
@@ -1,8 +1,8 @@
-asset,year,region,installed,technology,capacity
-0,2025,R1,2020,gassupply1,17.57780000000
-0,2030,R1,2020,gassupply1,10.07780000000
-0,2035,R1,2020,gassupply1,2.57780000000
-0,2040,R1,2020,gassupply1,2.57780000000
-0,2045,R1,2020,gassupply1,2.57780000000
-0,2050,R1,2020,gassupply1,2.57780000000
-0,2059,R1,2020,gassupply1,2.57780000000
+asset,year,region,technology,installed,capacity
+0,2025,R1,gassupply1,2020,17.57780000000
+0,2030,R1,gassupply1,2020,10.07780000000
+0,2035,R1,gassupply1,2020,2.57780000000
+0,2040,R1,gassupply1,2020,2.57780000000
+0,2045,R1,gassupply1,2020,2.57780000000
+0,2050,R1,gassupply1,2020,2.57780000000
+0,2059,R1,gassupply1,2020,2.57780000000
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv
index 3ebe19987..9b16b8eaa 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2030.csv
@@ -1,14 +1,14 @@
-asset,year,region,installed,technology,capacity
-0,2030,R1,2020,gassupply1,10.07780000000
-0,2035,R1,2020,gassupply1,2.57780000000
-0,2040,R1,2020,gassupply1,2.57780000000
-0,2045,R1,2020,gassupply1,2.57780000000
-0,2050,R1,2020,gassupply1,2.57780000000
-0,2059,R1,2020,gassupply1,2.57780000000
-1,2035,R1,2030,gassupply1,2.70670000000
-1,2040,R1,2030,gassupply1,2.70670000000
-1,2045,R1,2030,gassupply1,2.70670000000
-1,2050,R1,2030,gassupply1,2.70670000000
-1,2059,R1,2030,gassupply1,2.70670000000
-1,2060,R1,2030,gassupply1,2.70670000000
-1,2069,R1,2030,gassupply1,2.70670000000
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,10.07780000000
+0,2035,R1,gassupply1,2020,2.57780000000
+0,2040,R1,gassupply1,2020,2.57780000000
+0,2045,R1,gassupply1,2020,2.57780000000
+0,2050,R1,gassupply1,2020,2.57780000000
+0,2059,R1,gassupply1,2020,2.57780000000
+1,2035,R1,gassupply1,2030,2.70670000000
+1,2040,R1,gassupply1,2030,2.70670000000
+1,2045,R1,gassupply1,2030,2.70670000000
+1,2050,R1,gassupply1,2030,2.70670000000
+1,2059,R1,gassupply1,2030,2.70670000000
+1,2060,R1,gassupply1,2030,2.70670000000
+1,2069,R1,gassupply1,2030,2.70670000000
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2035.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2035.csv
index 882acc455..b9161b886 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2035.csv
@@ -1,13 +1,13 @@
-asset,year,region,installed,technology,capacity
-0,2035,R1,2020,gassupply1,2.57780000000
-0,2040,R1,2020,gassupply1,2.57780000000
-0,2045,R1,2020,gassupply1,2.57780000000
-0,2050,R1,2020,gassupply1,2.57780000000
-0,2059,R1,2020,gassupply1,2.57780000000
-1,2035,R1,2030,gassupply1,2.70670000000
-1,2040,R1,2030,gassupply1,2.70670000000
-1,2045,R1,2030,gassupply1,2.70670000000
-1,2050,R1,2030,gassupply1,2.70670000000
-1,2059,R1,2030,gassupply1,2.70670000000
-1,2060,R1,2030,gassupply1,2.70670000000
-1,2069,R1,2030,gassupply1,2.70670000000
+asset,year,region,technology,installed,capacity
+0,2035,R1,gassupply1,2020,2.57780000000
+0,2040,R1,gassupply1,2020,2.57780000000
+0,2045,R1,gassupply1,2020,2.57780000000
+0,2050,R1,gassupply1,2020,2.57780000000
+0,2059,R1,gassupply1,2020,2.57780000000
+1,2035,R1,gassupply1,2030,2.70670000000
+1,2040,R1,gassupply1,2030,2.70670000000
+1,2045,R1,gassupply1,2030,2.70670000000
+1,2050,R1,gassupply1,2030,2.70670000000
+1,2059,R1,gassupply1,2030,2.70670000000
+1,2060,R1,gassupply1,2030,2.70670000000
+1,2069,R1,gassupply1,2030,2.70670000000
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2040.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2040.csv
index 9512c0de3..6e2627f0b 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2040.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2040.csv
@@ -1,11 +1,11 @@
-asset,year,region,installed,technology,capacity
-0,2040,R1,2020,gassupply1,2.57780000000
-0,2045,R1,2020,gassupply1,2.57780000000
-0,2050,R1,2020,gassupply1,2.57780000000
-0,2059,R1,2020,gassupply1,2.57780000000
-1,2040,R1,2030,gassupply1,2.70670000000
-1,2045,R1,2030,gassupply1,2.70670000000
-1,2050,R1,2030,gassupply1,2.70670000000
-1,2059,R1,2030,gassupply1,2.70670000000
-1,2060,R1,2030,gassupply1,2.70670000000
-1,2069,R1,2030,gassupply1,2.70670000000
+asset,year,region,technology,installed,capacity
+0,2040,R1,gassupply1,2020,2.57780000000
+0,2045,R1,gassupply1,2020,2.57780000000
+0,2050,R1,gassupply1,2020,2.57780000000
+0,2059,R1,gassupply1,2020,2.57780000000
+1,2040,R1,gassupply1,2030,2.70670000000
+1,2045,R1,gassupply1,2030,2.70670000000
+1,2050,R1,gassupply1,2030,2.70670000000
+1,2059,R1,gassupply1,2030,2.70670000000
+1,2060,R1,gassupply1,2030,2.70670000000
+1,2069,R1,gassupply1,2030,2.70670000000
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2045.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2045.csv
index 33eaf0618..3d6112660 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2045.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2045.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-0,2045,R1,2020,gassupply1,2.57780000000
-0,2050,R1,2020,gassupply1,2.57780000000
-0,2059,R1,2020,gassupply1,2.57780000000
-1,2045,R1,2030,gassupply1,2.70670000000
-1,2050,R1,2030,gassupply1,2.70670000000
-1,2059,R1,2030,gassupply1,2.70670000000
-1,2060,R1,2030,gassupply1,2.70670000000
-1,2069,R1,2030,gassupply1,2.70670000000
+asset,year,region,technology,installed,capacity
+0,2045,R1,gassupply1,2020,2.57780000000
+0,2050,R1,gassupply1,2020,2.57780000000
+0,2059,R1,gassupply1,2020,2.57780000000
+1,2045,R1,gassupply1,2030,2.70670000000
+1,2050,R1,gassupply1,2030,2.70670000000
+1,2059,R1,gassupply1,2030,2.70670000000
+1,2060,R1,gassupply1,2030,2.70670000000
+1,2069,R1,gassupply1,2030,2.70670000000
diff --git a/tests/example_outputs/default_timeslice/Gas/Capacity/2050.csv b/tests/example_outputs/default_timeslice/Gas/Capacity/2050.csv
index c90019967..36035897c 100644
--- a/tests/example_outputs/default_timeslice/Gas/Capacity/2050.csv
+++ b/tests/example_outputs/default_timeslice/Gas/Capacity/2050.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-0,2050,R1,2020,gassupply1,2.57780000000
-0,2055,R1,2020,gassupply1,2.57780000000
-0,2059,R1,2020,gassupply1,2.57780000000
-1,2050,R1,2030,gassupply1,2.70670000000
-1,2055,R1,2030,gassupply1,2.70670000000
-1,2059,R1,2030,gassupply1,2.70670000000
-1,2060,R1,2030,gassupply1,2.70670000000
-1,2069,R1,2030,gassupply1,2.70670000000
+asset,year,region,technology,installed,capacity
+0,2050,R1,gassupply1,2020,2.57780000000
+0,2055,R1,gassupply1,2020,2.57780000000
+0,2059,R1,gassupply1,2020,2.57780000000
+1,2050,R1,gassupply1,2030,2.70670000000
+1,2055,R1,gassupply1,2030,2.70670000000
+1,2059,R1,gassupply1,2030,2.70670000000
+1,2060,R1,gassupply1,2030,2.70670000000
+1,2069,R1,gassupply1,2030,2.70670000000
diff --git a/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv b/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv
index 3013fe141..69eb3a4f7 100644
--- a/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv
+++ b/tests/example_outputs/default_timeslice/MCAMetric_Consumption.csv
@@ -1,229 +1,229 @@
 agent,asset,category,comm_usage,commodity,consumption,dst_region,index,installed,region,sector,technology,timeslice,units_prices,year
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.16000000000,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.74000000000,R1,9,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.16000000000,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.74000000000,R1,25,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,3.48000000000,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,2.32000000000,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.32222222222,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R1,4,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.48333333333,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R1,20,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.32222222222,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R1,36,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.48333333333,R1,49,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R1,52,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.96666666667,R1,65,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.26666666667,R1,68,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.64444444444,R1,81,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.84444444444,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.33576719577,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22116402116,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50365079365,R1,13,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33174603175,R1,19,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.33576719577,R1,25,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22116402116,R1,31,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.50365079365,R1,37,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33174603175,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,1.00730158730,R1,49,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66349206349,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.67153439153,R1,61,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.44232804233,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R1,0,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.26422222222,R1,5,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15333333333,R1,8,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R1,16,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.39633333333,R1,21,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.23000000000,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.42222222222,R1,32,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.26422222222,R1,37,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15333333333,R1,40,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.63333333333,R1,48,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.39633333333,R1,53,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.23000000000,R1,56,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.26666666667,R1,64,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.79266666667,R1,69,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.46000000000,R1,72,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.84444444444,R1,80,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.52844444444,R1,85,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30666666667,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.23951240017,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33604315539,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.35926860025,R1,15,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.50406473308,R1,19,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.23951240017,R1,27,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33604315539,R1,31,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.35926860025,R1,39,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.50406473308,R1,43,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.71853720050,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,1.00812946616,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.47902480034,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.67208631077,R1,67,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.26422222222,R1,1,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15333333333,R1,4,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,8,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.39633333333,R1,21,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.23000000000,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R1,28,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.26422222222,R1,41,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.15333333333,R1,44,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.39633333333,R1,61,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.23000000000,R1,64,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R1,68,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.79266666667,R1,81,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.46000000000,R1,84,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.66666666667,R1,88,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.52844444444,R1,101,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.30666666667,R1,104,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.11111111111,R1,108,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.18011035545,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25270028658,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.27607824686,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.27016553317,R1,19,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.37905042987,R1,23,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.41411737029,R1,27,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.18011035545,R1,35,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25270028658,R1,39,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.27607824686,R1,43,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.27016553317,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.37905042987,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.41411737029,R1,59,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.54033106634,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.75810085975,R1,71,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.82823474058,R1,75,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.36022071089,R1,83,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.50540057316,R1,87,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.55215649372,R1,91,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,0,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05864444444,R1,5,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.35755555556,R1,8,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R1,16,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08796666667,R1,21,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.53633333333,R1,24,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.55555555556,R1,32,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05864444444,R1,37,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.35755555556,R1,40,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.83333333333,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08796666667,R1,53,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.53633333333,R1,56,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.66666666667,R1,64,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17593333333,R1,69,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.07266666667,R1,72,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.11111111111,R1,80,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11728888889,R1,85,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.71511111111,R1,88,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.15824641356,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22202451357,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24256457836,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.29027560563,R1,15,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.23736962033,R1,23,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33303677035,R1,27,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.36384686753,R1,31,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.43541340845,R1,35,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.15824641356,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.22202451357,R1,47,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24256457836,R1,51,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.29027560563,R1,55,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.23736962033,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.33303677035,R1,67,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.36384686753,R1,71,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.43541340845,R1,75,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.47473924067,R1,83,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.66607354070,R1,87,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.72769373507,R1,91,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.87082681690,R1,95,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.31649282711,R1,103,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.44404902713,R1,107,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.48512915671,R1,111,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.58055121127,R1,115,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05864444444,R1,1,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.35755555556,R1,4,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R1,8,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08796666667,R1,17,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.53633333333,R1,20,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R1,24,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.05864444444,R1,33,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.35755555556,R1,36,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R1,40,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.08796666667,R1,49,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.53633333333,R1,52,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R1,56,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.17593333333,R1,65,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.07266666667,R1,68,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,2.06666666667,R1,72,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,gas,0.11728888889,R1,81,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.71511111111,R1,84,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.37777777778,R1,88,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13656827502,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19160942829,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.20933571449,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25051081949,R1,15,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25842020716,R1,19,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.20485241253,R1,27,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.28741414243,R1,31,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.31400357173,R1,35,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.37576622924,R1,39,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.38763031074,R1,43,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.13656827502,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19160942829,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.20933571449,R1,59,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25051081949,R1,63,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25842020716,R1,67,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.20485241253,R1,75,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.28741414243,R1,79,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.31400357173,R1,83,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.37576622924,R1,87,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.38763031074,R1,91,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.40970482506,R1,99,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.57482828486,R1,103,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.62800714346,R1,107,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.75153245848,R1,111,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.77526062148,R1,115,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.27313655004,R1,123,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.38321885657,R1,127,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.41867142897,R1,131,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.50102163899,R1,135,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.51684041432,R1,139,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R1,0,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51111111111,R1,4,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R1,12,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.76666666667,R1,16,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.68888888889,R1,24,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.51111111111,R1,28,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.03333333333,R1,36,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,0.76666666667,R1,40,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,2.06666666667,R1,48,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.53333333333,R1,52,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.37777777778,R1,60,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,electricity,1.02222222222,R1,64,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19078573323,R1,3,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.20843581726,R1,7,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24943391777,R1,11,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25730930438,R1,15,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.29403522736,R1,19,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.28617859985,R1,27,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.31265372589,R1,31,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.37415087666,R1,35,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.38596395657,R1,39,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.44105284104,R1,43,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.19078573323,R1,51,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.20843581726,R1,55,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.24943391777,R1,59,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.25730930438,R1,63,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.29403522736,R1,67,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.28617859985,R1,75,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.31265372589,R1,79,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.37415087666,R1,83,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.38596395657,R1,87,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.44105284104,R1,91,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.57235719969,R1,99,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.62530745179,R1,103,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.74830175331,R1,107,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.77192791314,R1,111,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.88210568207,R1,115,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.38157146646,R1,123,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.41687163452,R1,127,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.49886783554,R1,131,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.51461860876,R1,135,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|CONSUMABLE,wind,0.58807045471,R1,139,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,R1,9,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.16000000000,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.74000000000,R1,25,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,3.48000000000,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,2.32000000000,R1,41,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,R1,1,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,4,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,R1,17,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,20,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.32222222222,R1,33,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,36,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.48333333333,R1,49,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,52,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.96666666667,R1,65,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,R1,68,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.64444444444,R1,81,2020.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,R1,84,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,R1,1,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,R1,7,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,R1,13,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,R1,19,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.33576719577,R1,25,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22116402116,R1,31,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.50365079365,R1,37,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33174603175,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,1.00730158730,R1,49,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.66349206349,R1,55,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.67153439153,R1,61,2020.00000000000,R1,power,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.44232804233,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,0,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,R1,5,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,R1,8,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,16,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,R1,21,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.42222222222,R1,32,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,R1,37,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,R1,40,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.63333333333,R1,48,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,R1,53,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,R1,56,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.26666666667,R1,64,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,R1,69,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,R1,72,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.84444444444,R1,80,2020.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,R1,85,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,R1,88,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.23951240017,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33604315539,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.35926860025,R1,15,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.50406473308,R1,19,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.23951240017,R1,27,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33604315539,R1,31,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.35926860025,R1,39,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.50406473308,R1,43,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.71853720050,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,1.00812946616,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.47902480034,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.67208631077,R1,67,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,R1,1,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,R1,4,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,R1,8,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,R1,21,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,R1,24,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,R1,28,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.26422222222,R1,41,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.15333333333,R1,44,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.39633333333,R1,61,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.23000000000,R1,64,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,R1,68,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.79266666667,R1,81,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.46000000000,R1,84,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,R1,88,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.52844444444,R1,101,2025.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.30666666667,R1,104,2025.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,R1,108,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.18011035545,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25270028658,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.27607824686,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.27016553317,R1,19,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37905042987,R1,23,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.41411737029,R1,27,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.18011035545,R1,35,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25270028658,R1,39,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.27607824686,R1,43,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.27016553317,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37905042987,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.41411737029,R1,59,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.54033106634,R1,67,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.75810085975,R1,71,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.82823474058,R1,75,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.36022071089,R1,83,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.50540057316,R1,87,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.55215649372,R1,91,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,R1,0,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,R1,5,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,R1,8,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,R1,16,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,R1,21,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,R1,24,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.55555555556,R1,32,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,R1,37,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,R1,40,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.83333333333,R1,48,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,R1,53,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,R1,56,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.66666666667,R1,64,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,R1,69,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,R1,72,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.11111111111,R1,80,2030.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,R1,85,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,R1,88,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15824641356,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22202451357,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24256457836,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.29027560563,R1,15,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.23736962033,R1,23,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33303677035,R1,27,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.36384686753,R1,31,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.43541340845,R1,35,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.15824641356,R1,43,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.22202451357,R1,47,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24256457836,R1,51,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.29027560563,R1,55,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.23736962033,R1,63,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.33303677035,R1,67,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.36384686753,R1,71,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.43541340845,R1,75,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.47473924067,R1,83,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.66607354070,R1,87,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.72769373507,R1,91,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.87082681690,R1,95,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.31649282711,R1,103,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.44404902713,R1,107,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.48512915671,R1,111,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.58055121127,R1,115,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,R1,1,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,R1,4,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,R1,8,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,R1,17,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,R1,20,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,R1,24,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.05864444444,R1,33,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.35755555556,R1,36,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,R1,40,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.08796666667,R1,49,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.53633333333,R1,52,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,R1,56,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.17593333333,R1,65,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.07266666667,R1,68,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,R1,72,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,gas,0.11728888889,R1,81,2035.00000000000,R1,residential,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.71511111111,R1,84,2035.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,R1,88,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.13656827502,R1,3,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.19160942829,R1,7,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20933571449,R1,11,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25051081949,R1,15,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25842020716,R1,19,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20485241253,R1,27,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.28741414243,R1,31,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.31400357173,R1,35,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37576622924,R1,39,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.38763031074,R1,43,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.13656827502,R1,51,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.19160942829,R1,55,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20933571449,R1,59,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25051081949,R1,63,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25842020716,R1,67,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20485241253,R1,75,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.28741414243,R1,79,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.31400357173,R1,83,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37576622924,R1,87,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.38763031074,R1,91,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.40970482506,R1,99,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.57482828486,R1,103,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.62800714346,R1,107,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.75153245848,R1,111,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.77526062148,R1,115,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.27313655004,R1,123,2020.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.38321885657,R1,127,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.41867142897,R1,131,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.50102163899,R1,135,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.51684041432,R1,139,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,R1,0,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,R1,4,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,R1,12,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,R1,16,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.68888888889,R1,24,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.51111111111,R1,28,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.03333333333,R1,36,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,0.76666666667,R1,40,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,2.06666666667,R1,48,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.53333333333,R1,52,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.37777777778,R1,60,2040.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,electricity,1.02222222222,R1,64,2045.00000000000,R1,residential,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.19078573323,R1,3,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20843581726,R1,7,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24943391777,R1,11,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25730930438,R1,15,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.29403522736,R1,19,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.28617859985,R1,27,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.31265372589,R1,31,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37415087666,R1,35,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.38596395657,R1,39,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.44105284104,R1,43,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.19078573323,R1,51,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.20843581726,R1,55,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.24943391777,R1,59,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.25730930438,R1,63,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.29403522736,R1,67,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.28617859985,R1,75,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.31265372589,R1,79,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.37415087666,R1,83,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.38596395657,R1,87,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.44105284104,R1,91,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.57235719969,R1,99,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.62530745179,R1,103,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.74830175331,R1,107,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.77192791314,R1,111,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.88210568207,R1,115,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2050.00000000000
+A1,0.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.38157146646,R1,123,2025.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,1.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.41687163452,R1,127,2030.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,2.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.49886783554,R1,131,2035.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,3.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.51461860876,R1,135,2040.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
+A1,4.00000000000,retrofit,CONSUMABLE|ENERGY,wind,0.58807045471,R1,139,2045.00000000000,R1,power,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2050.00000000000
diff --git a/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv b/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv
index b289c102a..0f6d4a88a 100644
--- a/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv
+++ b/tests/example_outputs/default_timeslice/MCAMetric_Supply.csv
@@ -1,325 +1,325 @@
 agent,asset,category,comm_usage,commodity,dst_region,index,installed,region,sector,supply,technology,timeslice,units_prices,year
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,4,2020.00000000000,R1,residential,1.00000000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,6,2020.00000000000,R1,residential,64.71000000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2020.00000000000,R1,residential,1.50000000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,14,2020.00000000000,R1,residential,97.06500000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,20,2020.00000000000,R1,residential,1.00000000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2020.00000000000,R1,residential,64.71000000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,28,2020.00000000000,R1,residential,1.50000000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,30,2020.00000000000,R1,residential,97.06500000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,36,2020.00000000000,R1,residential,3.00000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,38,2020.00000000000,R1,residential,194.13000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,44,2020.00000000000,R1,residential,2.00000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,46,2020.00000000000,R1,residential,129.42000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,1.76711378353,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2020.00000000000,R1,gas,2.12927844588,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,1.76711378353,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2020.00000000000,R1,gas,2.12927844588,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,3.21577243293,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2020.00000000000,R1,gas,2.49144310823,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2020.00000000000,R1,residential,0.83333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2020.00000000000,R1,residential,3.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,76,2020.00000000000,R1,residential,53.92500000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2020.00000000000,R1,residential,0.55555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2020.00000000000,R1,residential,35.95000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.20105820106,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2020.00000000000,R1,power,0.22116402116,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,6,2020.00000000000,R1,power,18.43100529101,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,12,2020.00000000000,R1,power,0.30158730159,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,13,2020.00000000000,R1,power,0.33174603175,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,18,2020.00000000000,R1,power,27.64650793651,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,24,2020.00000000000,R1,power,0.20105820106,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,25,2020.00000000000,R1,power,0.22116402116,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,30,2020.00000000000,R1,power,18.43100529101,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,36,2020.00000000000,R1,power,0.30158730159,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,37,2020.00000000000,R1,power,0.33174603175,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,42,2020.00000000000,R1,power,27.64650793651,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,48,2020.00000000000,R1,power,0.60317460317,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,49,2020.00000000000,R1,power,0.66349206349,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,54,2020.00000000000,R1,power,55.29301587302,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,60,2020.00000000000,R1,power,0.40211640212,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,61,2020.00000000000,R1,power,0.44232804233,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,66,2020.00000000000,R1,power,36.86201058201,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,1.99222222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2020.00000000000,R1,gas,2.15333333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,1.99222222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2020.00000000000,R1,gas,2.15333333333,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,2.63666666667,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2020.00000000000,R1,gas,2.31444444444,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,13,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,26,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,29,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,45,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,58,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,61,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2020.00000000000,R1,residential,3.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2025.00000000000,R1,residential,0.68333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2025.00000000000,R1,residential,1.15000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,77,2025.00000000000,R1,residential,44.21850000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2025.00000000000,R1,residential,0.45555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2025.00000000000,R1,residential,0.76666666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,93,2025.00000000000,R1,residential,29.47900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.23951240017,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2025.00000000000,R1,power,0.33604315539,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,12,2020.00000000000,R1,power,0.35926860025,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,13,2025.00000000000,R1,power,0.50406473308,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,24,2020.00000000000,R1,power,0.23951240017,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,25,2025.00000000000,R1,power,0.33604315539,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,36,2020.00000000000,R1,power,0.35926860025,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,37,2025.00000000000,R1,power,0.50406473308,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,48,2020.00000000000,R1,power,0.71853720050,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,49,2025.00000000000,R1,power,1.00812946616,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,60,2020.00000000000,R1,power,0.47902480034,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,61,2025.00000000000,R1,power,0.67208631077,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.26422222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,0.39633333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,0.26422222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,0.39633333333,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2020.00000000000,R1,gas,0.79266666667,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2020.00000000000,R1,gas,0.52844444444,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,11,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,12,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,15,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,32,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,35,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,50,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,51,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,52,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,55,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,70,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,71,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,75,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2025.00000000000,R1,residential,0.68333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,91,2025.00000000000,R1,residential,1.15000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,92,2030.00000000000,R1,residential,4.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,95,2025.00000000000,R1,residential,44.21850000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,110,2025.00000000000,R1,residential,0.45555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,111,2025.00000000000,R1,residential,0.76666666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,112,2030.00000000000,R1,residential,2.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,115,2025.00000000000,R1,residential,29.47900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.18011035545,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2025.00000000000,R1,power,0.25270028658,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2030.00000000000,R1,power,0.27607824686,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,16,2020.00000000000,R1,power,0.27016553317,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,17,2025.00000000000,R1,power,0.37905042987,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,18,2030.00000000000,R1,power,0.41411737029,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,32,2020.00000000000,R1,power,0.18011035545,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,33,2025.00000000000,R1,power,0.25270028658,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,34,2030.00000000000,R1,power,0.27607824686,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,48,2020.00000000000,R1,power,0.27016553317,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,49,2025.00000000000,R1,power,0.37905042987,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2030.00000000000,R1,power,0.41411737029,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,64,2020.00000000000,R1,power,0.54033106634,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,65,2025.00000000000,R1,power,0.75810085975,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,66,2030.00000000000,R1,power,0.82823474058,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,80,2020.00000000000,R1,power,0.36022071089,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,81,2025.00000000000,R1,power,0.50540057316,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,82,2030.00000000000,R1,power,0.55215649372,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.12888888889,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2030.00000000000,R1,gas,0.13533333333,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,0.19333333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2030.00000000000,R1,gas,0.20300000000,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,0.12888888889,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.13533333333,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,0.19333333333,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2030.00000000000,R1,gas,0.20300000000,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2020.00000000000,R1,gas,0.38666666667,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2030.00000000000,R1,gas,0.40600000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2020.00000000000,R1,gas,0.25777777778,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,11,2030.00000000000,R1,gas,0.27066666667,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,13,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,26,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,29,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,45,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,58,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,61,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2030.00000000000,R1,residential,4.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2035.00000000000,R1,residential,0.15166666667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2035.00000000000,R1,residential,2.68166666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,77,2035.00000000000,R1,residential,9.81435000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2030.00000000000,R1,residential,2.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2035.00000000000,R1,residential,0.10111111111,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2035.00000000000,R1,residential,1.78777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,93,2035.00000000000,R1,residential,6.54290000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.15824641356,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2025.00000000000,R1,power,0.22202451357,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2030.00000000000,R1,power,0.24256457836,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2035.00000000000,R1,power,0.29027560563,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,20,2020.00000000000,R1,power,0.23736962033,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,21,2025.00000000000,R1,power,0.33303677035,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,22,2030.00000000000,R1,power,0.36384686753,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,23,2035.00000000000,R1,power,0.43541340845,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,40,2020.00000000000,R1,power,0.15824641356,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,41,2025.00000000000,R1,power,0.22202451357,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,42,2030.00000000000,R1,power,0.24256457836,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,43,2035.00000000000,R1,power,0.29027560563,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,60,2020.00000000000,R1,power,0.23736962033,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,61,2025.00000000000,R1,power,0.33303677035,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,62,2030.00000000000,R1,power,0.36384686753,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,63,2035.00000000000,R1,power,0.43541340845,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,80,2020.00000000000,R1,power,0.47473924067,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,81,2025.00000000000,R1,power,0.66607354070,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,82,2030.00000000000,R1,power,0.72769373507,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,83,2035.00000000000,R1,power,0.87082681690,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,100,2020.00000000000,R1,power,0.31649282711,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,101,2025.00000000000,R1,power,0.44404902713,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,102,2030.00000000000,R1,power,0.48512915671,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,103,2035.00000000000,R1,power,0.58055121127,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.02860704607,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2030.00000000000,R1,gas,0.03003739837,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,0.04291056911,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2030.00000000000,R1,gas,0.04505609756,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,0.02860704607,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.03003739837,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,0.04291056911,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2030.00000000000,R1,gas,0.04505609756,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2020.00000000000,R1,gas,0.08582113821,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2030.00000000000,R1,gas,0.09011219512,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2020.00000000000,R1,gas,0.05721409214,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,11,2030.00000000000,R1,gas,0.06007479675,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,8,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,9,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,10,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,12,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,24,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,25,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,26,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,40,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,41,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,44,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,56,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,57,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,58,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,72,2035.00000000000,R1,residential,0.15166666667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,73,2035.00000000000,R1,residential,2.68166666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,74,2040.00000000000,R1,residential,5.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,76,2035.00000000000,R1,residential,9.81435000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,88,2035.00000000000,R1,residential,0.10111111111,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,89,2035.00000000000,R1,residential,1.78777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,90,2040.00000000000,R1,residential,3.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,92,2035.00000000000,R1,residential,6.54290000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2020.00000000000,R1,power,0.13656827502,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2025.00000000000,R1,power,0.19160942829,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2030.00000000000,R1,power,0.20933571449,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2035.00000000000,R1,power,0.25051081949,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2040.00000000000,R1,power,0.25842020716,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,24,2020.00000000000,R1,power,0.20485241253,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,25,2025.00000000000,R1,power,0.28741414243,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,26,2030.00000000000,R1,power,0.31400357173,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,27,2035.00000000000,R1,power,0.37576622924,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,28,2040.00000000000,R1,power,0.38763031074,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,48,2020.00000000000,R1,power,0.13656827502,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,49,2025.00000000000,R1,power,0.19160942829,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2030.00000000000,R1,power,0.20933571449,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,51,2035.00000000000,R1,power,0.25051081949,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,52,2040.00000000000,R1,power,0.25842020716,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,72,2020.00000000000,R1,power,0.20485241253,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,73,2025.00000000000,R1,power,0.28741414243,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,74,2030.00000000000,R1,power,0.31400357173,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2035.00000000000,R1,power,0.37576622924,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,76,2040.00000000000,R1,power,0.38763031074,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,96,2020.00000000000,R1,power,0.40970482506,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,97,2025.00000000000,R1,power,0.57482828486,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,98,2030.00000000000,R1,power,0.62800714346,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,99,2035.00000000000,R1,power,0.75153245848,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,100,2040.00000000000,R1,power,0.77526062148,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2020.00000000000,R1,power,0.27313655004,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2025.00000000000,R1,power,0.38321885657,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,122,2030.00000000000,R1,power,0.41867142897,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2035.00000000000,R1,power,0.50102163899,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,124,2040.00000000000,R1,power,0.51684041432,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,0,2020.00000000000,R1,gas,0.02860704607,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,1,2030.00000000000,R1,gas,0.03003739837,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,2,2020.00000000000,R1,gas,0.04291056911,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,3,2030.00000000000,R1,gas,0.04505609756,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,4,2020.00000000000,R1,gas,0.02860704607,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,5,2030.00000000000,R1,gas,0.03003739837,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,6,2020.00000000000,R1,gas,0.04291056911,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,7,2030.00000000000,R1,gas,0.04505609756,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,8,2020.00000000000,R1,gas,0.08582113821,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,9,2030.00000000000,R1,gas,0.09011219512,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,10,2020.00000000000,R1,gas,0.05721409214,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,gas,R1,11,2030.00000000000,R1,gas,0.06007479675,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,6,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,7,2045.00000000000,R1,residential,1.27777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,18,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,19,2045.00000000000,R1,residential,1.91666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,30,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,31,2045.00000000000,R1,residential,1.27777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,42,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,43,2045.00000000000,R1,residential,1.91666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,54,2040.00000000000,R1,residential,5.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,55,2045.00000000000,R1,residential,3.83333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,66,2040.00000000000,R1,residential,3.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,heat,R1,67,2045.00000000000,R1,residential,2.55555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,0,2025.00000000000,R1,power,0.19078573323,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,1,2030.00000000000,R1,power,0.20843581726,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,2,2035.00000000000,R1,power,0.24943391777,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,3,2040.00000000000,R1,power,0.25730930438,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,4,2045.00000000000,R1,power,0.29403522736,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,24,2025.00000000000,R1,power,0.28617859985,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,25,2030.00000000000,R1,power,0.31265372589,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,26,2035.00000000000,R1,power,0.37415087666,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,27,2040.00000000000,R1,power,0.38596395657,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,28,2045.00000000000,R1,power,0.44105284104,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,48,2025.00000000000,R1,power,0.19078573323,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,49,2030.00000000000,R1,power,0.20843581726,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,50,2035.00000000000,R1,power,0.24943391777,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,51,2040.00000000000,R1,power,0.25730930438,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,52,2045.00000000000,R1,power,0.29403522736,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,72,2025.00000000000,R1,power,0.28617859985,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,73,2030.00000000000,R1,power,0.31265372589,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,74,2035.00000000000,R1,power,0.37415087666,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,75,2040.00000000000,R1,power,0.38596395657,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,76,2045.00000000000,R1,power,0.44105284104,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,96,2025.00000000000,R1,power,0.57235719969,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,97,2030.00000000000,R1,power,0.62530745179,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,98,2035.00000000000,R1,power,0.74830175331,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,99,2040.00000000000,R1,power,0.77192791314,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,100,2045.00000000000,R1,power,0.88210568207,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
-A1,0.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,120,2025.00000000000,R1,power,0.38157146646,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,1.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,121,2030.00000000000,R1,power,0.41687163452,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,2.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,122,2035.00000000000,R1,power,0.49886783554,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,3.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,123,2040.00000000000,R1,power,0.51461860876,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
-A1,4.00000000000,retrofit,CommodityUsage.ENERGY|PRODUCT,electricity,R1,124,2045.00000000000,R1,power,0.58807045471,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,4,2020.00000000000,R1,residential,1.00000000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,6,2020.00000000000,R1,residential,64.71000000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,12,2020.00000000000,R1,residential,1.50000000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,14,2020.00000000000,R1,residential,97.06500000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,20,2020.00000000000,R1,residential,1.00000000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,22,2020.00000000000,R1,residential,64.71000000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,28,2020.00000000000,R1,residential,1.50000000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,30,2020.00000000000,R1,residential,97.06500000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,36,2020.00000000000,R1,residential,3.00000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,38,2020.00000000000,R1,residential,194.13000000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,44,2020.00000000000,R1,residential,2.00000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,46,2020.00000000000,R1,residential,129.42000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,1.76711378353,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2020.00000000000,R1,gas,2.12927844588,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,1.76711378353,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2020.00000000000,R1,gas,2.12927844588,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,3.21577243293,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2020.00000000000,R1,gas,2.49144310823,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2020.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,8,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,9,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,12,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,24,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,25,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,28,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,40,2020.00000000000,R1,residential,0.27777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,41,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,44,2020.00000000000,R1,residential,17.97500000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,56,2020.00000000000,R1,residential,0.41666666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,57,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,60,2020.00000000000,R1,residential,26.96250000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,72,2020.00000000000,R1,residential,0.83333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,73,2020.00000000000,R1,residential,3.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,76,2020.00000000000,R1,residential,53.92500000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2020.00000000000,R1,residential,0.55555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,89,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,92,2020.00000000000,R1,residential,35.95000000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.20105820106,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2020.00000000000,R1,power,0.22116402116,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,6,2020.00000000000,R1,power,18.43100529101,gasCCGT,"('all-year', 'all-week', 'night')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,12,2020.00000000000,R1,power,0.30158730159,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,13,2020.00000000000,R1,power,0.33174603175,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,18,2020.00000000000,R1,power,27.64650793651,gasCCGT,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,0.20105820106,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2020.00000000000,R1,power,0.22116402116,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,30,2020.00000000000,R1,power,18.43100529101,gasCCGT,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,36,2020.00000000000,R1,power,0.30158730159,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,37,2020.00000000000,R1,power,0.33174603175,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,42,2020.00000000000,R1,power,27.64650793651,gasCCGT,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.60317460317,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2020.00000000000,R1,power,0.66349206349,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,54,2020.00000000000,R1,power,55.29301587302,gasCCGT,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,0.40211640212,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,61,2020.00000000000,R1,power,0.44232804233,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,66,2020.00000000000,R1,power,36.86201058201,gasCCGT,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,1.99222222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2020.00000000000,R1,gas,2.15333333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,1.99222222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2020.00000000000,R1,gas,2.15333333333,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,2.63666666667,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2020.00000000000,R1,gas,2.31444444444,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2025.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,8,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,9,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,10,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,13,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,24,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,25,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,26,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,29,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,40,2020.00000000000,R1,residential,1.05555555556,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,41,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,42,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,45,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,56,2020.00000000000,R1,residential,1.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,57,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,58,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,61,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,72,2020.00000000000,R1,residential,3.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,73,2025.00000000000,R1,residential,0.68333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,74,2025.00000000000,R1,residential,1.15000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,77,2025.00000000000,R1,residential,44.21850000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2020.00000000000,R1,residential,2.11111111111,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,89,2025.00000000000,R1,residential,0.45555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,90,2025.00000000000,R1,residential,0.76666666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,93,2025.00000000000,R1,residential,29.47900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.23951240017,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2025.00000000000,R1,power,0.33604315539,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,12,2020.00000000000,R1,power,0.35926860025,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,13,2025.00000000000,R1,power,0.50406473308,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,0.23951240017,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2025.00000000000,R1,power,0.33604315539,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,36,2020.00000000000,R1,power,0.35926860025,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,37,2025.00000000000,R1,power,0.50406473308,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.71853720050,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2025.00000000000,R1,power,1.00812946616,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,0.47902480034,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,61,2025.00000000000,R1,power,0.67208631077,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.26422222222,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,0.39633333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,0.26422222222,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2020.00000000000,R1,gas,0.39633333333,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,8,2020.00000000000,R1,gas,0.79266666667,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2020.00000000000,R1,gas,0.52844444444,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2030.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,10,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,11,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,12,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,15,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,30,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,31,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,32,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,35,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,50,2025.00000000000,R1,residential,0.22777777778,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,51,2025.00000000000,R1,residential,0.38333333333,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,52,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,55,2025.00000000000,R1,residential,14.73950000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,70,2025.00000000000,R1,residential,0.34166666667,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,71,2025.00000000000,R1,residential,0.57500000000,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,72,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,75,2025.00000000000,R1,residential,22.10925000000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,90,2025.00000000000,R1,residential,0.68333333333,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,91,2025.00000000000,R1,residential,1.15000000000,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,92,2030.00000000000,R1,residential,4.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,95,2025.00000000000,R1,residential,44.21850000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,110,2025.00000000000,R1,residential,0.45555555556,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,111,2025.00000000000,R1,residential,0.76666666667,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,112,2030.00000000000,R1,residential,2.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,115,2025.00000000000,R1,residential,29.47900000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.18011035545,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2025.00000000000,R1,power,0.25270028658,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2030.00000000000,R1,power,0.27607824686,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,16,2020.00000000000,R1,power,0.27016553317,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,17,2025.00000000000,R1,power,0.37905042987,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,18,2030.00000000000,R1,power,0.41411737029,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,32,2020.00000000000,R1,power,0.18011035545,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,33,2025.00000000000,R1,power,0.25270028658,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,34,2030.00000000000,R1,power,0.27607824686,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.27016553317,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2025.00000000000,R1,power,0.37905042987,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,50,2030.00000000000,R1,power,0.41411737029,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,64,2020.00000000000,R1,power,0.54033106634,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,65,2025.00000000000,R1,power,0.75810085975,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,66,2030.00000000000,R1,power,0.82823474058,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,80,2020.00000000000,R1,power,0.36022071089,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,81,2025.00000000000,R1,power,0.50540057316,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,82,2030.00000000000,R1,power,0.55215649372,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.12888888889,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2030.00000000000,R1,gas,0.13533333333,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,0.19333333333,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2030.00000000000,R1,gas,0.20300000000,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,0.12888888889,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2030.00000000000,R1,gas,0.13533333333,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2020.00000000000,R1,gas,0.19333333333,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,7,2030.00000000000,R1,gas,0.20300000000,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,8,2020.00000000000,R1,gas,0.38666666667,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,9,2030.00000000000,R1,gas,0.40600000000,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2020.00000000000,R1,gas,0.25777777778,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,11,2030.00000000000,R1,gas,0.27066666667,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2035.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,8,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,9,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,10,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,13,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,24,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,25,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,26,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,29,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,40,2030.00000000000,R1,residential,1.38888888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,41,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,42,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,45,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,56,2030.00000000000,R1,residential,2.08333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,57,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,58,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,61,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,72,2030.00000000000,R1,residential,4.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,73,2035.00000000000,R1,residential,0.15166666667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,74,2035.00000000000,R1,residential,2.68166666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,77,2035.00000000000,R1,residential,9.81435000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2030.00000000000,R1,residential,2.77777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,89,2035.00000000000,R1,residential,0.10111111111,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,90,2035.00000000000,R1,residential,1.78777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,93,2035.00000000000,R1,residential,6.54290000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.15824641356,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2025.00000000000,R1,power,0.22202451357,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2030.00000000000,R1,power,0.24256457836,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2035.00000000000,R1,power,0.29027560563,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,20,2020.00000000000,R1,power,0.23736962033,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,21,2025.00000000000,R1,power,0.33303677035,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,22,2030.00000000000,R1,power,0.36384686753,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,23,2035.00000000000,R1,power,0.43541340845,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,40,2020.00000000000,R1,power,0.15824641356,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,41,2025.00000000000,R1,power,0.22202451357,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,42,2030.00000000000,R1,power,0.24256457836,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,43,2035.00000000000,R1,power,0.29027560563,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,60,2020.00000000000,R1,power,0.23736962033,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,61,2025.00000000000,R1,power,0.33303677035,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,62,2030.00000000000,R1,power,0.36384686753,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,63,2035.00000000000,R1,power,0.43541340845,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,80,2020.00000000000,R1,power,0.47473924067,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,81,2025.00000000000,R1,power,0.66607354070,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,82,2030.00000000000,R1,power,0.72769373507,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,83,2035.00000000000,R1,power,0.87082681690,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,100,2020.00000000000,R1,power,0.31649282711,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,101,2025.00000000000,R1,power,0.44404902713,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,102,2030.00000000000,R1,power,0.48512915671,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,103,2035.00000000000,R1,power,0.58055121127,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.02860704607,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2030.00000000000,R1,gas,0.03003739837,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,0.04291056911,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2030.00000000000,R1,gas,0.04505609756,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,0.02860704607,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2030.00000000000,R1,gas,0.03003739837,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2020.00000000000,R1,gas,0.04291056911,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,7,2030.00000000000,R1,gas,0.04505609756,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,8,2020.00000000000,R1,gas,0.08582113821,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,9,2030.00000000000,R1,gas,0.09011219512,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2020.00000000000,R1,gas,0.05721409214,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,11,2030.00000000000,R1,gas,0.06007479675,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2040.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,8,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,9,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,10,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,12,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'night')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,24,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,25,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,26,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,28,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'morning')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,40,2035.00000000000,R1,residential,0.05055555556,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,41,2035.00000000000,R1,residential,0.89388888889,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,42,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,44,2035.00000000000,R1,residential,3.27145000000,gasboiler,"('all-year', 'all-week', 'afternoon')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,56,2035.00000000000,R1,residential,0.07583333333,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,57,2035.00000000000,R1,residential,1.34083333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,58,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,60,2035.00000000000,R1,residential,4.90717500000,gasboiler,"('all-year', 'all-week', 'early-peak')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,72,2035.00000000000,R1,residential,0.15166666667,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,73,2035.00000000000,R1,residential,2.68166666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,74,2040.00000000000,R1,residential,5.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,76,2035.00000000000,R1,residential,9.81435000000,gasboiler,"('all-year', 'all-week', 'late-peak')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,88,2035.00000000000,R1,residential,0.10111111111,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,89,2035.00000000000,R1,residential,1.78777777778,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,90,2040.00000000000,R1,residential,3.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,92,2035.00000000000,R1,residential,6.54290000000,gasboiler,"('all-year', 'all-week', 'evening')",MUS$2010/kt,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2020.00000000000,R1,power,0.13656827502,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2025.00000000000,R1,power,0.19160942829,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2030.00000000000,R1,power,0.20933571449,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2035.00000000000,R1,power,0.25051081949,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,4,2040.00000000000,R1,power,0.25842020716,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2020.00000000000,R1,power,0.20485241253,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2025.00000000000,R1,power,0.28741414243,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,26,2030.00000000000,R1,power,0.31400357173,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,27,2035.00000000000,R1,power,0.37576622924,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,28,2040.00000000000,R1,power,0.38763031074,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2020.00000000000,R1,power,0.13656827502,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2025.00000000000,R1,power,0.19160942829,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,50,2030.00000000000,R1,power,0.20933571449,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,51,2035.00000000000,R1,power,0.25051081949,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,52,2040.00000000000,R1,power,0.25842020716,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,72,2020.00000000000,R1,power,0.20485241253,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,73,2025.00000000000,R1,power,0.28741414243,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,74,2030.00000000000,R1,power,0.31400357173,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,75,2035.00000000000,R1,power,0.37576622924,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,76,2040.00000000000,R1,power,0.38763031074,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,96,2020.00000000000,R1,power,0.40970482506,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,97,2025.00000000000,R1,power,0.57482828486,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,98,2030.00000000000,R1,power,0.62800714346,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,99,2035.00000000000,R1,power,0.75153245848,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,100,2040.00000000000,R1,power,0.77526062148,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,120,2020.00000000000,R1,power,0.27313655004,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,121,2025.00000000000,R1,power,0.38321885657,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,122,2030.00000000000,R1,power,0.41867142897,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,123,2035.00000000000,R1,power,0.50102163899,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,124,2040.00000000000,R1,power,0.51684041432,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,0,2020.00000000000,R1,gas,0.02860704607,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,1,2030.00000000000,R1,gas,0.03003739837,gassupply1,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,2,2020.00000000000,R1,gas,0.04291056911,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,3,2030.00000000000,R1,gas,0.04505609756,gassupply1,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,4,2020.00000000000,R1,gas,0.02860704607,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,5,2030.00000000000,R1,gas,0.03003739837,gassupply1,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,6,2020.00000000000,R1,gas,0.04291056911,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,7,2030.00000000000,R1,gas,0.04505609756,gassupply1,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,8,2020.00000000000,R1,gas,0.08582113821,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,9,2030.00000000000,R1,gas,0.09011219512,gassupply1,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,10,2020.00000000000,R1,gas,0.05721409214,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,gas,R1,11,2030.00000000000,R1,gas,0.06007479675,gassupply1,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2045.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,6,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,7,2045.00000000000,R1,residential,1.27777777778,heatpump,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,18,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,19,2045.00000000000,R1,residential,1.91666666667,heatpump,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,30,2040.00000000000,R1,residential,1.72222222222,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,31,2045.00000000000,R1,residential,1.27777777778,heatpump,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,42,2040.00000000000,R1,residential,2.58333333333,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,43,2045.00000000000,R1,residential,1.91666666667,heatpump,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,54,2040.00000000000,R1,residential,5.16666666667,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,55,2045.00000000000,R1,residential,3.83333333333,heatpump,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,66,2040.00000000000,R1,residential,3.44444444444,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,heat,R1,67,2045.00000000000,R1,residential,2.55555555556,heatpump,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,0,2025.00000000000,R1,power,0.19078573323,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,1,2030.00000000000,R1,power,0.20843581726,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,2,2035.00000000000,R1,power,0.24943391777,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,3,2040.00000000000,R1,power,0.25730930438,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,4,2045.00000000000,R1,power,0.29403522736,windturbine,"('all-year', 'all-week', 'night')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,24,2025.00000000000,R1,power,0.28617859985,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,25,2030.00000000000,R1,power,0.31265372589,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,26,2035.00000000000,R1,power,0.37415087666,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,27,2040.00000000000,R1,power,0.38596395657,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,28,2045.00000000000,R1,power,0.44105284104,windturbine,"('all-year', 'all-week', 'morning')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,48,2025.00000000000,R1,power,0.19078573323,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,49,2030.00000000000,R1,power,0.20843581726,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,50,2035.00000000000,R1,power,0.24943391777,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,51,2040.00000000000,R1,power,0.25730930438,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,52,2045.00000000000,R1,power,0.29403522736,windturbine,"('all-year', 'all-week', 'afternoon')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,72,2025.00000000000,R1,power,0.28617859985,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,73,2030.00000000000,R1,power,0.31265372589,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,74,2035.00000000000,R1,power,0.37415087666,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,75,2040.00000000000,R1,power,0.38596395657,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,76,2045.00000000000,R1,power,0.44105284104,windturbine,"('all-year', 'all-week', 'early-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,96,2025.00000000000,R1,power,0.57235719969,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,97,2030.00000000000,R1,power,0.62530745179,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,98,2035.00000000000,R1,power,0.74830175331,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,99,2040.00000000000,R1,power,0.77192791314,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,100,2045.00000000000,R1,power,0.88210568207,windturbine,"('all-year', 'all-week', 'late-peak')",MUS$2010/PJ,2050.00000000000
+A1,0.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,120,2025.00000000000,R1,power,0.38157146646,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,1.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,121,2030.00000000000,R1,power,0.41687163452,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,2.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,122,2035.00000000000,R1,power,0.49886783554,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,3.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,123,2040.00000000000,R1,power,0.51461860876,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
+A1,4.00000000000,retrofit,PRODUCT|ENERGY,electricity,R1,124,2045.00000000000,R1,power,0.58807045471,windturbine,"('all-year', 'all-week', 'evening')",MUS$2010/PJ,2050.00000000000
diff --git a/tests/example_outputs/default_timeslice/Power/Capacity/2020.csv b/tests/example_outputs/default_timeslice/Power/Capacity/2020.csv
index 0745318f6..69c4d3388 100644
--- a/tests/example_outputs/default_timeslice/Power/Capacity/2020.csv
+++ b/tests/example_outputs/default_timeslice/Power/Capacity/2020.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gasCCGT,1.00000000000
-0,2025,R1,2020,gasCCGT,1.00000000000
-1,2025,R1,2020,windturbine,1.10000000000
-1,2030,R1,2020,windturbine,1.10000000000
-1,2035,R1,2020,windturbine,1.10000000000
-1,2040,R1,2020,windturbine,1.10000000000
-1,2045,R1,2020,windturbine,1.10000000000
-1,2049,R1,2020,windturbine,1.10000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2025,R1,windturbine,2020,1.10000000000
+1,2030,R1,windturbine,2020,1.10000000000
+1,2035,R1,windturbine,2020,1.10000000000
+1,2040,R1,windturbine,2020,1.10000000000
+1,2045,R1,windturbine,2020,1.10000000000
+1,2049,R1,windturbine,2020,1.10000000000
diff --git a/tests/example_outputs/default_timeslice/Power/Capacity/2050.csv b/tests/example_outputs/default_timeslice/Power/Capacity/2050.csv
index e61276d32..26c197549 100644
--- a/tests/example_outputs/default_timeslice/Power/Capacity/2050.csv
+++ b/tests/example_outputs/default_timeslice/Power/Capacity/2050.csv
@@ -1,41 +1,41 @@
-asset,year,region,installed,technology,capacity
-1,2050,R1,2025,windturbine,1.54330000000
-1,2054,R1,2025,windturbine,1.54330000000
-2,2050,R1,2030,windturbine,1.68610000000
-2,2054,R1,2030,windturbine,1.68610000000
-2,2055,R1,2030,windturbine,1.68610000000
-2,2059,R1,2030,windturbine,1.68610000000
-3,2050,R1,2035,windturbine,2.01780000000
-3,2054,R1,2035,windturbine,2.01780000000
-3,2055,R1,2035,windturbine,2.01780000000
-3,2059,R1,2035,windturbine,2.01780000000
-3,2060,R1,2035,windturbine,2.01780000000
-3,2064,R1,2035,windturbine,2.01780000000
-4,2050,R1,2040,windturbine,2.08150000000
-4,2054,R1,2040,windturbine,2.08150000000
-4,2055,R1,2040,windturbine,2.08150000000
-4,2059,R1,2040,windturbine,2.08150000000
-4,2060,R1,2040,windturbine,2.08150000000
-4,2064,R1,2040,windturbine,2.08150000000
-4,2065,R1,2040,windturbine,2.08150000000
-4,2069,R1,2040,windturbine,2.08150000000
-5,2050,R1,2045,windturbine,2.37860000000
-5,2054,R1,2045,windturbine,2.37860000000
-5,2055,R1,2045,windturbine,2.37860000000
-5,2059,R1,2045,windturbine,2.37860000000
-5,2060,R1,2045,windturbine,2.37860000000
-5,2064,R1,2045,windturbine,2.37860000000
-5,2065,R1,2045,windturbine,2.37860000000
-5,2069,R1,2045,windturbine,2.37860000000
-5,2070,R1,2045,windturbine,2.37860000000
-5,2074,R1,2045,windturbine,2.37860000000
-6,2055,R1,2050,windturbine,2.23940000000
-6,2059,R1,2050,windturbine,2.23940000000
-6,2060,R1,2050,windturbine,2.23940000000
-6,2064,R1,2050,windturbine,2.23940000000
-6,2065,R1,2050,windturbine,2.23940000000
-6,2069,R1,2050,windturbine,2.23940000000
-6,2070,R1,2050,windturbine,2.23940000000
-6,2074,R1,2050,windturbine,2.23940000000
-6,2075,R1,2050,windturbine,2.23940000000
-6,2079,R1,2050,windturbine,2.23940000000
+asset,year,region,technology,installed,capacity
+1,2050,R1,windturbine,2025,1.54330000000
+1,2054,R1,windturbine,2025,1.54330000000
+2,2050,R1,windturbine,2030,1.68610000000
+2,2054,R1,windturbine,2030,1.68610000000
+2,2055,R1,windturbine,2030,1.68610000000
+2,2059,R1,windturbine,2030,1.68610000000
+3,2050,R1,windturbine,2035,2.01780000000
+3,2054,R1,windturbine,2035,2.01780000000
+3,2055,R1,windturbine,2035,2.01780000000
+3,2059,R1,windturbine,2035,2.01780000000
+3,2060,R1,windturbine,2035,2.01780000000
+3,2064,R1,windturbine,2035,2.01780000000
+4,2050,R1,windturbine,2040,2.08150000000
+4,2054,R1,windturbine,2040,2.08150000000
+4,2055,R1,windturbine,2040,2.08150000000
+4,2059,R1,windturbine,2040,2.08150000000
+4,2060,R1,windturbine,2040,2.08150000000
+4,2064,R1,windturbine,2040,2.08150000000
+4,2065,R1,windturbine,2040,2.08150000000
+4,2069,R1,windturbine,2040,2.08150000000
+5,2050,R1,windturbine,2045,2.37860000000
+5,2054,R1,windturbine,2045,2.37860000000
+5,2055,R1,windturbine,2045,2.37860000000
+5,2059,R1,windturbine,2045,2.37860000000
+5,2060,R1,windturbine,2045,2.37860000000
+5,2064,R1,windturbine,2045,2.37860000000
+5,2065,R1,windturbine,2045,2.37860000000
+5,2069,R1,windturbine,2045,2.37860000000
+5,2070,R1,windturbine,2045,2.37860000000
+5,2074,R1,windturbine,2045,2.37860000000
+6,2055,R1,windturbine,2050,2.23940000000
+6,2059,R1,windturbine,2050,2.23940000000
+6,2060,R1,windturbine,2050,2.23940000000
+6,2064,R1,windturbine,2050,2.23940000000
+6,2065,R1,windturbine,2050,2.23940000000
+6,2069,R1,windturbine,2050,2.23940000000
+6,2070,R1,windturbine,2050,2.23940000000
+6,2074,R1,windturbine,2050,2.23940000000
+6,2075,R1,windturbine,2050,2.23940000000
+6,2079,R1,windturbine,2050,2.23940000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2020.csv b/tests/example_outputs/default_timeslice/Power/Supply/2020.csv
index b346de209..44dbdf958 100644
--- a/tests/example_outputs/default_timeslice/Power/Supply/2020.csv
+++ b/tests/example_outputs/default_timeslice/Power/Supply/2020.csv
@@ -1,31 +1,31 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,supply
-0,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,night,1.00000000000
-0,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,night,91.67000000000
-0,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,night,1.00000000000
-0,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,night,91.67000000000
-0,1,2025,electricity,R1,2020,windturbine,all-year,all-week,night,1.10000000000
-1,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,morning,1.00000000000
-1,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,morning,91.67000000000
-1,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,morning,1.00000000000
-1,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,morning,91.67000000000
-1,1,2025,electricity,R1,2020,windturbine,all-year,all-week,morning,1.10000000000
-2,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,afternoon,1.00000000000
-2,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,afternoon,91.67000000000
-2,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,afternoon,1.00000000000
-2,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,afternoon,91.67000000000
-2,1,2025,electricity,R1,2020,windturbine,all-year,all-week,afternoon,1.10000000000
-3,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,early-peak,1.00000000000
-3,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,early-peak,91.67000000000
-3,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,early-peak,1.00000000000
-3,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,early-peak,91.67000000000
-3,1,2025,electricity,R1,2020,windturbine,all-year,all-week,early-peak,1.10000000000
-4,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,late-peak,1.00000000000
-4,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,late-peak,91.67000000000
-4,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,late-peak,1.00000000000
-4,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,late-peak,91.67000000000
-4,1,2025,electricity,R1,2020,windturbine,all-year,all-week,late-peak,1.10000000000
-5,0,2020,electricity,R1,2020,gasCCGT,all-year,all-week,evening,1.00000000000
-5,0,2020,CO2f,R1,2020,gasCCGT,all-year,all-week,evening,91.67000000000
-5,0,2025,electricity,R1,2020,gasCCGT,all-year,all-week,evening,1.00000000000
-5,0,2025,CO2f,R1,2020,gasCCGT,all-year,all-week,evening,91.67000000000
-5,1,2025,electricity,R1,2020,windturbine,all-year,all-week,evening,1.10000000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2020,electricity,all-year,all-week,night,R1,gasCCGT,2020,1.00000000000
+0,0,2020,CO2f,all-year,all-week,night,R1,gasCCGT,2020,91.67000000000
+0,0,2025,electricity,all-year,all-week,night,R1,gasCCGT,2020,1.00000000000
+0,0,2025,CO2f,all-year,all-week,night,R1,gasCCGT,2020,91.67000000000
+0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,1.10000000000
+1,0,2020,electricity,all-year,all-week,morning,R1,gasCCGT,2020,1.00000000000
+1,0,2020,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,91.67000000000
+1,0,2025,electricity,all-year,all-week,morning,R1,gasCCGT,2020,1.00000000000
+1,0,2025,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,91.67000000000
+1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,1.10000000000
+2,0,2020,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,1.00000000000
+2,0,2020,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,91.67000000000
+2,0,2025,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,1.00000000000
+2,0,2025,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,91.67000000000
+2,1,2025,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.10000000000
+3,0,2020,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,1.00000000000
+3,0,2020,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,91.67000000000
+3,0,2025,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,1.00000000000
+3,0,2025,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,91.67000000000
+3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.10000000000
+4,0,2020,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,1.00000000000
+4,0,2020,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,91.67000000000
+4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,1.00000000000
+4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,91.67000000000
+4,1,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.10000000000
+5,0,2020,electricity,all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
+5,0,2020,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
+5,0,2025,electricity,all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
+5,0,2025,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
+5,1,2025,electricity,all-year,all-week,evening,R1,windturbine,2020,1.10000000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2025.csv b/tests/example_outputs/default_timeslice/Power/Supply/2025.csv
index cf76dc0a7..a4d417f5e 100644
--- a/tests/example_outputs/default_timeslice/Power/Supply/2025.csv
+++ b/tests/example_outputs/default_timeslice/Power/Supply/2025.csv
@@ -1,31 +1,31 @@
-timeslice,asset,year,commodity,region,technology,installed,month,day,hour,supply
-0,0,2025,electricity,R1,gasCCGT,2020,all-year,all-week,night,1.00000000000
-0,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,night,91.67000000000
-0,1,2025,electricity,R1,windturbine,2020,all-year,all-week,night,1.10000000000
-0,1,2030,electricity,R1,windturbine,2020,all-year,all-week,night,1.10000000000
-0,2,2030,electricity,R1,windturbine,2025,all-year,all-week,night,1.54330000000
-1,0,2025,electricity,R1,gasCCGT,2020,all-year,all-week,morning,1.00000000000
-1,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,morning,91.67000000000
-1,1,2025,electricity,R1,windturbine,2020,all-year,all-week,morning,1.10000000000
-1,1,2030,electricity,R1,windturbine,2020,all-year,all-week,morning,1.10000000000
-1,2,2030,electricity,R1,windturbine,2025,all-year,all-week,morning,1.54330000000
-2,0,2025,electricity,R1,gasCCGT,2020,all-year,all-week,afternoon,1.00000000000
-2,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,afternoon,91.67000000000
-2,1,2025,electricity,R1,windturbine,2020,all-year,all-week,afternoon,1.10000000000
-2,1,2030,electricity,R1,windturbine,2020,all-year,all-week,afternoon,1.10000000000
-2,2,2030,electricity,R1,windturbine,2025,all-year,all-week,afternoon,1.54330000000
-3,0,2025,electricity,R1,gasCCGT,2020,all-year,all-week,early-peak,1.00000000000
-3,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,early-peak,91.67000000000
-3,1,2025,electricity,R1,windturbine,2020,all-year,all-week,early-peak,1.10000000000
-3,1,2030,electricity,R1,windturbine,2020,all-year,all-week,early-peak,1.10000000000
-3,2,2030,electricity,R1,windturbine,2025,all-year,all-week,early-peak,1.54330000000
-4,0,2025,electricity,R1,gasCCGT,2020,all-year,all-week,late-peak,1.00000000000
-4,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,late-peak,91.67000000000
-4,1,2025,electricity,R1,windturbine,2020,all-year,all-week,late-peak,1.10000000000
-4,1,2030,electricity,R1,windturbine,2020,all-year,all-week,late-peak,1.10000000000
-4,2,2030,electricity,R1,windturbine,2025,all-year,all-week,late-peak,1.54330000000
-5,0,2025,electricity,R1,gasCCGT,2020,all-year,all-week,evening,1.00000000000
-5,0,2025,CO2f,R1,gasCCGT,2020,all-year,all-week,evening,91.67000000000
-5,1,2025,electricity,R1,windturbine,2020,all-year,all-week,evening,1.10000000000
-5,1,2030,electricity,R1,windturbine,2020,all-year,all-week,evening,1.10000000000
-5,2,2030,electricity,R1,windturbine,2025,all-year,all-week,evening,1.54330000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2025,electricity,all-year,all-week,night,R1,gasCCGT,2020,1.00000000000
+0,0,2025,CO2f,all-year,all-week,night,R1,gasCCGT,2020,91.67000000000
+0,1,2025,electricity,all-year,all-week,night,R1,windturbine,2020,1.10000000000
+0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2020,1.10000000000
+0,2,2030,electricity,all-year,all-week,night,R1,windturbine,2025,1.54330000000
+1,0,2025,electricity,all-year,all-week,morning,R1,gasCCGT,2020,1.00000000000
+1,0,2025,CO2f,all-year,all-week,morning,R1,gasCCGT,2020,91.67000000000
+1,1,2025,electricity,all-year,all-week,morning,R1,windturbine,2020,1.10000000000
+1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,1.10000000000
+1,2,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,1.54330000000
+2,0,2025,electricity,all-year,all-week,afternoon,R1,gasCCGT,2020,1.00000000000
+2,0,2025,CO2f,all-year,all-week,afternoon,R1,gasCCGT,2020,91.67000000000
+2,1,2025,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.10000000000
+2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.10000000000
+2,2,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.54330000000
+3,0,2025,electricity,all-year,all-week,early-peak,R1,gasCCGT,2020,1.00000000000
+3,0,2025,CO2f,all-year,all-week,early-peak,R1,gasCCGT,2020,91.67000000000
+3,1,2025,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.10000000000
+3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.10000000000
+3,2,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.54330000000
+4,0,2025,electricity,all-year,all-week,late-peak,R1,gasCCGT,2020,1.00000000000
+4,0,2025,CO2f,all-year,all-week,late-peak,R1,gasCCGT,2020,91.67000000000
+4,1,2025,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.10000000000
+4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.10000000000
+4,2,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.54330000000
+5,0,2025,electricity,all-year,all-week,evening,R1,gasCCGT,2020,1.00000000000
+5,0,2025,CO2f,all-year,all-week,evening,R1,gasCCGT,2020,91.67000000000
+5,1,2025,electricity,all-year,all-week,evening,R1,windturbine,2020,1.10000000000
+5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,1.10000000000
+5,2,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,1.54330000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2030.csv b/tests/example_outputs/default_timeslice/Power/Supply/2030.csv
index d39ab64c8..04fdc53e7 100644
--- a/tests/example_outputs/default_timeslice/Power/Supply/2030.csv
+++ b/tests/example_outputs/default_timeslice/Power/Supply/2030.csv
@@ -1,31 +1,31 @@
-timeslice,asset,year,commodity,region,technology,installed,month,day,hour,supply
-0,0,2030,electricity,R1,windturbine,2020,all-year,all-week,night,1.10000000000
-0,0,2035,electricity,R1,windturbine,2020,all-year,all-week,night,1.10000000000
-0,1,2030,electricity,R1,windturbine,2025,all-year,all-week,night,1.54330000000
-0,1,2035,electricity,R1,windturbine,2025,all-year,all-week,night,1.54330000000
-0,2,2035,electricity,R1,windturbine,2030,all-year,all-week,night,1.68610000000
-1,0,2030,electricity,R1,windturbine,2020,all-year,all-week,morning,1.10000000000
-1,0,2035,electricity,R1,windturbine,2020,all-year,all-week,morning,1.10000000000
-1,1,2030,electricity,R1,windturbine,2025,all-year,all-week,morning,1.54330000000
-1,1,2035,electricity,R1,windturbine,2025,all-year,all-week,morning,1.54330000000
-1,2,2035,electricity,R1,windturbine,2030,all-year,all-week,morning,1.68610000000
-2,0,2030,electricity,R1,windturbine,2020,all-year,all-week,afternoon,1.10000000000
-2,0,2035,electricity,R1,windturbine,2020,all-year,all-week,afternoon,1.10000000000
-2,1,2030,electricity,R1,windturbine,2025,all-year,all-week,afternoon,1.54330000000
-2,1,2035,electricity,R1,windturbine,2025,all-year,all-week,afternoon,1.54330000000
-2,2,2035,electricity,R1,windturbine,2030,all-year,all-week,afternoon,1.68610000000
-3,0,2030,electricity,R1,windturbine,2020,all-year,all-week,early-peak,1.10000000000
-3,0,2035,electricity,R1,windturbine,2020,all-year,all-week,early-peak,1.10000000000
-3,1,2030,electricity,R1,windturbine,2025,all-year,all-week,early-peak,1.54330000000
-3,1,2035,electricity,R1,windturbine,2025,all-year,all-week,early-peak,1.54330000000
-3,2,2035,electricity,R1,windturbine,2030,all-year,all-week,early-peak,1.68610000000
-4,0,2030,electricity,R1,windturbine,2020,all-year,all-week,late-peak,1.10000000000
-4,0,2035,electricity,R1,windturbine,2020,all-year,all-week,late-peak,1.10000000000
-4,1,2030,electricity,R1,windturbine,2025,all-year,all-week,late-peak,1.54330000000
-4,1,2035,electricity,R1,windturbine,2025,all-year,all-week,late-peak,1.54330000000
-4,2,2035,electricity,R1,windturbine,2030,all-year,all-week,late-peak,1.68610000000
-5,0,2030,electricity,R1,windturbine,2020,all-year,all-week,evening,1.10000000000
-5,0,2035,electricity,R1,windturbine,2020,all-year,all-week,evening,1.10000000000
-5,1,2030,electricity,R1,windturbine,2025,all-year,all-week,evening,1.54330000000
-5,1,2035,electricity,R1,windturbine,2025,all-year,all-week,evening,1.54330000000
-5,2,2035,electricity,R1,windturbine,2030,all-year,all-week,evening,1.68610000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2030,electricity,all-year,all-week,night,R1,windturbine,2020,1.10000000000
+0,0,2035,electricity,all-year,all-week,night,R1,windturbine,2020,1.10000000000
+0,1,2030,electricity,all-year,all-week,night,R1,windturbine,2025,1.54330000000
+0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2025,1.54330000000
+0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2030,1.68610000000
+1,0,2030,electricity,all-year,all-week,morning,R1,windturbine,2020,1.10000000000
+1,0,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,1.10000000000
+1,1,2030,electricity,all-year,all-week,morning,R1,windturbine,2025,1.54330000000
+1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,1.54330000000
+1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,1.68610000000
+2,0,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.10000000000
+2,0,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.10000000000
+2,1,2030,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.54330000000
+2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.54330000000
+2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,1.68610000000
+3,0,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.10000000000
+3,0,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.10000000000
+3,1,2030,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.54330000000
+3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.54330000000
+3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,1.68610000000
+4,0,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.10000000000
+4,0,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.10000000000
+4,1,2030,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.54330000000
+4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.54330000000
+4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.68610000000
+5,0,2030,electricity,all-year,all-week,evening,R1,windturbine,2020,1.10000000000
+5,0,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,1.10000000000
+5,1,2030,electricity,all-year,all-week,evening,R1,windturbine,2025,1.54330000000
+5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,1.54330000000
+5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,1.68610000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2035.csv b/tests/example_outputs/default_timeslice/Power/Supply/2035.csv
index 70cf1860a..6199673da 100644
--- a/tests/example_outputs/default_timeslice/Power/Supply/2035.csv
+++ b/tests/example_outputs/default_timeslice/Power/Supply/2035.csv
@@ -1,43 +1,43 @@
-timeslice,asset,year,commodity,region,technology,installed,month,day,hour,supply
-0,0,2035,electricity,R1,windturbine,2020,all-year,all-week,night,1.10000000000
-0,0,2040,electricity,R1,windturbine,2020,all-year,all-week,night,1.10000000000
-0,1,2035,electricity,R1,windturbine,2025,all-year,all-week,night,1.54330000000
-0,1,2040,electricity,R1,windturbine,2025,all-year,all-week,night,1.54330000000
-0,2,2035,electricity,R1,windturbine,2030,all-year,all-week,night,1.68610000000
-0,2,2040,electricity,R1,windturbine,2030,all-year,all-week,night,1.68610000000
-0,3,2040,electricity,R1,windturbine,2035,all-year,all-week,night,2.01780000000
-1,0,2035,electricity,R1,windturbine,2020,all-year,all-week,morning,1.10000000000
-1,0,2040,electricity,R1,windturbine,2020,all-year,all-week,morning,1.10000000000
-1,1,2035,electricity,R1,windturbine,2025,all-year,all-week,morning,1.54330000000
-1,1,2040,electricity,R1,windturbine,2025,all-year,all-week,morning,1.54330000000
-1,2,2035,electricity,R1,windturbine,2030,all-year,all-week,morning,1.68610000000
-1,2,2040,electricity,R1,windturbine,2030,all-year,all-week,morning,1.68610000000
-1,3,2040,electricity,R1,windturbine,2035,all-year,all-week,morning,2.01780000000
-2,0,2035,electricity,R1,windturbine,2020,all-year,all-week,afternoon,1.10000000000
-2,0,2040,electricity,R1,windturbine,2020,all-year,all-week,afternoon,1.10000000000
-2,1,2035,electricity,R1,windturbine,2025,all-year,all-week,afternoon,1.54330000000
-2,1,2040,electricity,R1,windturbine,2025,all-year,all-week,afternoon,1.54330000000
-2,2,2035,electricity,R1,windturbine,2030,all-year,all-week,afternoon,1.68610000000
-2,2,2040,electricity,R1,windturbine,2030,all-year,all-week,afternoon,1.68610000000
-2,3,2040,electricity,R1,windturbine,2035,all-year,all-week,afternoon,2.01780000000
-3,0,2035,electricity,R1,windturbine,2020,all-year,all-week,early-peak,1.10000000000
-3,0,2040,electricity,R1,windturbine,2020,all-year,all-week,early-peak,1.10000000000
-3,1,2035,electricity,R1,windturbine,2025,all-year,all-week,early-peak,1.54330000000
-3,1,2040,electricity,R1,windturbine,2025,all-year,all-week,early-peak,1.54330000000
-3,2,2035,electricity,R1,windturbine,2030,all-year,all-week,early-peak,1.68610000000
-3,2,2040,electricity,R1,windturbine,2030,all-year,all-week,early-peak,1.68610000000
-3,3,2040,electricity,R1,windturbine,2035,all-year,all-week,early-peak,2.01780000000
-4,0,2035,electricity,R1,windturbine,2020,all-year,all-week,late-peak,1.10000000000
-4,0,2040,electricity,R1,windturbine,2020,all-year,all-week,late-peak,1.10000000000
-4,1,2035,electricity,R1,windturbine,2025,all-year,all-week,late-peak,1.54330000000
-4,1,2040,electricity,R1,windturbine,2025,all-year,all-week,late-peak,1.54330000000
-4,2,2035,electricity,R1,windturbine,2030,all-year,all-week,late-peak,1.68610000000
-4,2,2040,electricity,R1,windturbine,2030,all-year,all-week,late-peak,1.68610000000
-4,3,2040,electricity,R1,windturbine,2035,all-year,all-week,late-peak,2.01780000000
-5,0,2035,electricity,R1,windturbine,2020,all-year,all-week,evening,1.10000000000
-5,0,2040,electricity,R1,windturbine,2020,all-year,all-week,evening,1.10000000000
-5,1,2035,electricity,R1,windturbine,2025,all-year,all-week,evening,1.54330000000
-5,1,2040,electricity,R1,windturbine,2025,all-year,all-week,evening,1.54330000000
-5,2,2035,electricity,R1,windturbine,2030,all-year,all-week,evening,1.68610000000
-5,2,2040,electricity,R1,windturbine,2030,all-year,all-week,evening,1.68610000000
-5,3,2040,electricity,R1,windturbine,2035,all-year,all-week,evening,2.01780000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2035,electricity,all-year,all-week,night,R1,windturbine,2020,1.10000000000
+0,0,2040,electricity,all-year,all-week,night,R1,windturbine,2020,1.10000000000
+0,1,2035,electricity,all-year,all-week,night,R1,windturbine,2025,1.54330000000
+0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2025,1.54330000000
+0,2,2035,electricity,all-year,all-week,night,R1,windturbine,2030,1.68610000000
+0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2030,1.68610000000
+0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2035,2.01780000000
+1,0,2035,electricity,all-year,all-week,morning,R1,windturbine,2020,1.10000000000
+1,0,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,1.10000000000
+1,1,2035,electricity,all-year,all-week,morning,R1,windturbine,2025,1.54330000000
+1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,1.54330000000
+1,2,2035,electricity,all-year,all-week,morning,R1,windturbine,2030,1.68610000000
+1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,1.68610000000
+1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,2.01780000000
+2,0,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.10000000000
+2,0,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.10000000000
+2,1,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.54330000000
+2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.54330000000
+2,2,2035,electricity,all-year,all-week,afternoon,R1,windturbine,2030,1.68610000000
+2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,1.68610000000
+2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.01780000000
+3,0,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.10000000000
+3,0,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.10000000000
+3,1,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.54330000000
+3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.54330000000
+3,2,2035,electricity,all-year,all-week,early-peak,R1,windturbine,2030,1.68610000000
+3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,1.68610000000
+3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.01780000000
+4,0,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.10000000000
+4,0,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.10000000000
+4,1,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.54330000000
+4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.54330000000
+4,2,2035,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.68610000000
+4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.68610000000
+4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.01780000000
+5,0,2035,electricity,all-year,all-week,evening,R1,windturbine,2020,1.10000000000
+5,0,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,1.10000000000
+5,1,2035,electricity,all-year,all-week,evening,R1,windturbine,2025,1.54330000000
+5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,1.54330000000
+5,2,2035,electricity,all-year,all-week,evening,R1,windturbine,2030,1.68610000000
+5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,1.68610000000
+5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,2.01780000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2040.csv b/tests/example_outputs/default_timeslice/Power/Supply/2040.csv
index 469339f6a..a51edca37 100644
--- a/tests/example_outputs/default_timeslice/Power/Supply/2040.csv
+++ b/tests/example_outputs/default_timeslice/Power/Supply/2040.csv
@@ -1,55 +1,55 @@
-timeslice,asset,year,commodity,region,technology,installed,month,day,hour,supply
-0,0,2040,electricity,R1,windturbine,2020,all-year,all-week,night,1.10000000000
-0,0,2045,electricity,R1,windturbine,2020,all-year,all-week,night,1.10000000000
-0,1,2040,electricity,R1,windturbine,2025,all-year,all-week,night,1.54330000000
-0,1,2045,electricity,R1,windturbine,2025,all-year,all-week,night,1.54330000000
-0,2,2040,electricity,R1,windturbine,2030,all-year,all-week,night,1.68610000000
-0,2,2045,electricity,R1,windturbine,2030,all-year,all-week,night,1.68610000000
-0,3,2040,electricity,R1,windturbine,2035,all-year,all-week,night,2.01780000000
-0,3,2045,electricity,R1,windturbine,2035,all-year,all-week,night,2.01780000000
-0,4,2045,electricity,R1,windturbine,2040,all-year,all-week,night,2.08150000000
-1,0,2040,electricity,R1,windturbine,2020,all-year,all-week,morning,1.10000000000
-1,0,2045,electricity,R1,windturbine,2020,all-year,all-week,morning,1.10000000000
-1,1,2040,electricity,R1,windturbine,2025,all-year,all-week,morning,1.54330000000
-1,1,2045,electricity,R1,windturbine,2025,all-year,all-week,morning,1.54330000000
-1,2,2040,electricity,R1,windturbine,2030,all-year,all-week,morning,1.68610000000
-1,2,2045,electricity,R1,windturbine,2030,all-year,all-week,morning,1.68610000000
-1,3,2040,electricity,R1,windturbine,2035,all-year,all-week,morning,2.01780000000
-1,3,2045,electricity,R1,windturbine,2035,all-year,all-week,morning,2.01780000000
-1,4,2045,electricity,R1,windturbine,2040,all-year,all-week,morning,2.08150000000
-2,0,2040,electricity,R1,windturbine,2020,all-year,all-week,afternoon,1.10000000000
-2,0,2045,electricity,R1,windturbine,2020,all-year,all-week,afternoon,1.10000000000
-2,1,2040,electricity,R1,windturbine,2025,all-year,all-week,afternoon,1.54330000000
-2,1,2045,electricity,R1,windturbine,2025,all-year,all-week,afternoon,1.54330000000
-2,2,2040,electricity,R1,windturbine,2030,all-year,all-week,afternoon,1.68610000000
-2,2,2045,electricity,R1,windturbine,2030,all-year,all-week,afternoon,1.68610000000
-2,3,2040,electricity,R1,windturbine,2035,all-year,all-week,afternoon,2.01780000000
-2,3,2045,electricity,R1,windturbine,2035,all-year,all-week,afternoon,2.01780000000
-2,4,2045,electricity,R1,windturbine,2040,all-year,all-week,afternoon,2.08150000000
-3,0,2040,electricity,R1,windturbine,2020,all-year,all-week,early-peak,1.10000000000
-3,0,2045,electricity,R1,windturbine,2020,all-year,all-week,early-peak,1.10000000000
-3,1,2040,electricity,R1,windturbine,2025,all-year,all-week,early-peak,1.54330000000
-3,1,2045,electricity,R1,windturbine,2025,all-year,all-week,early-peak,1.54330000000
-3,2,2040,electricity,R1,windturbine,2030,all-year,all-week,early-peak,1.68610000000
-3,2,2045,electricity,R1,windturbine,2030,all-year,all-week,early-peak,1.68610000000
-3,3,2040,electricity,R1,windturbine,2035,all-year,all-week,early-peak,2.01780000000
-3,3,2045,electricity,R1,windturbine,2035,all-year,all-week,early-peak,2.01780000000
-3,4,2045,electricity,R1,windturbine,2040,all-year,all-week,early-peak,2.08150000000
-4,0,2040,electricity,R1,windturbine,2020,all-year,all-week,late-peak,1.10000000000
-4,0,2045,electricity,R1,windturbine,2020,all-year,all-week,late-peak,1.10000000000
-4,1,2040,electricity,R1,windturbine,2025,all-year,all-week,late-peak,1.54330000000
-4,1,2045,electricity,R1,windturbine,2025,all-year,all-week,late-peak,1.54330000000
-4,2,2040,electricity,R1,windturbine,2030,all-year,all-week,late-peak,1.68610000000
-4,2,2045,electricity,R1,windturbine,2030,all-year,all-week,late-peak,1.68610000000
-4,3,2040,electricity,R1,windturbine,2035,all-year,all-week,late-peak,2.01780000000
-4,3,2045,electricity,R1,windturbine,2035,all-year,all-week,late-peak,2.01780000000
-4,4,2045,electricity,R1,windturbine,2040,all-year,all-week,late-peak,2.08150000000
-5,0,2040,electricity,R1,windturbine,2020,all-year,all-week,evening,1.10000000000
-5,0,2045,electricity,R1,windturbine,2020,all-year,all-week,evening,1.10000000000
-5,1,2040,electricity,R1,windturbine,2025,all-year,all-week,evening,1.54330000000
-5,1,2045,electricity,R1,windturbine,2025,all-year,all-week,evening,1.54330000000
-5,2,2040,electricity,R1,windturbine,2030,all-year,all-week,evening,1.68610000000
-5,2,2045,electricity,R1,windturbine,2030,all-year,all-week,evening,1.68610000000
-5,3,2040,electricity,R1,windturbine,2035,all-year,all-week,evening,2.01780000000
-5,3,2045,electricity,R1,windturbine,2035,all-year,all-week,evening,2.01780000000
-5,4,2045,electricity,R1,windturbine,2040,all-year,all-week,evening,2.08150000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2040,electricity,all-year,all-week,night,R1,windturbine,2020,1.10000000000
+0,0,2045,electricity,all-year,all-week,night,R1,windturbine,2020,1.10000000000
+0,1,2040,electricity,all-year,all-week,night,R1,windturbine,2025,1.54330000000
+0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2025,1.54330000000
+0,2,2040,electricity,all-year,all-week,night,R1,windturbine,2030,1.68610000000
+0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2030,1.68610000000
+0,3,2040,electricity,all-year,all-week,night,R1,windturbine,2035,2.01780000000
+0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2035,2.01780000000
+0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2040,2.08150000000
+1,0,2040,electricity,all-year,all-week,morning,R1,windturbine,2020,1.10000000000
+1,0,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,1.10000000000
+1,1,2040,electricity,all-year,all-week,morning,R1,windturbine,2025,1.54330000000
+1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,1.54330000000
+1,2,2040,electricity,all-year,all-week,morning,R1,windturbine,2030,1.68610000000
+1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,1.68610000000
+1,3,2040,electricity,all-year,all-week,morning,R1,windturbine,2035,2.01780000000
+1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,2.01780000000
+1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,2.08150000000
+2,0,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.10000000000
+2,0,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.10000000000
+2,1,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.54330000000
+2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.54330000000
+2,2,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2030,1.68610000000
+2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,1.68610000000
+2,3,2040,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.01780000000
+2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.01780000000
+2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.08150000000
+3,0,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.10000000000
+3,0,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.10000000000
+3,1,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.54330000000
+3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.54330000000
+3,2,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2030,1.68610000000
+3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,1.68610000000
+3,3,2040,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.01780000000
+3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.01780000000
+3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.08150000000
+4,0,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.10000000000
+4,0,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.10000000000
+4,1,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.54330000000
+4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.54330000000
+4,2,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.68610000000
+4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.68610000000
+4,3,2040,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.01780000000
+4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.01780000000
+4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.08150000000
+5,0,2040,electricity,all-year,all-week,evening,R1,windturbine,2020,1.10000000000
+5,0,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,1.10000000000
+5,1,2040,electricity,all-year,all-week,evening,R1,windturbine,2025,1.54330000000
+5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,1.54330000000
+5,2,2040,electricity,all-year,all-week,evening,R1,windturbine,2030,1.68610000000
+5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,1.68610000000
+5,3,2040,electricity,all-year,all-week,evening,R1,windturbine,2035,2.01780000000
+5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,2.01780000000
+5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,2.08150000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2045.csv b/tests/example_outputs/default_timeslice/Power/Supply/2045.csv
index b4e174f36..d8adfe54b 100644
--- a/tests/example_outputs/default_timeslice/Power/Supply/2045.csv
+++ b/tests/example_outputs/default_timeslice/Power/Supply/2045.csv
@@ -1,61 +1,61 @@
-timeslice,asset,year,commodity,region,technology,installed,month,day,hour,supply
-0,0,2045,electricity,R1,windturbine,2020,all-year,all-week,night,1.10000000000
-0,1,2045,electricity,R1,windturbine,2025,all-year,all-week,night,1.54330000000
-0,1,2050,electricity,R1,windturbine,2025,all-year,all-week,night,1.54330000000
-0,2,2045,electricity,R1,windturbine,2030,all-year,all-week,night,1.68610000000
-0,2,2050,electricity,R1,windturbine,2030,all-year,all-week,night,1.68610000000
-0,3,2045,electricity,R1,windturbine,2035,all-year,all-week,night,2.01780000000
-0,3,2050,electricity,R1,windturbine,2035,all-year,all-week,night,2.01780000000
-0,4,2045,electricity,R1,windturbine,2040,all-year,all-week,night,2.08150000000
-0,4,2050,electricity,R1,windturbine,2040,all-year,all-week,night,2.08150000000
-0,5,2050,electricity,R1,windturbine,2045,all-year,all-week,night,2.37860000000
-1,0,2045,electricity,R1,windturbine,2020,all-year,all-week,morning,1.10000000000
-1,1,2045,electricity,R1,windturbine,2025,all-year,all-week,morning,1.54330000000
-1,1,2050,electricity,R1,windturbine,2025,all-year,all-week,morning,1.54330000000
-1,2,2045,electricity,R1,windturbine,2030,all-year,all-week,morning,1.68610000000
-1,2,2050,electricity,R1,windturbine,2030,all-year,all-week,morning,1.68610000000
-1,3,2045,electricity,R1,windturbine,2035,all-year,all-week,morning,2.01780000000
-1,3,2050,electricity,R1,windturbine,2035,all-year,all-week,morning,2.01780000000
-1,4,2045,electricity,R1,windturbine,2040,all-year,all-week,morning,2.08150000000
-1,4,2050,electricity,R1,windturbine,2040,all-year,all-week,morning,2.08150000000
-1,5,2050,electricity,R1,windturbine,2045,all-year,all-week,morning,2.37860000000
-2,0,2045,electricity,R1,windturbine,2020,all-year,all-week,afternoon,1.10000000000
-2,1,2045,electricity,R1,windturbine,2025,all-year,all-week,afternoon,1.54330000000
-2,1,2050,electricity,R1,windturbine,2025,all-year,all-week,afternoon,1.54330000000
-2,2,2045,electricity,R1,windturbine,2030,all-year,all-week,afternoon,1.68610000000
-2,2,2050,electricity,R1,windturbine,2030,all-year,all-week,afternoon,1.68610000000
-2,3,2045,electricity,R1,windturbine,2035,all-year,all-week,afternoon,2.01780000000
-2,3,2050,electricity,R1,windturbine,2035,all-year,all-week,afternoon,2.01780000000
-2,4,2045,electricity,R1,windturbine,2040,all-year,all-week,afternoon,2.08150000000
-2,4,2050,electricity,R1,windturbine,2040,all-year,all-week,afternoon,2.08150000000
-2,5,2050,electricity,R1,windturbine,2045,all-year,all-week,afternoon,2.37860000000
-3,0,2045,electricity,R1,windturbine,2020,all-year,all-week,early-peak,1.10000000000
-3,1,2045,electricity,R1,windturbine,2025,all-year,all-week,early-peak,1.54330000000
-3,1,2050,electricity,R1,windturbine,2025,all-year,all-week,early-peak,1.54330000000
-3,2,2045,electricity,R1,windturbine,2030,all-year,all-week,early-peak,1.68610000000
-3,2,2050,electricity,R1,windturbine,2030,all-year,all-week,early-peak,1.68610000000
-3,3,2045,electricity,R1,windturbine,2035,all-year,all-week,early-peak,2.01780000000
-3,3,2050,electricity,R1,windturbine,2035,all-year,all-week,early-peak,2.01780000000
-3,4,2045,electricity,R1,windturbine,2040,all-year,all-week,early-peak,2.08150000000
-3,4,2050,electricity,R1,windturbine,2040,all-year,all-week,early-peak,2.08150000000
-3,5,2050,electricity,R1,windturbine,2045,all-year,all-week,early-peak,2.37860000000
-4,0,2045,electricity,R1,windturbine,2020,all-year,all-week,late-peak,1.10000000000
-4,1,2045,electricity,R1,windturbine,2025,all-year,all-week,late-peak,1.54330000000
-4,1,2050,electricity,R1,windturbine,2025,all-year,all-week,late-peak,1.54330000000
-4,2,2045,electricity,R1,windturbine,2030,all-year,all-week,late-peak,1.68610000000
-4,2,2050,electricity,R1,windturbine,2030,all-year,all-week,late-peak,1.68610000000
-4,3,2045,electricity,R1,windturbine,2035,all-year,all-week,late-peak,2.01780000000
-4,3,2050,electricity,R1,windturbine,2035,all-year,all-week,late-peak,2.01780000000
-4,4,2045,electricity,R1,windturbine,2040,all-year,all-week,late-peak,2.08150000000
-4,4,2050,electricity,R1,windturbine,2040,all-year,all-week,late-peak,2.08150000000
-4,5,2050,electricity,R1,windturbine,2045,all-year,all-week,late-peak,2.37860000000
-5,0,2045,electricity,R1,windturbine,2020,all-year,all-week,evening,1.10000000000
-5,1,2045,electricity,R1,windturbine,2025,all-year,all-week,evening,1.54330000000
-5,1,2050,electricity,R1,windturbine,2025,all-year,all-week,evening,1.54330000000
-5,2,2045,electricity,R1,windturbine,2030,all-year,all-week,evening,1.68610000000
-5,2,2050,electricity,R1,windturbine,2030,all-year,all-week,evening,1.68610000000
-5,3,2045,electricity,R1,windturbine,2035,all-year,all-week,evening,2.01780000000
-5,3,2050,electricity,R1,windturbine,2035,all-year,all-week,evening,2.01780000000
-5,4,2045,electricity,R1,windturbine,2040,all-year,all-week,evening,2.08150000000
-5,4,2050,electricity,R1,windturbine,2040,all-year,all-week,evening,2.08150000000
-5,5,2050,electricity,R1,windturbine,2045,all-year,all-week,evening,2.37860000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,0,2045,electricity,all-year,all-week,night,R1,windturbine,2020,1.10000000000
+0,1,2045,electricity,all-year,all-week,night,R1,windturbine,2025,1.54330000000
+0,1,2050,electricity,all-year,all-week,night,R1,windturbine,2025,1.54330000000
+0,2,2045,electricity,all-year,all-week,night,R1,windturbine,2030,1.68610000000
+0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2030,1.68610000000
+0,3,2045,electricity,all-year,all-week,night,R1,windturbine,2035,2.01780000000
+0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2035,2.01780000000
+0,4,2045,electricity,all-year,all-week,night,R1,windturbine,2040,2.08150000000
+0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2040,2.08150000000
+0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2045,2.37860000000
+1,0,2045,electricity,all-year,all-week,morning,R1,windturbine,2020,1.10000000000
+1,1,2045,electricity,all-year,all-week,morning,R1,windturbine,2025,1.54330000000
+1,1,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,1.54330000000
+1,2,2045,electricity,all-year,all-week,morning,R1,windturbine,2030,1.68610000000
+1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,1.68610000000
+1,3,2045,electricity,all-year,all-week,morning,R1,windturbine,2035,2.01780000000
+1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,2.01780000000
+1,4,2045,electricity,all-year,all-week,morning,R1,windturbine,2040,2.08150000000
+1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,2.08150000000
+1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,2.37860000000
+2,0,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2020,1.10000000000
+2,1,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.54330000000
+2,1,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.54330000000
+2,2,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2030,1.68610000000
+2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,1.68610000000
+2,3,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.01780000000
+2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.01780000000
+2,4,2045,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.08150000000
+2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.08150000000
+2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,2.37860000000
+3,0,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2020,1.10000000000
+3,1,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.54330000000
+3,1,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.54330000000
+3,2,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2030,1.68610000000
+3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,1.68610000000
+3,3,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.01780000000
+3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.01780000000
+3,4,2045,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.08150000000
+3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.08150000000
+3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,2.37860000000
+4,0,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2020,1.10000000000
+4,1,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.54330000000
+4,1,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.54330000000
+4,2,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.68610000000
+4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.68610000000
+4,3,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.01780000000
+4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.01780000000
+4,4,2045,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.08150000000
+4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.08150000000
+4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,2.37860000000
+5,0,2045,electricity,all-year,all-week,evening,R1,windturbine,2020,1.10000000000
+5,1,2045,electricity,all-year,all-week,evening,R1,windturbine,2025,1.54330000000
+5,1,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,1.54330000000
+5,2,2045,electricity,all-year,all-week,evening,R1,windturbine,2030,1.68610000000
+5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,1.68610000000
+5,3,2045,electricity,all-year,all-week,evening,R1,windturbine,2035,2.01780000000
+5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,2.01780000000
+5,4,2045,electricity,all-year,all-week,evening,R1,windturbine,2040,2.08150000000
+5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,2.08150000000
+5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,2.37860000000
diff --git a/tests/example_outputs/default_timeslice/Power/Supply/2050.csv b/tests/example_outputs/default_timeslice/Power/Supply/2050.csv
index 06be5a1fa..0f54b4280 100644
--- a/tests/example_outputs/default_timeslice/Power/Supply/2050.csv
+++ b/tests/example_outputs/default_timeslice/Power/Supply/2050.csv
@@ -1,61 +1,61 @@
-timeslice,asset,year,commodity,region,installed,technology,month,day,hour,supply
-0,1,2050,electricity,R1,2025,windturbine,all-year,all-week,night,1.54330000000
-0,2,2050,electricity,R1,2030,windturbine,all-year,all-week,night,1.68610000000
-0,2,2055,electricity,R1,2030,windturbine,all-year,all-week,night,1.68610000000
-0,3,2050,electricity,R1,2035,windturbine,all-year,all-week,night,2.01780000000
-0,3,2055,electricity,R1,2035,windturbine,all-year,all-week,night,2.01780000000
-0,4,2050,electricity,R1,2040,windturbine,all-year,all-week,night,2.08150000000
-0,4,2055,electricity,R1,2040,windturbine,all-year,all-week,night,2.08150000000
-0,5,2050,electricity,R1,2045,windturbine,all-year,all-week,night,2.37860000000
-0,5,2055,electricity,R1,2045,windturbine,all-year,all-week,night,2.37860000000
-0,6,2055,electricity,R1,2050,windturbine,all-year,all-week,night,2.23940000000
-1,1,2050,electricity,R1,2025,windturbine,all-year,all-week,morning,1.54330000000
-1,2,2050,electricity,R1,2030,windturbine,all-year,all-week,morning,1.68610000000
-1,2,2055,electricity,R1,2030,windturbine,all-year,all-week,morning,1.68610000000
-1,3,2050,electricity,R1,2035,windturbine,all-year,all-week,morning,2.01780000000
-1,3,2055,electricity,R1,2035,windturbine,all-year,all-week,morning,2.01780000000
-1,4,2050,electricity,R1,2040,windturbine,all-year,all-week,morning,2.08150000000
-1,4,2055,electricity,R1,2040,windturbine,all-year,all-week,morning,2.08150000000
-1,5,2050,electricity,R1,2045,windturbine,all-year,all-week,morning,2.37860000000
-1,5,2055,electricity,R1,2045,windturbine,all-year,all-week,morning,2.37860000000
-1,6,2055,electricity,R1,2050,windturbine,all-year,all-week,morning,2.23940000000
-2,1,2050,electricity,R1,2025,windturbine,all-year,all-week,afternoon,1.54330000000
-2,2,2050,electricity,R1,2030,windturbine,all-year,all-week,afternoon,1.68610000000
-2,2,2055,electricity,R1,2030,windturbine,all-year,all-week,afternoon,1.68610000000
-2,3,2050,electricity,R1,2035,windturbine,all-year,all-week,afternoon,2.01780000000
-2,3,2055,electricity,R1,2035,windturbine,all-year,all-week,afternoon,2.01780000000
-2,4,2050,electricity,R1,2040,windturbine,all-year,all-week,afternoon,2.08150000000
-2,4,2055,electricity,R1,2040,windturbine,all-year,all-week,afternoon,2.08150000000
-2,5,2050,electricity,R1,2045,windturbine,all-year,all-week,afternoon,2.37860000000
-2,5,2055,electricity,R1,2045,windturbine,all-year,all-week,afternoon,2.37860000000
-2,6,2055,electricity,R1,2050,windturbine,all-year,all-week,afternoon,2.23940000000
-3,1,2050,electricity,R1,2025,windturbine,all-year,all-week,early-peak,1.54330000000
-3,2,2050,electricity,R1,2030,windturbine,all-year,all-week,early-peak,1.68610000000
-3,2,2055,electricity,R1,2030,windturbine,all-year,all-week,early-peak,1.68610000000
-3,3,2050,electricity,R1,2035,windturbine,all-year,all-week,early-peak,2.01780000000
-3,3,2055,electricity,R1,2035,windturbine,all-year,all-week,early-peak,2.01780000000
-3,4,2050,electricity,R1,2040,windturbine,all-year,all-week,early-peak,2.08150000000
-3,4,2055,electricity,R1,2040,windturbine,all-year,all-week,early-peak,2.08150000000
-3,5,2050,electricity,R1,2045,windturbine,all-year,all-week,early-peak,2.37860000000
-3,5,2055,electricity,R1,2045,windturbine,all-year,all-week,early-peak,2.37860000000
-3,6,2055,electricity,R1,2050,windturbine,all-year,all-week,early-peak,2.23940000000
-4,1,2050,electricity,R1,2025,windturbine,all-year,all-week,late-peak,1.54330000000
-4,2,2050,electricity,R1,2030,windturbine,all-year,all-week,late-peak,1.68610000000
-4,2,2055,electricity,R1,2030,windturbine,all-year,all-week,late-peak,1.68610000000
-4,3,2050,electricity,R1,2035,windturbine,all-year,all-week,late-peak,2.01780000000
-4,3,2055,electricity,R1,2035,windturbine,all-year,all-week,late-peak,2.01780000000
-4,4,2050,electricity,R1,2040,windturbine,all-year,all-week,late-peak,2.08150000000
-4,4,2055,electricity,R1,2040,windturbine,all-year,all-week,late-peak,2.08150000000
-4,5,2050,electricity,R1,2045,windturbine,all-year,all-week,late-peak,2.37860000000
-4,5,2055,electricity,R1,2045,windturbine,all-year,all-week,late-peak,2.37860000000
-4,6,2055,electricity,R1,2050,windturbine,all-year,all-week,late-peak,2.23940000000
-5,1,2050,electricity,R1,2025,windturbine,all-year,all-week,evening,1.54330000000
-5,2,2050,electricity,R1,2030,windturbine,all-year,all-week,evening,1.68610000000
-5,2,2055,electricity,R1,2030,windturbine,all-year,all-week,evening,1.68610000000
-5,3,2050,electricity,R1,2035,windturbine,all-year,all-week,evening,2.01780000000
-5,3,2055,electricity,R1,2035,windturbine,all-year,all-week,evening,2.01780000000
-5,4,2050,electricity,R1,2040,windturbine,all-year,all-week,evening,2.08150000000
-5,4,2055,electricity,R1,2040,windturbine,all-year,all-week,evening,2.08150000000
-5,5,2050,electricity,R1,2045,windturbine,all-year,all-week,evening,2.37860000000
-5,5,2055,electricity,R1,2045,windturbine,all-year,all-week,evening,2.37860000000
-5,6,2055,electricity,R1,2050,windturbine,all-year,all-week,evening,2.23940000000
+timeslice,asset,year,commodity,month,day,hour,region,technology,installed,supply
+0,1,2050,electricity,all-year,all-week,night,R1,windturbine,2025,1.54330000000
+0,2,2050,electricity,all-year,all-week,night,R1,windturbine,2030,1.68610000000
+0,2,2055,electricity,all-year,all-week,night,R1,windturbine,2030,1.68610000000
+0,3,2050,electricity,all-year,all-week,night,R1,windturbine,2035,2.01780000000
+0,3,2055,electricity,all-year,all-week,night,R1,windturbine,2035,2.01780000000
+0,4,2050,electricity,all-year,all-week,night,R1,windturbine,2040,2.08150000000
+0,4,2055,electricity,all-year,all-week,night,R1,windturbine,2040,2.08150000000
+0,5,2050,electricity,all-year,all-week,night,R1,windturbine,2045,2.37860000000
+0,5,2055,electricity,all-year,all-week,night,R1,windturbine,2045,2.37860000000
+0,6,2055,electricity,all-year,all-week,night,R1,windturbine,2050,2.23940000000
+1,1,2050,electricity,all-year,all-week,morning,R1,windturbine,2025,1.54330000000
+1,2,2050,electricity,all-year,all-week,morning,R1,windturbine,2030,1.68610000000
+1,2,2055,electricity,all-year,all-week,morning,R1,windturbine,2030,1.68610000000
+1,3,2050,electricity,all-year,all-week,morning,R1,windturbine,2035,2.01780000000
+1,3,2055,electricity,all-year,all-week,morning,R1,windturbine,2035,2.01780000000
+1,4,2050,electricity,all-year,all-week,morning,R1,windturbine,2040,2.08150000000
+1,4,2055,electricity,all-year,all-week,morning,R1,windturbine,2040,2.08150000000
+1,5,2050,electricity,all-year,all-week,morning,R1,windturbine,2045,2.37860000000
+1,5,2055,electricity,all-year,all-week,morning,R1,windturbine,2045,2.37860000000
+1,6,2055,electricity,all-year,all-week,morning,R1,windturbine,2050,2.23940000000
+2,1,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2025,1.54330000000
+2,2,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2030,1.68610000000
+2,2,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2030,1.68610000000
+2,3,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.01780000000
+2,3,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2035,2.01780000000
+2,4,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.08150000000
+2,4,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2040,2.08150000000
+2,5,2050,electricity,all-year,all-week,afternoon,R1,windturbine,2045,2.37860000000
+2,5,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2045,2.37860000000
+2,6,2055,electricity,all-year,all-week,afternoon,R1,windturbine,2050,2.23940000000
+3,1,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2025,1.54330000000
+3,2,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2030,1.68610000000
+3,2,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2030,1.68610000000
+3,3,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.01780000000
+3,3,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2035,2.01780000000
+3,4,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.08150000000
+3,4,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2040,2.08150000000
+3,5,2050,electricity,all-year,all-week,early-peak,R1,windturbine,2045,2.37860000000
+3,5,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2045,2.37860000000
+3,6,2055,electricity,all-year,all-week,early-peak,R1,windturbine,2050,2.23940000000
+4,1,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2025,1.54330000000
+4,2,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.68610000000
+4,2,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2030,1.68610000000
+4,3,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.01780000000
+4,3,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2035,2.01780000000
+4,4,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.08150000000
+4,4,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2040,2.08150000000
+4,5,2050,electricity,all-year,all-week,late-peak,R1,windturbine,2045,2.37860000000
+4,5,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2045,2.37860000000
+4,6,2055,electricity,all-year,all-week,late-peak,R1,windturbine,2050,2.23940000000
+5,1,2050,electricity,all-year,all-week,evening,R1,windturbine,2025,1.54330000000
+5,2,2050,electricity,all-year,all-week,evening,R1,windturbine,2030,1.68610000000
+5,2,2055,electricity,all-year,all-week,evening,R1,windturbine,2030,1.68610000000
+5,3,2050,electricity,all-year,all-week,evening,R1,windturbine,2035,2.01780000000
+5,3,2055,electricity,all-year,all-week,evening,R1,windturbine,2035,2.01780000000
+5,4,2050,electricity,all-year,all-week,evening,R1,windturbine,2040,2.08150000000
+5,4,2055,electricity,all-year,all-week,evening,R1,windturbine,2040,2.08150000000
+5,5,2050,electricity,all-year,all-week,evening,R1,windturbine,2045,2.37860000000
+5,5,2055,electricity,all-year,all-week,evening,R1,windturbine,2045,2.37860000000
+5,6,2055,electricity,all-year,all-week,evening,R1,windturbine,2050,2.23940000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Capacity/2050.csv b/tests/example_outputs/default_timeslice/Residential/Capacity/2050.csv
index 305b627b2..42f4be20c 100644
--- a/tests/example_outputs/default_timeslice/Residential/Capacity/2050.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Capacity/2050.csv
@@ -1,11 +1,11 @@
-asset,year,region,installed,technology,capacity
-2,2050,R1,2040,heatpump,31.00000000000
-2,2054,R1,2040,heatpump,31.00000000000
-3,2050,R1,2045,heatpump,23.00000000000
-3,2054,R1,2045,heatpump,23.00000000000
-3,2055,R1,2045,heatpump,23.00000000000
-3,2059,R1,2045,heatpump,23.00000000000
-4,2055,R1,2050,heatpump,31.00000000000
-4,2059,R1,2050,heatpump,31.00000000000
-4,2060,R1,2050,heatpump,31.00000000000
-4,2064,R1,2050,heatpump,31.00000000000
+asset,year,region,technology,installed,capacity
+2,2050,R1,heatpump,2040,31.00000000000
+2,2054,R1,heatpump,2040,31.00000000000
+3,2050,R1,heatpump,2045,23.00000000000
+3,2054,R1,heatpump,2045,23.00000000000
+3,2055,R1,heatpump,2045,23.00000000000
+3,2059,R1,heatpump,2045,23.00000000000
+4,2055,R1,heatpump,2050,31.00000000000
+4,2059,R1,heatpump,2050,31.00000000000
+4,2060,R1,heatpump,2050,31.00000000000
+4,2064,R1,heatpump,2050,31.00000000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2020.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2020.csv
index a44059a3e..7b8c4061d 100644
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2020.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Supply/2020.csv
@@ -1,31 +1,31 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2020,0,R1,gasboiler,2020,all-year,all-week,night,1.00000000000
-0,heat,2025,0,R1,gasboiler,2020,all-year,all-week,night,0.27780000000
-0,heat,2025,1,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,night,64.71000000000
-0,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,night,17.97500000000
-1,heat,2020,0,R1,gasboiler,2020,all-year,all-week,morning,1.50000000000
-1,heat,2025,0,R1,gasboiler,2020,all-year,all-week,morning,0.41670000000
-1,heat,2025,1,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,morning,97.06500000000
-1,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,morning,26.96250000000
-2,heat,2020,0,R1,gasboiler,2020,all-year,all-week,afternoon,1.00000000000
-2,heat,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.27780000000
-2,heat,2025,1,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,afternoon,64.71000000000
-2,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,17.97500000000
-3,heat,2020,0,R1,gasboiler,2020,all-year,all-week,early-peak,1.50000000000
-3,heat,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.41670000000
-3,heat,2025,1,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,early-peak,97.06500000000
-3,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,26.96250000000
-4,heat,2020,0,R1,gasboiler,2020,all-year,all-week,late-peak,3.00000000000
-4,heat,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,0.83330000000
-4,heat,2025,1,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,late-peak,194.13000000000
-4,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,53.92500000000
-5,heat,2020,0,R1,gasboiler,2020,all-year,all-week,evening,2.00000000000
-5,heat,2025,0,R1,gasboiler,2020,all-year,all-week,evening,0.55560000000
-5,heat,2025,1,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,evening,129.42000000000
-5,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,evening,35.95000000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,1.00000000000
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,64.71000000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2025.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2025.csv
index c9ed8c00b..bfe116d0b 100644
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2025.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Supply/2025.csv
@@ -1,43 +1,43 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2025,0,R1,gasboiler,2020,all-year,all-week,night,0.27780000000
-0,heat,2025,2,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,heat,2030,1,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2030,2,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,heat,2030,3,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,night,17.97500000000
-0,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-1,heat,2025,0,R1,gasboiler,2020,all-year,all-week,morning,0.41670000000
-1,heat,2025,2,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,heat,2030,1,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2030,2,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,heat,2030,3,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,morning,26.96250000000
-1,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-2,heat,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.27780000000
-2,heat,2025,2,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,heat,2030,1,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2030,2,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,heat,2030,3,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,17.97500000000
-2,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-3,heat,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.41670000000
-3,heat,2025,2,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,heat,2030,1,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2030,2,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,heat,2030,3,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,26.96250000000
-3,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-4,heat,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,0.83330000000
-4,heat,2025,2,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,heat,2030,1,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2030,2,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,heat,2030,3,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,53.92500000000
-4,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-5,heat,2025,0,R1,gasboiler,2020,all-year,all-week,evening,0.55560000000
-5,heat,2025,2,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,heat,2030,1,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2030,2,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,heat,2030,3,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,evening,35.95000000000
-5,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+0,heat,2025,2,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,3,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+1,heat,2025,2,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,3,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+2,heat,2025,2,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,3,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+3,heat,2025,2,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,3,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+4,heat,2025,2,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,3,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+5,heat,2025,2,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,3,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2030.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2030.csv
index 61ae11982..82873caab 100644
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2030.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Supply/2030.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2030,0,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2030,1,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,heat,2030,2,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,heat,2035,0,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2035,2,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,heat,2035,3,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-0,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-1,heat,2030,0,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2030,1,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,heat,2030,2,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,heat,2035,0,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2035,2,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,heat,2035,3,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-1,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-2,heat,2030,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2030,1,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,heat,2030,2,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,heat,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2035,2,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,heat,2035,3,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-2,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-3,heat,2030,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2030,1,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,heat,2030,2,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,heat,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2035,2,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,heat,2035,3,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-3,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-4,heat,2030,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2030,1,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,heat,2030,2,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,heat,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2035,2,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,heat,2035,3,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-4,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-5,heat,2030,0,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2030,1,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,heat,2030,2,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,heat,2035,0,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2035,2,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,heat,2035,3,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
-5,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,CO2f,2030,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,CO2f,2030,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,CO2f,2030,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,CO2f,2030,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,CO2f,2030,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,CO2f,2030,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2035.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2035.csv
index 89e0bd4e1..741ea3c65 100644
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2035.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Supply/2035.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2035,0,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2035,2,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,heat,2035,3,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,heat,2040,1,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2040,3,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,heat,2040,4,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-0,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-1,heat,2035,0,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2035,2,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,heat,2035,3,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,heat,2040,1,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2040,3,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,heat,2040,4,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-1,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-2,heat,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2035,2,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,heat,2035,3,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,heat,2040,1,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2040,3,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,heat,2040,4,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-2,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-3,heat,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2035,2,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,heat,2035,3,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,heat,2040,1,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2040,3,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,heat,2040,4,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-3,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-4,heat,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2035,2,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,heat,2035,3,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,heat,2040,1,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2040,3,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,heat,2040,4,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-4,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-5,heat,2035,0,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2035,2,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,heat,2035,3,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,heat,2040,1,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2040,3,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,heat,2040,4,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
-5,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,1,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+0,CO2f,2040,1,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,1,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+1,CO2f,2040,1,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,1,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+2,CO2f,2040,1,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,1,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+3,CO2f,2040,1,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,1,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+4,CO2f,2040,1,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,1,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
+5,CO2f,2040,1,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2040.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2040.csv
index 663e47a5a..c802f3409 100644
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2040.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Supply/2040.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2040,0,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2040,1,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,heat,2040,2,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,heat,2045,0,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2045,2,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,heat,2045,3,R1,heatpump,2040,all-year,all-week,night,1.72220000000
-0,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-0,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-1,heat,2040,0,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2040,1,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,heat,2040,2,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,heat,2045,0,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2045,2,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,heat,2045,3,R1,heatpump,2040,all-year,all-week,morning,2.58330000000
-1,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-1,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-2,heat,2040,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2040,1,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,heat,2040,2,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,heat,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2045,2,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,heat,2045,3,R1,heatpump,2040,all-year,all-week,afternoon,1.72220000000
-2,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-2,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-3,heat,2040,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2040,1,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,heat,2040,2,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,heat,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2045,2,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,heat,2045,3,R1,heatpump,2040,all-year,all-week,early-peak,2.58330000000
-3,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-3,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-4,heat,2040,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2040,1,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,heat,2040,2,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,heat,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2045,2,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,heat,2045,3,R1,heatpump,2040,all-year,all-week,late-peak,5.16670000000
-4,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-4,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-5,heat,2040,0,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2040,1,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,heat,2040,2,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,heat,2045,0,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2045,2,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,heat,2045,3,R1,heatpump,2040,all-year,all-week,evening,3.44440000000
-5,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
-5,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2040,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2040,1,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,2,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,heat,2045,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2045,2,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,CO2f,2040,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+0,CO2f,2045,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+1,heat,2040,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2040,1,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,heat,2045,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2045,2,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,CO2f,2040,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+1,CO2f,2045,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+2,heat,2040,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2040,1,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,heat,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2045,2,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,CO2f,2040,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+2,CO2f,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+3,heat,2040,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2040,1,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,heat,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2045,2,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,CO2f,2040,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+3,CO2f,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+4,heat,2040,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2040,1,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,heat,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2045,2,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,CO2f,2040,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+4,CO2f,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+5,heat,2040,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2040,1,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,heat,2045,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2045,2,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,CO2f,2040,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
+5,CO2f,2045,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2045.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2045.csv
index 6e2884e67..c7be86b20 100644
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2045.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Supply/2045.csv
@@ -1,37 +1,37 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2045,0,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2045,1,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,heat,2045,2,R1,heatpump,2040,all-year,all-week,night,1.72220000000
-0,heat,2050,2,R1,heatpump,2040,all-year,all-week,night,1.72220000000
-0,heat,2050,3,R1,heatpump,2045,all-year,all-week,night,1.27780000000
-0,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-1,heat,2045,0,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2045,1,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,heat,2045,2,R1,heatpump,2040,all-year,all-week,morning,2.58330000000
-1,heat,2050,2,R1,heatpump,2040,all-year,all-week,morning,2.58330000000
-1,heat,2050,3,R1,heatpump,2045,all-year,all-week,morning,1.91670000000
-1,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-2,heat,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2045,1,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,heat,2045,2,R1,heatpump,2040,all-year,all-week,afternoon,1.72220000000
-2,heat,2050,2,R1,heatpump,2040,all-year,all-week,afternoon,1.72220000000
-2,heat,2050,3,R1,heatpump,2045,all-year,all-week,afternoon,1.27780000000
-2,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-3,heat,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2045,1,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,heat,2045,2,R1,heatpump,2040,all-year,all-week,early-peak,2.58330000000
-3,heat,2050,2,R1,heatpump,2040,all-year,all-week,early-peak,2.58330000000
-3,heat,2050,3,R1,heatpump,2045,all-year,all-week,early-peak,1.91670000000
-3,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-4,heat,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2045,1,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,heat,2045,2,R1,heatpump,2040,all-year,all-week,late-peak,5.16670000000
-4,heat,2050,2,R1,heatpump,2040,all-year,all-week,late-peak,5.16670000000
-4,heat,2050,3,R1,heatpump,2045,all-year,all-week,late-peak,3.83330000000
-4,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-5,heat,2045,0,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2045,1,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,heat,2045,2,R1,heatpump,2040,all-year,all-week,evening,3.44440000000
-5,heat,2050,2,R1,heatpump,2040,all-year,all-week,evening,3.44440000000
-5,heat,2050,3,R1,heatpump,2045,all-year,all-week,evening,2.55560000000
-5,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2045,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2045,1,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,heat,2045,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,CO2f,2045,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+1,heat,2045,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2045,1,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,heat,2045,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,CO2f,2045,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+2,heat,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2045,1,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,heat,2045,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,CO2f,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+3,heat,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2045,1,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,heat,2045,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,CO2f,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+4,heat,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2045,1,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,heat,2045,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,CO2f,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+5,heat,2045,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2045,1,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,heat,2045,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,CO2f,2045,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/tests/example_outputs/default_timeslice/Residential/Supply/2050.csv b/tests/example_outputs/default_timeslice/Residential/Supply/2050.csv
index 61004cae8..8c1871538 100644
--- a/tests/example_outputs/default_timeslice/Residential/Supply/2050.csv
+++ b/tests/example_outputs/default_timeslice/Residential/Supply/2050.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,heat,2050,2,R1,2040,heatpump,all-year,all-week,night,1.72220000000
-0,heat,2050,3,R1,2045,heatpump,all-year,all-week,night,1.27780000000
-0,heat,2055,3,R1,2045,heatpump,all-year,all-week,night,1.27780000000
-0,heat,2055,4,R1,2050,heatpump,all-year,all-week,night,1.72220000000
-1,heat,2050,2,R1,2040,heatpump,all-year,all-week,morning,2.58330000000
-1,heat,2050,3,R1,2045,heatpump,all-year,all-week,morning,1.91670000000
-1,heat,2055,3,R1,2045,heatpump,all-year,all-week,morning,1.91670000000
-1,heat,2055,4,R1,2050,heatpump,all-year,all-week,morning,2.58330000000
-2,heat,2050,2,R1,2040,heatpump,all-year,all-week,afternoon,1.72220000000
-2,heat,2050,3,R1,2045,heatpump,all-year,all-week,afternoon,1.27780000000
-2,heat,2055,3,R1,2045,heatpump,all-year,all-week,afternoon,1.27780000000
-2,heat,2055,4,R1,2050,heatpump,all-year,all-week,afternoon,1.72220000000
-3,heat,2050,2,R1,2040,heatpump,all-year,all-week,early-peak,2.58330000000
-3,heat,2050,3,R1,2045,heatpump,all-year,all-week,early-peak,1.91670000000
-3,heat,2055,3,R1,2045,heatpump,all-year,all-week,early-peak,1.91670000000
-3,heat,2055,4,R1,2050,heatpump,all-year,all-week,early-peak,2.58330000000
-4,heat,2050,2,R1,2040,heatpump,all-year,all-week,late-peak,5.16670000000
-4,heat,2050,3,R1,2045,heatpump,all-year,all-week,late-peak,3.83330000000
-4,heat,2055,3,R1,2045,heatpump,all-year,all-week,late-peak,3.83330000000
-4,heat,2055,4,R1,2050,heatpump,all-year,all-week,late-peak,5.16670000000
-5,heat,2050,2,R1,2040,heatpump,all-year,all-week,evening,3.44440000000
-5,heat,2050,3,R1,2045,heatpump,all-year,all-week,evening,2.55560000000
-5,heat,2055,3,R1,2045,heatpump,all-year,all-week,evening,2.55560000000
-5,heat,2055,4,R1,2050,heatpump,all-year,all-week,evening,3.44440000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2050,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,4,R1,all-year,all-week,night,heatpump,2050,1.72220000000
+1,heat,2050,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,4,R1,all-year,all-week,morning,heatpump,2050,2.58330000000
+2,heat,2050,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,4,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
+3,heat,2050,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,4,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
+4,heat,2050,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,4,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
+5,heat,2050,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,4,R1,all-year,all-week,evening,heatpump,2050,3.44440000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2035.csv b/tests/example_outputs/medium/Gas/Capacity/2035.csv
index b3a9223e6..093329d29 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2035.csv
@@ -1,32 +1,32 @@
-asset,year,region,installed,technology,capacity
-0,2035,R1,2020,gassupply1,10.33930000000
-0,2040,R1,2020,gassupply1,10.33930000000
-0,2045,R1,2020,gassupply1,10.33930000000
-0,2050,R1,2020,gassupply1,10.33930000000
-0,2059,R1,2020,gassupply1,10.33930000000
-1,2035,R1,2025,gassupply1,8.64650000000
-1,2040,R1,2025,gassupply1,8.64650000000
-1,2045,R1,2025,gassupply1,8.64650000000
-1,2050,R1,2025,gassupply1,8.64650000000
-1,2059,R1,2025,gassupply1,8.64650000000
-1,2060,R1,2025,gassupply1,8.64650000000
-1,2064,R1,2025,gassupply1,8.64650000000
-2,2035,R1,2030,gassupply1,10.83330000000
-2,2040,R1,2030,gassupply1,10.83330000000
-2,2045,R1,2030,gassupply1,10.83330000000
-2,2050,R1,2030,gassupply1,10.83330000000
-2,2059,R1,2030,gassupply1,10.83330000000
-2,2060,R1,2030,gassupply1,10.83330000000
-2,2064,R1,2030,gassupply1,10.83330000000
-2,2065,R1,2030,gassupply1,10.83330000000
-2,2069,R1,2030,gassupply1,10.83330000000
-3,2040,R1,2035,gassupply1,1.98970000000
-3,2045,R1,2035,gassupply1,1.98970000000
-3,2050,R1,2035,gassupply1,1.98970000000
-3,2059,R1,2035,gassupply1,1.98970000000
-3,2060,R1,2035,gassupply1,1.98970000000
-3,2064,R1,2035,gassupply1,1.98970000000
-3,2065,R1,2035,gassupply1,1.98970000000
-3,2069,R1,2035,gassupply1,1.98970000000
-3,2070,R1,2035,gassupply1,1.98970000000
-3,2074,R1,2035,gassupply1,1.98970000000
+asset,year,region,technology,installed,capacity
+0,2035,R1,gassupply1,2020,10.33930000000
+0,2040,R1,gassupply1,2020,10.33930000000
+0,2045,R1,gassupply1,2020,10.33930000000
+0,2050,R1,gassupply1,2020,10.33930000000
+0,2059,R1,gassupply1,2020,10.33930000000
+1,2035,R1,gassupply1,2025,8.64650000000
+1,2040,R1,gassupply1,2025,8.64650000000
+1,2045,R1,gassupply1,2025,8.64650000000
+1,2050,R1,gassupply1,2025,8.64650000000
+1,2059,R1,gassupply1,2025,8.64650000000
+1,2060,R1,gassupply1,2025,8.64650000000
+1,2064,R1,gassupply1,2025,8.64650000000
+2,2035,R1,gassupply1,2030,10.83330000000
+2,2040,R1,gassupply1,2030,10.83330000000
+2,2045,R1,gassupply1,2030,10.83330000000
+2,2050,R1,gassupply1,2030,10.83330000000
+2,2059,R1,gassupply1,2030,10.83330000000
+2,2060,R1,gassupply1,2030,10.83330000000
+2,2064,R1,gassupply1,2030,10.83330000000
+2,2065,R1,gassupply1,2030,10.83330000000
+2,2069,R1,gassupply1,2030,10.83330000000
+3,2040,R1,gassupply1,2035,1.98970000000
+3,2045,R1,gassupply1,2035,1.98970000000
+3,2050,R1,gassupply1,2035,1.98970000000
+3,2059,R1,gassupply1,2035,1.98970000000
+3,2060,R1,gassupply1,2035,1.98970000000
+3,2064,R1,gassupply1,2035,1.98970000000
+3,2065,R1,gassupply1,2035,1.98970000000
+3,2069,R1,gassupply1,2035,1.98970000000
+3,2070,R1,gassupply1,2035,1.98970000000
+3,2074,R1,gassupply1,2035,1.98970000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2040.csv b/tests/example_outputs/medium/Gas/Capacity/2040.csv
index fc71225ce..fc101b3af 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2040.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2040.csv
@@ -1,40 +1,40 @@
-asset,year,region,installed,technology,capacity
-0,2040,R1,2020,gassupply1,10.33930000000
-0,2045,R1,2020,gassupply1,10.33930000000
-0,2050,R1,2020,gassupply1,10.33930000000
-0,2059,R1,2020,gassupply1,10.33930000000
-1,2040,R1,2025,gassupply1,8.64650000000
-1,2045,R1,2025,gassupply1,8.64650000000
-1,2050,R1,2025,gassupply1,8.64650000000
-1,2059,R1,2025,gassupply1,8.64650000000
-1,2060,R1,2025,gassupply1,8.64650000000
-1,2064,R1,2025,gassupply1,8.64650000000
-2,2040,R1,2030,gassupply1,10.83330000000
-2,2045,R1,2030,gassupply1,10.83330000000
-2,2050,R1,2030,gassupply1,10.83330000000
-2,2059,R1,2030,gassupply1,10.83330000000
-2,2060,R1,2030,gassupply1,10.83330000000
-2,2064,R1,2030,gassupply1,10.83330000000
-2,2065,R1,2030,gassupply1,10.83330000000
-2,2069,R1,2030,gassupply1,10.83330000000
-3,2040,R1,2035,gassupply1,1.98970000000
-3,2045,R1,2035,gassupply1,1.98970000000
-3,2050,R1,2035,gassupply1,1.98970000000
-3,2059,R1,2035,gassupply1,1.98970000000
-3,2060,R1,2035,gassupply1,1.98970000000
-3,2064,R1,2035,gassupply1,1.98970000000
-3,2065,R1,2035,gassupply1,1.98970000000
-3,2069,R1,2035,gassupply1,1.98970000000
-3,2070,R1,2035,gassupply1,1.98970000000
-3,2074,R1,2035,gassupply1,1.98970000000
-4,2045,R1,2040,gassupply1,6.66670000000
-4,2050,R1,2040,gassupply1,6.66670000000
-4,2059,R1,2040,gassupply1,6.66670000000
-4,2060,R1,2040,gassupply1,6.66670000000
-4,2064,R1,2040,gassupply1,6.66670000000
-4,2065,R1,2040,gassupply1,6.66670000000
-4,2069,R1,2040,gassupply1,6.66670000000
-4,2070,R1,2040,gassupply1,6.66670000000
-4,2074,R1,2040,gassupply1,6.66670000000
-4,2075,R1,2040,gassupply1,6.66670000000
-4,2079,R1,2040,gassupply1,6.66670000000
+asset,year,region,technology,installed,capacity
+0,2040,R1,gassupply1,2020,10.33930000000
+0,2045,R1,gassupply1,2020,10.33930000000
+0,2050,R1,gassupply1,2020,10.33930000000
+0,2059,R1,gassupply1,2020,10.33930000000
+1,2040,R1,gassupply1,2025,8.64650000000
+1,2045,R1,gassupply1,2025,8.64650000000
+1,2050,R1,gassupply1,2025,8.64650000000
+1,2059,R1,gassupply1,2025,8.64650000000
+1,2060,R1,gassupply1,2025,8.64650000000
+1,2064,R1,gassupply1,2025,8.64650000000
+2,2040,R1,gassupply1,2030,10.83330000000
+2,2045,R1,gassupply1,2030,10.83330000000
+2,2050,R1,gassupply1,2030,10.83330000000
+2,2059,R1,gassupply1,2030,10.83330000000
+2,2060,R1,gassupply1,2030,10.83330000000
+2,2064,R1,gassupply1,2030,10.83330000000
+2,2065,R1,gassupply1,2030,10.83330000000
+2,2069,R1,gassupply1,2030,10.83330000000
+3,2040,R1,gassupply1,2035,1.98970000000
+3,2045,R1,gassupply1,2035,1.98970000000
+3,2050,R1,gassupply1,2035,1.98970000000
+3,2059,R1,gassupply1,2035,1.98970000000
+3,2060,R1,gassupply1,2035,1.98970000000
+3,2064,R1,gassupply1,2035,1.98970000000
+3,2065,R1,gassupply1,2035,1.98970000000
+3,2069,R1,gassupply1,2035,1.98970000000
+3,2070,R1,gassupply1,2035,1.98970000000
+3,2074,R1,gassupply1,2035,1.98970000000
+4,2045,R1,gassupply1,2040,6.66670000000
+4,2050,R1,gassupply1,2040,6.66670000000
+4,2059,R1,gassupply1,2040,6.66670000000
+4,2060,R1,gassupply1,2040,6.66670000000
+4,2064,R1,gassupply1,2040,6.66670000000
+4,2065,R1,gassupply1,2040,6.66670000000
+4,2069,R1,gassupply1,2040,6.66670000000
+4,2070,R1,gassupply1,2040,6.66670000000
+4,2074,R1,gassupply1,2040,6.66670000000
+4,2075,R1,gassupply1,2040,6.66670000000
+4,2079,R1,gassupply1,2040,6.66670000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2045.csv b/tests/example_outputs/medium/Gas/Capacity/2045.csv
index 728fa8fcc..3af77c5cd 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2045.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2045.csv
@@ -1,36 +1,36 @@
-asset,year,region,installed,technology,capacity
-0,2045,R1,2020,gassupply1,10.33930000000
-0,2050,R1,2020,gassupply1,10.33930000000
-0,2059,R1,2020,gassupply1,10.33930000000
-1,2045,R1,2025,gassupply1,8.64650000000
-1,2050,R1,2025,gassupply1,8.64650000000
-1,2059,R1,2025,gassupply1,8.64650000000
-1,2060,R1,2025,gassupply1,8.64650000000
-1,2064,R1,2025,gassupply1,8.64650000000
-2,2045,R1,2030,gassupply1,10.83330000000
-2,2050,R1,2030,gassupply1,10.83330000000
-2,2059,R1,2030,gassupply1,10.83330000000
-2,2060,R1,2030,gassupply1,10.83330000000
-2,2064,R1,2030,gassupply1,10.83330000000
-2,2065,R1,2030,gassupply1,10.83330000000
-2,2069,R1,2030,gassupply1,10.83330000000
-3,2045,R1,2035,gassupply1,1.98970000000
-3,2050,R1,2035,gassupply1,1.98970000000
-3,2059,R1,2035,gassupply1,1.98970000000
-3,2060,R1,2035,gassupply1,1.98970000000
-3,2064,R1,2035,gassupply1,1.98970000000
-3,2065,R1,2035,gassupply1,1.98970000000
-3,2069,R1,2035,gassupply1,1.98970000000
-3,2070,R1,2035,gassupply1,1.98970000000
-3,2074,R1,2035,gassupply1,1.98970000000
-4,2045,R1,2040,gassupply1,6.66670000000
-4,2050,R1,2040,gassupply1,6.66670000000
-4,2059,R1,2040,gassupply1,6.66670000000
-4,2060,R1,2040,gassupply1,6.66670000000
-4,2064,R1,2040,gassupply1,6.66670000000
-4,2065,R1,2040,gassupply1,6.66670000000
-4,2069,R1,2040,gassupply1,6.66670000000
-4,2070,R1,2040,gassupply1,6.66670000000
-4,2074,R1,2040,gassupply1,6.66670000000
-4,2075,R1,2040,gassupply1,6.66670000000
-4,2079,R1,2040,gassupply1,6.66670000000
+asset,year,region,technology,installed,capacity
+0,2045,R1,gassupply1,2020,10.33930000000
+0,2050,R1,gassupply1,2020,10.33930000000
+0,2059,R1,gassupply1,2020,10.33930000000
+1,2045,R1,gassupply1,2025,8.64650000000
+1,2050,R1,gassupply1,2025,8.64650000000
+1,2059,R1,gassupply1,2025,8.64650000000
+1,2060,R1,gassupply1,2025,8.64650000000
+1,2064,R1,gassupply1,2025,8.64650000000
+2,2045,R1,gassupply1,2030,10.83330000000
+2,2050,R1,gassupply1,2030,10.83330000000
+2,2059,R1,gassupply1,2030,10.83330000000
+2,2060,R1,gassupply1,2030,10.83330000000
+2,2064,R1,gassupply1,2030,10.83330000000
+2,2065,R1,gassupply1,2030,10.83330000000
+2,2069,R1,gassupply1,2030,10.83330000000
+3,2045,R1,gassupply1,2035,1.98970000000
+3,2050,R1,gassupply1,2035,1.98970000000
+3,2059,R1,gassupply1,2035,1.98970000000
+3,2060,R1,gassupply1,2035,1.98970000000
+3,2064,R1,gassupply1,2035,1.98970000000
+3,2065,R1,gassupply1,2035,1.98970000000
+3,2069,R1,gassupply1,2035,1.98970000000
+3,2070,R1,gassupply1,2035,1.98970000000
+3,2074,R1,gassupply1,2035,1.98970000000
+4,2045,R1,gassupply1,2040,6.66670000000
+4,2050,R1,gassupply1,2040,6.66670000000
+4,2059,R1,gassupply1,2040,6.66670000000
+4,2060,R1,gassupply1,2040,6.66670000000
+4,2064,R1,gassupply1,2040,6.66670000000
+4,2065,R1,gassupply1,2040,6.66670000000
+4,2069,R1,gassupply1,2040,6.66670000000
+4,2070,R1,gassupply1,2040,6.66670000000
+4,2074,R1,gassupply1,2040,6.66670000000
+4,2075,R1,gassupply1,2040,6.66670000000
+4,2079,R1,gassupply1,2040,6.66670000000
diff --git a/tests/example_outputs/medium/Gas/Capacity/2050.csv b/tests/example_outputs/medium/Gas/Capacity/2050.csv
index 7efa053e6..26ecd19bf 100644
--- a/tests/example_outputs/medium/Gas/Capacity/2050.csv
+++ b/tests/example_outputs/medium/Gas/Capacity/2050.csv
@@ -1,36 +1,36 @@
-asset,year,region,installed,technology,capacity
-0,2050,R1,2020,gassupply1,10.33930000000
-0,2055,R1,2020,gassupply1,10.33930000000
-0,2059,R1,2020,gassupply1,10.33930000000
-1,2050,R1,2025,gassupply1,8.64650000000
-1,2055,R1,2025,gassupply1,8.64650000000
-1,2059,R1,2025,gassupply1,8.64650000000
-1,2060,R1,2025,gassupply1,8.64650000000
-1,2064,R1,2025,gassupply1,8.64650000000
-2,2050,R1,2030,gassupply1,10.83330000000
-2,2055,R1,2030,gassupply1,10.83330000000
-2,2059,R1,2030,gassupply1,10.83330000000
-2,2060,R1,2030,gassupply1,10.83330000000
-2,2064,R1,2030,gassupply1,10.83330000000
-2,2065,R1,2030,gassupply1,10.83330000000
-2,2069,R1,2030,gassupply1,10.83330000000
-3,2050,R1,2035,gassupply1,1.98970000000
-3,2055,R1,2035,gassupply1,1.98970000000
-3,2059,R1,2035,gassupply1,1.98970000000
-3,2060,R1,2035,gassupply1,1.98970000000
-3,2064,R1,2035,gassupply1,1.98970000000
-3,2065,R1,2035,gassupply1,1.98970000000
-3,2069,R1,2035,gassupply1,1.98970000000
-3,2070,R1,2035,gassupply1,1.98970000000
-3,2074,R1,2035,gassupply1,1.98970000000
-4,2050,R1,2040,gassupply1,6.66670000000
-4,2055,R1,2040,gassupply1,6.66670000000
-4,2059,R1,2040,gassupply1,6.66670000000
-4,2060,R1,2040,gassupply1,6.66670000000
-4,2064,R1,2040,gassupply1,6.66670000000
-4,2065,R1,2040,gassupply1,6.66670000000
-4,2069,R1,2040,gassupply1,6.66670000000
-4,2070,R1,2040,gassupply1,6.66670000000
-4,2074,R1,2040,gassupply1,6.66670000000
-4,2075,R1,2040,gassupply1,6.66670000000
-4,2079,R1,2040,gassupply1,6.66670000000
+asset,year,region,technology,installed,capacity
+0,2050,R1,gassupply1,2020,10.33930000000
+0,2055,R1,gassupply1,2020,10.33930000000
+0,2059,R1,gassupply1,2020,10.33930000000
+1,2050,R1,gassupply1,2025,8.64650000000
+1,2055,R1,gassupply1,2025,8.64650000000
+1,2059,R1,gassupply1,2025,8.64650000000
+1,2060,R1,gassupply1,2025,8.64650000000
+1,2064,R1,gassupply1,2025,8.64650000000
+2,2050,R1,gassupply1,2030,10.83330000000
+2,2055,R1,gassupply1,2030,10.83330000000
+2,2059,R1,gassupply1,2030,10.83330000000
+2,2060,R1,gassupply1,2030,10.83330000000
+2,2064,R1,gassupply1,2030,10.83330000000
+2,2065,R1,gassupply1,2030,10.83330000000
+2,2069,R1,gassupply1,2030,10.83330000000
+3,2050,R1,gassupply1,2035,1.98970000000
+3,2055,R1,gassupply1,2035,1.98970000000
+3,2059,R1,gassupply1,2035,1.98970000000
+3,2060,R1,gassupply1,2035,1.98970000000
+3,2064,R1,gassupply1,2035,1.98970000000
+3,2065,R1,gassupply1,2035,1.98970000000
+3,2069,R1,gassupply1,2035,1.98970000000
+3,2070,R1,gassupply1,2035,1.98970000000
+3,2074,R1,gassupply1,2035,1.98970000000
+4,2050,R1,gassupply1,2040,6.66670000000
+4,2055,R1,gassupply1,2040,6.66670000000
+4,2059,R1,gassupply1,2040,6.66670000000
+4,2060,R1,gassupply1,2040,6.66670000000
+4,2064,R1,gassupply1,2040,6.66670000000
+4,2065,R1,gassupply1,2040,6.66670000000
+4,2069,R1,gassupply1,2040,6.66670000000
+4,2070,R1,gassupply1,2040,6.66670000000
+4,2074,R1,gassupply1,2040,6.66670000000
+4,2075,R1,gassupply1,2040,6.66670000000
+4,2079,R1,gassupply1,2040,6.66670000000
diff --git a/tests/example_outputs/medium/Power/Capacity/2020.csv b/tests/example_outputs/medium/Power/Capacity/2020.csv
index 60d0bc162..ca1b2bcc3 100644
--- a/tests/example_outputs/medium/Power/Capacity/2020.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2020.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gasCCGT,1.00000000000
-0,2025,R1,2020,gasCCGT,1.00000000000
-1,2025,R1,2020,windturbine,1.75000000000
-1,2030,R1,2020,windturbine,1.75000000000
-1,2035,R1,2020,windturbine,1.75000000000
-1,2040,R1,2020,windturbine,1.75000000000
-1,2045,R1,2020,windturbine,1.75000000000
-1,2049,R1,2020,windturbine,1.75000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,1.00000000000
+1,2025,R1,windturbine,2020,1.75000000000
+1,2030,R1,windturbine,2020,1.75000000000
+1,2035,R1,windturbine,2020,1.75000000000
+1,2040,R1,windturbine,2020,1.75000000000
+1,2045,R1,windturbine,2020,1.75000000000
+1,2049,R1,windturbine,2020,1.75000000000
diff --git a/tests/example_outputs/medium/Power/Capacity/2030.csv b/tests/example_outputs/medium/Power/Capacity/2030.csv
index d94a5a44e..e06eb4583 100644
--- a/tests/example_outputs/medium/Power/Capacity/2030.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2030.csv
@@ -1,21 +1,21 @@
-asset,year,region,installed,technology,capacity
-1,2030,R1,2020,windturbine,1.75000000000
-1,2035,R1,2020,windturbine,1.75000000000
-1,2040,R1,2020,windturbine,1.75000000000
-1,2045,R1,2020,windturbine,1.75000000000
-1,2049,R1,2020,windturbine,1.75000000000
-2,2030,R1,2025,windturbine,5.65000000000
-2,2035,R1,2025,windturbine,5.65000000000
-2,2040,R1,2025,windturbine,5.65000000000
-2,2045,R1,2025,windturbine,5.65000000000
-2,2049,R1,2025,windturbine,5.65000000000
-2,2050,R1,2025,windturbine,5.65000000000
-2,2054,R1,2025,windturbine,5.65000000000
-3,2035,R1,2030,windturbine,3.00000000000
-3,2040,R1,2030,windturbine,3.00000000000
-3,2045,R1,2030,windturbine,3.00000000000
-3,2049,R1,2030,windturbine,3.00000000000
-3,2050,R1,2030,windturbine,3.00000000000
-3,2054,R1,2030,windturbine,3.00000000000
-3,2055,R1,2030,windturbine,3.00000000000
-3,2059,R1,2030,windturbine,3.00000000000
+asset,year,region,technology,installed,capacity
+1,2030,R1,windturbine,2020,1.75000000000
+1,2035,R1,windturbine,2020,1.75000000000
+1,2040,R1,windturbine,2020,1.75000000000
+1,2045,R1,windturbine,2020,1.75000000000
+1,2049,R1,windturbine,2020,1.75000000000
+2,2030,R1,windturbine,2025,5.65000000000
+2,2035,R1,windturbine,2025,5.65000000000
+2,2040,R1,windturbine,2025,5.65000000000
+2,2045,R1,windturbine,2025,5.65000000000
+2,2049,R1,windturbine,2025,5.65000000000
+2,2050,R1,windturbine,2025,5.65000000000
+2,2054,R1,windturbine,2025,5.65000000000
+3,2035,R1,windturbine,2030,3.00000000000
+3,2040,R1,windturbine,2030,3.00000000000
+3,2045,R1,windturbine,2030,3.00000000000
+3,2049,R1,windturbine,2030,3.00000000000
+3,2050,R1,windturbine,2030,3.00000000000
+3,2054,R1,windturbine,2030,3.00000000000
+3,2055,R1,windturbine,2030,3.00000000000
+3,2059,R1,windturbine,2030,3.00000000000
diff --git a/tests/example_outputs/medium/Power/Capacity/2035.csv b/tests/example_outputs/medium/Power/Capacity/2035.csv
index 5d9c02452..3e285fc49 100644
--- a/tests/example_outputs/medium/Power/Capacity/2035.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2035.csv
@@ -1,28 +1,28 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2020,windturbine,1.75000000000
-1,2040,R1,2020,windturbine,1.75000000000
-1,2045,R1,2020,windturbine,1.75000000000
-1,2049,R1,2020,windturbine,1.75000000000
-2,2035,R1,2025,windturbine,5.65000000000
-2,2040,R1,2025,windturbine,5.65000000000
-2,2045,R1,2025,windturbine,5.65000000000
-2,2049,R1,2025,windturbine,5.65000000000
-2,2050,R1,2025,windturbine,5.65000000000
-2,2054,R1,2025,windturbine,5.65000000000
-3,2035,R1,2030,windturbine,3.00000000000
-3,2040,R1,2030,windturbine,3.00000000000
-3,2045,R1,2030,windturbine,3.00000000000
-3,2049,R1,2030,windturbine,3.00000000000
-3,2050,R1,2030,windturbine,3.00000000000
-3,2054,R1,2030,windturbine,3.00000000000
-3,2055,R1,2030,windturbine,3.00000000000
-3,2059,R1,2030,windturbine,3.00000000000
-4,2040,R1,2035,windturbine,4.04000000000
-4,2045,R1,2035,windturbine,4.04000000000
-4,2049,R1,2035,windturbine,4.04000000000
-4,2050,R1,2035,windturbine,4.04000000000
-4,2054,R1,2035,windturbine,4.04000000000
-4,2055,R1,2035,windturbine,4.04000000000
-4,2059,R1,2035,windturbine,4.04000000000
-4,2060,R1,2035,windturbine,4.04000000000
-4,2064,R1,2035,windturbine,4.04000000000
+asset,year,region,technology,installed,capacity
+1,2035,R1,windturbine,2020,1.75000000000
+1,2040,R1,windturbine,2020,1.75000000000
+1,2045,R1,windturbine,2020,1.75000000000
+1,2049,R1,windturbine,2020,1.75000000000
+2,2035,R1,windturbine,2025,5.65000000000
+2,2040,R1,windturbine,2025,5.65000000000
+2,2045,R1,windturbine,2025,5.65000000000
+2,2049,R1,windturbine,2025,5.65000000000
+2,2050,R1,windturbine,2025,5.65000000000
+2,2054,R1,windturbine,2025,5.65000000000
+3,2035,R1,windturbine,2030,3.00000000000
+3,2040,R1,windturbine,2030,3.00000000000
+3,2045,R1,windturbine,2030,3.00000000000
+3,2049,R1,windturbine,2030,3.00000000000
+3,2050,R1,windturbine,2030,3.00000000000
+3,2054,R1,windturbine,2030,3.00000000000
+3,2055,R1,windturbine,2030,3.00000000000
+3,2059,R1,windturbine,2030,3.00000000000
+4,2040,R1,windturbine,2035,4.04000000000
+4,2045,R1,windturbine,2035,4.04000000000
+4,2049,R1,windturbine,2035,4.04000000000
+4,2050,R1,windturbine,2035,4.04000000000
+4,2054,R1,windturbine,2035,4.04000000000
+4,2055,R1,windturbine,2035,4.04000000000
+4,2059,R1,windturbine,2035,4.04000000000
+4,2060,R1,windturbine,2035,4.04000000000
+4,2064,R1,windturbine,2035,4.04000000000
diff --git a/tests/example_outputs/medium/Power/Capacity/2040.csv b/tests/example_outputs/medium/Power/Capacity/2040.csv
index c91fd0f17..de0aa375a 100644
--- a/tests/example_outputs/medium/Power/Capacity/2040.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2040.csv
@@ -1,35 +1,35 @@
-asset,year,region,installed,technology,capacity
-1,2040,R1,2020,windturbine,1.75000000000
-1,2045,R1,2020,windturbine,1.75000000000
-1,2049,R1,2020,windturbine,1.75000000000
-2,2040,R1,2025,windturbine,5.65000000000
-2,2045,R1,2025,windturbine,5.65000000000
-2,2049,R1,2025,windturbine,5.65000000000
-2,2050,R1,2025,windturbine,5.65000000000
-2,2054,R1,2025,windturbine,5.65000000000
-3,2040,R1,2030,windturbine,3.00000000000
-3,2045,R1,2030,windturbine,3.00000000000
-3,2049,R1,2030,windturbine,3.00000000000
-3,2050,R1,2030,windturbine,3.00000000000
-3,2054,R1,2030,windturbine,3.00000000000
-3,2055,R1,2030,windturbine,3.00000000000
-3,2059,R1,2030,windturbine,3.00000000000
-4,2040,R1,2035,windturbine,4.04000000000
-4,2045,R1,2035,windturbine,4.04000000000
-4,2049,R1,2035,windturbine,4.04000000000
-4,2050,R1,2035,windturbine,4.04000000000
-4,2054,R1,2035,windturbine,4.04000000000
-4,2055,R1,2035,windturbine,4.04000000000
-4,2059,R1,2035,windturbine,4.04000000000
-4,2060,R1,2035,windturbine,4.04000000000
-4,2064,R1,2035,windturbine,4.04000000000
-5,2045,R1,2040,windturbine,3.00000000000
-5,2049,R1,2040,windturbine,3.00000000000
-5,2050,R1,2040,windturbine,3.00000000000
-5,2054,R1,2040,windturbine,3.00000000000
-5,2055,R1,2040,windturbine,3.00000000000
-5,2059,R1,2040,windturbine,3.00000000000
-5,2060,R1,2040,windturbine,3.00000000000
-5,2064,R1,2040,windturbine,3.00000000000
-5,2065,R1,2040,windturbine,3.00000000000
-5,2069,R1,2040,windturbine,3.00000000000
+asset,year,region,technology,installed,capacity
+1,2040,R1,windturbine,2020,1.75000000000
+1,2045,R1,windturbine,2020,1.75000000000
+1,2049,R1,windturbine,2020,1.75000000000
+2,2040,R1,windturbine,2025,5.65000000000
+2,2045,R1,windturbine,2025,5.65000000000
+2,2049,R1,windturbine,2025,5.65000000000
+2,2050,R1,windturbine,2025,5.65000000000
+2,2054,R1,windturbine,2025,5.65000000000
+3,2040,R1,windturbine,2030,3.00000000000
+3,2045,R1,windturbine,2030,3.00000000000
+3,2049,R1,windturbine,2030,3.00000000000
+3,2050,R1,windturbine,2030,3.00000000000
+3,2054,R1,windturbine,2030,3.00000000000
+3,2055,R1,windturbine,2030,3.00000000000
+3,2059,R1,windturbine,2030,3.00000000000
+4,2040,R1,windturbine,2035,4.04000000000
+4,2045,R1,windturbine,2035,4.04000000000
+4,2049,R1,windturbine,2035,4.04000000000
+4,2050,R1,windturbine,2035,4.04000000000
+4,2054,R1,windturbine,2035,4.04000000000
+4,2055,R1,windturbine,2035,4.04000000000
+4,2059,R1,windturbine,2035,4.04000000000
+4,2060,R1,windturbine,2035,4.04000000000
+4,2064,R1,windturbine,2035,4.04000000000
+5,2045,R1,windturbine,2040,3.00000000000
+5,2049,R1,windturbine,2040,3.00000000000
+5,2050,R1,windturbine,2040,3.00000000000
+5,2054,R1,windturbine,2040,3.00000000000
+5,2055,R1,windturbine,2040,3.00000000000
+5,2059,R1,windturbine,2040,3.00000000000
+5,2060,R1,windturbine,2040,3.00000000000
+5,2064,R1,windturbine,2040,3.00000000000
+5,2065,R1,windturbine,2040,3.00000000000
+5,2069,R1,windturbine,2040,3.00000000000
diff --git a/tests/example_outputs/medium/Power/Capacity/2050.csv b/tests/example_outputs/medium/Power/Capacity/2050.csv
index be4c16312..2f4a74a6b 100644
--- a/tests/example_outputs/medium/Power/Capacity/2050.csv
+++ b/tests/example_outputs/medium/Power/Capacity/2050.csv
@@ -1,41 +1,41 @@
-asset,year,region,installed,technology,capacity
-1,2050,R1,2025,windturbine,5.65000000000
-1,2054,R1,2025,windturbine,5.65000000000
-2,2050,R1,2030,windturbine,3.00000000000
-2,2054,R1,2030,windturbine,3.00000000000
-2,2055,R1,2030,windturbine,3.00000000000
-2,2059,R1,2030,windturbine,3.00000000000
-3,2050,R1,2035,windturbine,4.04000000000
-3,2054,R1,2035,windturbine,4.04000000000
-3,2055,R1,2035,windturbine,4.04000000000
-3,2059,R1,2035,windturbine,4.04000000000
-3,2060,R1,2035,windturbine,4.04000000000
-3,2064,R1,2035,windturbine,4.04000000000
-4,2050,R1,2040,windturbine,3.00000000000
-4,2054,R1,2040,windturbine,3.00000000000
-4,2055,R1,2040,windturbine,3.00000000000
-4,2059,R1,2040,windturbine,3.00000000000
-4,2060,R1,2040,windturbine,3.00000000000
-4,2064,R1,2040,windturbine,3.00000000000
-4,2065,R1,2040,windturbine,3.00000000000
-4,2069,R1,2040,windturbine,3.00000000000
-5,2050,R1,2045,windturbine,6.49400000000
-5,2054,R1,2045,windturbine,6.49400000000
-5,2055,R1,2045,windturbine,6.49400000000
-5,2059,R1,2045,windturbine,6.49400000000
-5,2060,R1,2045,windturbine,6.49400000000
-5,2064,R1,2045,windturbine,6.49400000000
-5,2065,R1,2045,windturbine,6.49400000000
-5,2069,R1,2045,windturbine,6.49400000000
-5,2070,R1,2045,windturbine,6.49400000000
-5,2074,R1,2045,windturbine,6.49400000000
-6,2055,R1,2050,windturbine,5.65000000000
-6,2059,R1,2050,windturbine,5.65000000000
-6,2060,R1,2050,windturbine,5.65000000000
-6,2064,R1,2050,windturbine,5.65000000000
-6,2065,R1,2050,windturbine,5.65000000000
-6,2069,R1,2050,windturbine,5.65000000000
-6,2070,R1,2050,windturbine,5.65000000000
-6,2074,R1,2050,windturbine,5.65000000000
-6,2075,R1,2050,windturbine,5.65000000000
-6,2079,R1,2050,windturbine,5.65000000000
+asset,year,region,technology,installed,capacity
+1,2050,R1,windturbine,2025,5.65000000000
+1,2054,R1,windturbine,2025,5.65000000000
+2,2050,R1,windturbine,2030,3.00000000000
+2,2054,R1,windturbine,2030,3.00000000000
+2,2055,R1,windturbine,2030,3.00000000000
+2,2059,R1,windturbine,2030,3.00000000000
+3,2050,R1,windturbine,2035,4.04000000000
+3,2054,R1,windturbine,2035,4.04000000000
+3,2055,R1,windturbine,2035,4.04000000000
+3,2059,R1,windturbine,2035,4.04000000000
+3,2060,R1,windturbine,2035,4.04000000000
+3,2064,R1,windturbine,2035,4.04000000000
+4,2050,R1,windturbine,2040,3.00000000000
+4,2054,R1,windturbine,2040,3.00000000000
+4,2055,R1,windturbine,2040,3.00000000000
+4,2059,R1,windturbine,2040,3.00000000000
+4,2060,R1,windturbine,2040,3.00000000000
+4,2064,R1,windturbine,2040,3.00000000000
+4,2065,R1,windturbine,2040,3.00000000000
+4,2069,R1,windturbine,2040,3.00000000000
+5,2050,R1,windturbine,2045,6.49400000000
+5,2054,R1,windturbine,2045,6.49400000000
+5,2055,R1,windturbine,2045,6.49400000000
+5,2059,R1,windturbine,2045,6.49400000000
+5,2060,R1,windturbine,2045,6.49400000000
+5,2064,R1,windturbine,2045,6.49400000000
+5,2065,R1,windturbine,2045,6.49400000000
+5,2069,R1,windturbine,2045,6.49400000000
+5,2070,R1,windturbine,2045,6.49400000000
+5,2074,R1,windturbine,2045,6.49400000000
+6,2055,R1,windturbine,2050,5.65000000000
+6,2059,R1,windturbine,2050,5.65000000000
+6,2060,R1,windturbine,2050,5.65000000000
+6,2064,R1,windturbine,2050,5.65000000000
+6,2065,R1,windturbine,2050,5.65000000000
+6,2069,R1,windturbine,2050,5.65000000000
+6,2070,R1,windturbine,2050,5.65000000000
+6,2074,R1,windturbine,2050,5.65000000000
+6,2075,R1,windturbine,2050,5.65000000000
+6,2079,R1,windturbine,2050,5.65000000000
diff --git a/tests/example_outputs/medium/Residential/Capacity/2050.csv b/tests/example_outputs/medium/Residential/Capacity/2050.csv
index 02d86fe70..c9363ce7b 100644
--- a/tests/example_outputs/medium/Residential/Capacity/2050.csv
+++ b/tests/example_outputs/medium/Residential/Capacity/2050.csv
@@ -1,25 +1,25 @@
-asset,year,region,installed,technology,capacity
-3,2050,R1,2040,gasstove,10.00000000000
-3,2054,R1,2040,gasstove,10.00000000000
-4,2050,R1,2040,heatpump,10.00000000000
-4,2054,R1,2040,heatpump,10.00000000000
-5,2050,R1,2045,gasboiler,4.81600000000
-5,2054,R1,2045,gasboiler,4.81600000000
-5,2055,R1,2045,gasboiler,4.81600000000
-5,2059,R1,2045,gasboiler,4.81600000000
-6,2050,R1,2045,gasstove,17.00000000000
-6,2054,R1,2045,gasstove,17.00000000000
-6,2055,R1,2045,gasstove,17.00000000000
-6,2059,R1,2045,gasstove,17.00000000000
-7,2050,R1,2045,heatpump,12.18400000000
-7,2054,R1,2045,heatpump,12.18400000000
-7,2055,R1,2045,heatpump,12.18400000000
-7,2059,R1,2045,heatpump,12.18400000000
-8,2055,R1,2050,gasstove,10.00000000000
-8,2059,R1,2050,gasstove,10.00000000000
-8,2060,R1,2050,gasstove,10.00000000000
-8,2064,R1,2050,gasstove,10.00000000000
-9,2055,R1,2050,heatpump,10.00000000000
-9,2059,R1,2050,heatpump,10.00000000000
-9,2060,R1,2050,heatpump,10.00000000000
-9,2064,R1,2050,heatpump,10.00000000000
+asset,year,region,technology,installed,capacity
+1,2050,R1,gasboiler,2045,4.81600000000
+1,2054,R1,gasboiler,2045,4.81600000000
+1,2055,R1,gasboiler,2045,4.81600000000
+1,2059,R1,gasboiler,2045,4.81600000000
+3,2050,R1,gasstove,2040,10.00000000000
+3,2054,R1,gasstove,2040,10.00000000000
+4,2050,R1,gasstove,2045,17.00000000000
+4,2054,R1,gasstove,2045,17.00000000000
+4,2055,R1,gasstove,2045,17.00000000000
+4,2059,R1,gasstove,2045,17.00000000000
+5,2055,R1,gasstove,2050,10.00000000000
+5,2059,R1,gasstove,2050,10.00000000000
+5,2060,R1,gasstove,2050,10.00000000000
+5,2064,R1,gasstove,2050,10.00000000000
+7,2050,R1,heatpump,2040,10.00000000000
+7,2054,R1,heatpump,2040,10.00000000000
+8,2050,R1,heatpump,2045,12.18400000000
+8,2054,R1,heatpump,2045,12.18400000000
+8,2055,R1,heatpump,2045,12.18400000000
+8,2059,R1,heatpump,2045,12.18400000000
+9,2055,R1,heatpump,2050,10.00000000000
+9,2059,R1,heatpump,2050,10.00000000000
+9,2060,R1,heatpump,2050,10.00000000000
+9,2064,R1,heatpump,2050,10.00000000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2020.csv b/tests/example_outputs/medium/Residential/Supply/2020.csv
index 2c2d874d0..c5696bdad 100644
--- a/tests/example_outputs/medium/Residential/Supply/2020.csv
+++ b/tests/example_outputs/medium/Residential/Supply/2020.csv
@@ -1,43 +1,43 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,night,32.35290000000
-0,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,night,28.75820000000
-0,cook,2020,1,R1,gasstove,2020,all-year,all-week,night,0.50000000000
-0,cook,2025,1,R1,gasstove,2020,all-year,all-week,night,0.66670000000
-0,heat,2020,0,R1,gasboiler,2020,all-year,all-week,night,0.50000000000
-0,heat,2025,0,R1,gasboiler,2020,all-year,all-week,night,0.44440000000
-0,heat,2025,2,R1,heatpump,2020,all-year,all-week,night,0.22220000000
-1,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,morning,48.52940000000
-1,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,morning,43.13730000000
-1,cook,2020,1,R1,gasstove,2020,all-year,all-week,morning,0.75000000000
-1,cook,2025,1,R1,gasstove,2020,all-year,all-week,morning,1.00000000000
-1,heat,2020,0,R1,gasboiler,2020,all-year,all-week,morning,0.75000000000
-1,heat,2025,0,R1,gasboiler,2020,all-year,all-week,morning,0.66670000000
-1,heat,2025,2,R1,heatpump,2020,all-year,all-week,morning,0.33330000000
-2,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,afternoon,32.35290000000
-2,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,28.75820000000
-2,cook,2020,1,R1,gasstove,2020,all-year,all-week,afternoon,0.50000000000
-2,cook,2025,1,R1,gasstove,2020,all-year,all-week,afternoon,0.66670000000
-2,heat,2020,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.50000000000
-2,heat,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.44440000000
-2,heat,2025,2,R1,heatpump,2020,all-year,all-week,afternoon,0.22220000000
-3,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,early-peak,48.52940000000
-3,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,43.13730000000
-3,cook,2020,1,R1,gasstove,2020,all-year,all-week,early-peak,0.75000000000
-3,cook,2025,1,R1,gasstove,2020,all-year,all-week,early-peak,1.00000000000
-3,heat,2020,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.75000000000
-3,heat,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.66670000000
-3,heat,2025,2,R1,heatpump,2020,all-year,all-week,early-peak,0.33330000000
-4,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,late-peak,97.05880000000
-4,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,86.27450000000
-4,cook,2020,1,R1,gasstove,2020,all-year,all-week,late-peak,1.50000000000
-4,cook,2025,1,R1,gasstove,2020,all-year,all-week,late-peak,2.00000000000
-4,heat,2020,0,R1,gasboiler,2020,all-year,all-week,late-peak,1.50000000000
-4,heat,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,1.33330000000
-4,heat,2025,2,R1,heatpump,2020,all-year,all-week,late-peak,0.66670000000
-5,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,evening,64.70590000000
-5,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,evening,57.51630000000
-5,cook,2020,1,R1,gasstove,2020,all-year,all-week,evening,1.00000000000
-5,cook,2025,1,R1,gasstove,2020,all-year,all-week,evening,1.33330000000
-5,heat,2020,0,R1,gasboiler,2020,all-year,all-week,evening,1.00000000000
-5,heat,2025,0,R1,gasboiler,2020,all-year,all-week,evening,0.88890000000
-5,heat,2025,2,R1,heatpump,2020,all-year,all-week,evening,0.44440000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,32.35290000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,28.75820000000
+0,cook,2020,1,R1,all-year,all-week,night,gasstove,2020,0.50000000000
+0,cook,2025,1,R1,all-year,all-week,night,gasstove,2020,0.66670000000
+0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,0.50000000000
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.44440000000
+0,heat,2025,2,R1,all-year,all-week,night,heatpump,2020,0.22220000000
+1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,48.52940000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,43.13730000000
+1,cook,2020,1,R1,all-year,all-week,morning,gasstove,2020,0.75000000000
+1,cook,2025,1,R1,all-year,all-week,morning,gasstove,2020,1.00000000000
+1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,0.75000000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.66670000000
+1,heat,2025,2,R1,all-year,all-week,morning,heatpump,2020,0.33330000000
+2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,32.35290000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,28.75820000000
+2,cook,2020,1,R1,all-year,all-week,afternoon,gasstove,2020,0.50000000000
+2,cook,2025,1,R1,all-year,all-week,afternoon,gasstove,2020,0.66670000000
+2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.50000000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.44440000000
+2,heat,2025,2,R1,all-year,all-week,afternoon,heatpump,2020,0.22220000000
+3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,48.52940000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,43.13730000000
+3,cook,2020,1,R1,all-year,all-week,early-peak,gasstove,2020,0.75000000000
+3,cook,2025,1,R1,all-year,all-week,early-peak,gasstove,2020,1.00000000000
+3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.75000000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.66670000000
+3,heat,2025,2,R1,all-year,all-week,early-peak,heatpump,2020,0.33330000000
+4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,97.05880000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,86.27450000000
+4,cook,2020,1,R1,all-year,all-week,late-peak,gasstove,2020,1.50000000000
+4,cook,2025,1,R1,all-year,all-week,late-peak,gasstove,2020,2.00000000000
+4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,1.50000000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,1.33330000000
+4,heat,2025,2,R1,all-year,all-week,late-peak,heatpump,2020,0.66670000000
+5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,64.70590000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,57.51630000000
+5,cook,2020,1,R1,all-year,all-week,evening,gasstove,2020,1.00000000000
+5,cook,2025,1,R1,all-year,all-week,evening,gasstove,2020,1.33330000000
+5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,1.00000000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.88890000000
+5,heat,2025,2,R1,all-year,all-week,evening,heatpump,2020,0.44440000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2025.csv b/tests/example_outputs/medium/Residential/Supply/2025.csv
index fbc63d534..c770030ea 100644
--- a/tests/example_outputs/medium/Residential/Supply/2025.csv
+++ b/tests/example_outputs/medium/Residential/Supply/2025.csv
@@ -1,61 +1,61 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,night,28.75820000000
-0,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,night,27.32030000000
-0,cook,2025,2,R1,gasstove,2020,all-year,all-week,night,0.66670000000
-0,cook,2030,2,R1,gasstove,2020,all-year,all-week,night,0.22220000000
-0,cook,2030,3,R1,gasstove,2025,all-year,all-week,night,0.61110000000
-0,heat,2025,0,R1,gasboiler,2020,all-year,all-week,night,0.44440000000
-0,heat,2025,4,R1,heatpump,2020,all-year,all-week,night,0.22220000000
-0,heat,2030,1,R1,gasboiler,2025,all-year,all-week,night,0.42220000000
-0,heat,2030,4,R1,heatpump,2020,all-year,all-week,night,0.22220000000
-0,heat,2030,5,R1,heatpump,2025,all-year,all-week,night,0.18890000000
-1,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,morning,43.13730000000
-1,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,morning,40.98040000000
-1,cook,2025,2,R1,gasstove,2020,all-year,all-week,morning,1.00000000000
-1,cook,2030,2,R1,gasstove,2020,all-year,all-week,morning,0.33330000000
-1,cook,2030,3,R1,gasstove,2025,all-year,all-week,morning,0.91670000000
-1,heat,2025,0,R1,gasboiler,2020,all-year,all-week,morning,0.66670000000
-1,heat,2025,4,R1,heatpump,2020,all-year,all-week,morning,0.33330000000
-1,heat,2030,1,R1,gasboiler,2025,all-year,all-week,morning,0.63330000000
-1,heat,2030,4,R1,heatpump,2020,all-year,all-week,morning,0.33330000000
-1,heat,2030,5,R1,heatpump,2025,all-year,all-week,morning,0.28330000000
-2,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,28.75820000000
-2,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,afternoon,27.32030000000
-2,cook,2025,2,R1,gasstove,2020,all-year,all-week,afternoon,0.66670000000
-2,cook,2030,2,R1,gasstove,2020,all-year,all-week,afternoon,0.22220000000
-2,cook,2030,3,R1,gasstove,2025,all-year,all-week,afternoon,0.61110000000
-2,heat,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.44440000000
-2,heat,2025,4,R1,heatpump,2020,all-year,all-week,afternoon,0.22220000000
-2,heat,2030,1,R1,gasboiler,2025,all-year,all-week,afternoon,0.42220000000
-2,heat,2030,4,R1,heatpump,2020,all-year,all-week,afternoon,0.22220000000
-2,heat,2030,5,R1,heatpump,2025,all-year,all-week,afternoon,0.18890000000
-3,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,43.13730000000
-3,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,early-peak,40.98040000000
-3,cook,2025,2,R1,gasstove,2020,all-year,all-week,early-peak,1.00000000000
-3,cook,2030,2,R1,gasstove,2020,all-year,all-week,early-peak,0.33330000000
-3,cook,2030,3,R1,gasstove,2025,all-year,all-week,early-peak,0.91670000000
-3,heat,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.66670000000
-3,heat,2025,4,R1,heatpump,2020,all-year,all-week,early-peak,0.33330000000
-3,heat,2030,1,R1,gasboiler,2025,all-year,all-week,early-peak,0.63330000000
-3,heat,2030,4,R1,heatpump,2020,all-year,all-week,early-peak,0.33330000000
-3,heat,2030,5,R1,heatpump,2025,all-year,all-week,early-peak,0.28330000000
-4,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,86.27450000000
-4,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,late-peak,81.96080000000
-4,cook,2025,2,R1,gasstove,2020,all-year,all-week,late-peak,2.00000000000
-4,cook,2030,2,R1,gasstove,2020,all-year,all-week,late-peak,0.66670000000
-4,cook,2030,3,R1,gasstove,2025,all-year,all-week,late-peak,1.83330000000
-4,heat,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,1.33330000000
-4,heat,2025,4,R1,heatpump,2020,all-year,all-week,late-peak,0.66670000000
-4,heat,2030,1,R1,gasboiler,2025,all-year,all-week,late-peak,1.26670000000
-4,heat,2030,4,R1,heatpump,2020,all-year,all-week,late-peak,0.66670000000
-4,heat,2030,5,R1,heatpump,2025,all-year,all-week,late-peak,0.56670000000
-5,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,evening,57.51630000000
-5,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,evening,54.64050000000
-5,cook,2025,2,R1,gasstove,2020,all-year,all-week,evening,1.33330000000
-5,cook,2030,2,R1,gasstove,2020,all-year,all-week,evening,0.44440000000
-5,cook,2030,3,R1,gasstove,2025,all-year,all-week,evening,1.22220000000
-5,heat,2025,0,R1,gasboiler,2020,all-year,all-week,evening,0.88890000000
-5,heat,2025,4,R1,heatpump,2020,all-year,all-week,evening,0.44440000000
-5,heat,2030,1,R1,gasboiler,2025,all-year,all-week,evening,0.84440000000
-5,heat,2030,4,R1,heatpump,2020,all-year,all-week,evening,0.44440000000
-5,heat,2030,5,R1,heatpump,2025,all-year,all-week,evening,0.37780000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,28.75820000000
+0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,27.32030000000
+0,cook,2025,2,R1,all-year,all-week,night,gasstove,2020,0.66670000000
+0,cook,2030,2,R1,all-year,all-week,night,gasstove,2020,0.22220000000
+0,cook,2030,3,R1,all-year,all-week,night,gasstove,2025,0.61110000000
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.44440000000
+0,heat,2025,4,R1,all-year,all-week,night,heatpump,2020,0.22220000000
+0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.42220000000
+0,heat,2030,4,R1,all-year,all-week,night,heatpump,2020,0.22220000000
+0,heat,2030,5,R1,all-year,all-week,night,heatpump,2025,0.18890000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,43.13730000000
+1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,40.98040000000
+1,cook,2025,2,R1,all-year,all-week,morning,gasstove,2020,1.00000000000
+1,cook,2030,2,R1,all-year,all-week,morning,gasstove,2020,0.33330000000
+1,cook,2030,3,R1,all-year,all-week,morning,gasstove,2025,0.91670000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.66670000000
+1,heat,2025,4,R1,all-year,all-week,morning,heatpump,2020,0.33330000000
+1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.63330000000
+1,heat,2030,4,R1,all-year,all-week,morning,heatpump,2020,0.33330000000
+1,heat,2030,5,R1,all-year,all-week,morning,heatpump,2025,0.28330000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,28.75820000000
+2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,27.32030000000
+2,cook,2025,2,R1,all-year,all-week,afternoon,gasstove,2020,0.66670000000
+2,cook,2030,2,R1,all-year,all-week,afternoon,gasstove,2020,0.22220000000
+2,cook,2030,3,R1,all-year,all-week,afternoon,gasstove,2025,0.61110000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.44440000000
+2,heat,2025,4,R1,all-year,all-week,afternoon,heatpump,2020,0.22220000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.42220000000
+2,heat,2030,4,R1,all-year,all-week,afternoon,heatpump,2020,0.22220000000
+2,heat,2030,5,R1,all-year,all-week,afternoon,heatpump,2025,0.18890000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,43.13730000000
+3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,40.98040000000
+3,cook,2025,2,R1,all-year,all-week,early-peak,gasstove,2020,1.00000000000
+3,cook,2030,2,R1,all-year,all-week,early-peak,gasstove,2020,0.33330000000
+3,cook,2030,3,R1,all-year,all-week,early-peak,gasstove,2025,0.91670000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.66670000000
+3,heat,2025,4,R1,all-year,all-week,early-peak,heatpump,2020,0.33330000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.63330000000
+3,heat,2030,4,R1,all-year,all-week,early-peak,heatpump,2020,0.33330000000
+3,heat,2030,5,R1,all-year,all-week,early-peak,heatpump,2025,0.28330000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,86.27450000000
+4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,81.96080000000
+4,cook,2025,2,R1,all-year,all-week,late-peak,gasstove,2020,2.00000000000
+4,cook,2030,2,R1,all-year,all-week,late-peak,gasstove,2020,0.66670000000
+4,cook,2030,3,R1,all-year,all-week,late-peak,gasstove,2025,1.83330000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,1.33330000000
+4,heat,2025,4,R1,all-year,all-week,late-peak,heatpump,2020,0.66670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,1.26670000000
+4,heat,2030,4,R1,all-year,all-week,late-peak,heatpump,2020,0.66670000000
+4,heat,2030,5,R1,all-year,all-week,late-peak,heatpump,2025,0.56670000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,57.51630000000
+5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,54.64050000000
+5,cook,2025,2,R1,all-year,all-week,evening,gasstove,2020,1.33330000000
+5,cook,2030,2,R1,all-year,all-week,evening,gasstove,2020,0.44440000000
+5,cook,2030,3,R1,all-year,all-week,evening,gasstove,2025,1.22220000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.88890000000
+5,heat,2025,4,R1,all-year,all-week,evening,heatpump,2020,0.44440000000
+5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.84440000000
+5,heat,2030,4,R1,all-year,all-week,evening,heatpump,2020,0.44440000000
+5,heat,2030,5,R1,all-year,all-week,evening,heatpump,2025,0.37780000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2030.csv b/tests/example_outputs/medium/Residential/Supply/2030.csv
index 14a449529..cf2cde7e6 100644
--- a/tests/example_outputs/medium/Residential/Supply/2030.csv
+++ b/tests/example_outputs/medium/Residential/Supply/2030.csv
@@ -1,73 +1,73 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,night,27.32030000000
-0,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,night,27.32030000000
-0,cook,2030,1,R1,gasstove,2020,all-year,all-week,night,0.22220000000
-0,cook,2030,2,R1,gasstove,2025,all-year,all-week,night,0.61110000000
-0,cook,2035,2,R1,gasstove,2025,all-year,all-week,night,0.61110000000
-0,cook,2035,3,R1,gasstove,2030,all-year,all-week,night,0.38890000000
-0,heat,2030,0,R1,gasboiler,2025,all-year,all-week,night,0.42220000000
-0,heat,2030,4,R1,heatpump,2020,all-year,all-week,night,0.22220000000
-0,heat,2030,5,R1,heatpump,2025,all-year,all-week,night,0.18890000000
-0,heat,2035,0,R1,gasboiler,2025,all-year,all-week,night,0.42220000000
-0,heat,2035,5,R1,heatpump,2025,all-year,all-week,night,0.18890000000
-0,heat,2035,6,R1,heatpump,2030,all-year,all-week,night,0.38890000000
-1,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,morning,40.98040000000
-1,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,morning,40.98040000000
-1,cook,2030,1,R1,gasstove,2020,all-year,all-week,morning,0.33330000000
-1,cook,2030,2,R1,gasstove,2025,all-year,all-week,morning,0.91670000000
-1,cook,2035,2,R1,gasstove,2025,all-year,all-week,morning,0.91670000000
-1,cook,2035,3,R1,gasstove,2030,all-year,all-week,morning,0.58330000000
-1,heat,2030,0,R1,gasboiler,2025,all-year,all-week,morning,0.63330000000
-1,heat,2030,4,R1,heatpump,2020,all-year,all-week,morning,0.33330000000
-1,heat,2030,5,R1,heatpump,2025,all-year,all-week,morning,0.28330000000
-1,heat,2035,0,R1,gasboiler,2025,all-year,all-week,morning,0.63330000000
-1,heat,2035,5,R1,heatpump,2025,all-year,all-week,morning,0.28330000000
-1,heat,2035,6,R1,heatpump,2030,all-year,all-week,morning,0.58330000000
-2,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,afternoon,27.32030000000
-2,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,27.32030000000
-2,cook,2030,1,R1,gasstove,2020,all-year,all-week,afternoon,0.22220000000
-2,cook,2030,2,R1,gasstove,2025,all-year,all-week,afternoon,0.61110000000
-2,cook,2035,2,R1,gasstove,2025,all-year,all-week,afternoon,0.61110000000
-2,cook,2035,3,R1,gasstove,2030,all-year,all-week,afternoon,0.38890000000
-2,heat,2030,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.42220000000
-2,heat,2030,4,R1,heatpump,2020,all-year,all-week,afternoon,0.22220000000
-2,heat,2030,5,R1,heatpump,2025,all-year,all-week,afternoon,0.18890000000
-2,heat,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.42220000000
-2,heat,2035,5,R1,heatpump,2025,all-year,all-week,afternoon,0.18890000000
-2,heat,2035,6,R1,heatpump,2030,all-year,all-week,afternoon,0.38890000000
-3,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,early-peak,40.98040000000
-3,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,40.98040000000
-3,cook,2030,1,R1,gasstove,2020,all-year,all-week,early-peak,0.33330000000
-3,cook,2030,2,R1,gasstove,2025,all-year,all-week,early-peak,0.91670000000
-3,cook,2035,2,R1,gasstove,2025,all-year,all-week,early-peak,0.91670000000
-3,cook,2035,3,R1,gasstove,2030,all-year,all-week,early-peak,0.58330000000
-3,heat,2030,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.63330000000
-3,heat,2030,4,R1,heatpump,2020,all-year,all-week,early-peak,0.33330000000
-3,heat,2030,5,R1,heatpump,2025,all-year,all-week,early-peak,0.28330000000
-3,heat,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.63330000000
-3,heat,2035,5,R1,heatpump,2025,all-year,all-week,early-peak,0.28330000000
-3,heat,2035,6,R1,heatpump,2030,all-year,all-week,early-peak,0.58330000000
-4,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,late-peak,81.96080000000
-4,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,81.96080000000
-4,cook,2030,1,R1,gasstove,2020,all-year,all-week,late-peak,0.66670000000
-4,cook,2030,2,R1,gasstove,2025,all-year,all-week,late-peak,1.83330000000
-4,cook,2035,2,R1,gasstove,2025,all-year,all-week,late-peak,1.83330000000
-4,cook,2035,3,R1,gasstove,2030,all-year,all-week,late-peak,1.16670000000
-4,heat,2030,0,R1,gasboiler,2025,all-year,all-week,late-peak,1.26670000000
-4,heat,2030,4,R1,heatpump,2020,all-year,all-week,late-peak,0.66670000000
-4,heat,2030,5,R1,heatpump,2025,all-year,all-week,late-peak,0.56670000000
-4,heat,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,1.26670000000
-4,heat,2035,5,R1,heatpump,2025,all-year,all-week,late-peak,0.56670000000
-4,heat,2035,6,R1,heatpump,2030,all-year,all-week,late-peak,1.16670000000
-5,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,evening,54.64050000000
-5,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,evening,54.64050000000
-5,cook,2030,1,R1,gasstove,2020,all-year,all-week,evening,0.44440000000
-5,cook,2030,2,R1,gasstove,2025,all-year,all-week,evening,1.22220000000
-5,cook,2035,2,R1,gasstove,2025,all-year,all-week,evening,1.22220000000
-5,cook,2035,3,R1,gasstove,2030,all-year,all-week,evening,0.77780000000
-5,heat,2030,0,R1,gasboiler,2025,all-year,all-week,evening,0.84440000000
-5,heat,2030,4,R1,heatpump,2020,all-year,all-week,evening,0.44440000000
-5,heat,2030,5,R1,heatpump,2025,all-year,all-week,evening,0.37780000000
-5,heat,2035,0,R1,gasboiler,2025,all-year,all-week,evening,0.84440000000
-5,heat,2035,5,R1,heatpump,2025,all-year,all-week,evening,0.37780000000
-5,heat,2035,6,R1,heatpump,2030,all-year,all-week,evening,0.77780000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,CO2f,2030,0,R1,all-year,all-week,night,gasboiler,2025,27.32030000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,27.32030000000
+0,cook,2030,1,R1,all-year,all-week,night,gasstove,2020,0.22220000000
+0,cook,2030,2,R1,all-year,all-week,night,gasstove,2025,0.61110000000
+0,cook,2035,2,R1,all-year,all-week,night,gasstove,2025,0.61110000000
+0,cook,2035,3,R1,all-year,all-week,night,gasstove,2030,0.38890000000
+0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2025,0.42220000000
+0,heat,2030,4,R1,all-year,all-week,night,heatpump,2020,0.22220000000
+0,heat,2030,5,R1,all-year,all-week,night,heatpump,2025,0.18890000000
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.42220000000
+0,heat,2035,5,R1,all-year,all-week,night,heatpump,2025,0.18890000000
+0,heat,2035,6,R1,all-year,all-week,night,heatpump,2030,0.38890000000
+1,CO2f,2030,0,R1,all-year,all-week,morning,gasboiler,2025,40.98040000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,40.98040000000
+1,cook,2030,1,R1,all-year,all-week,morning,gasstove,2020,0.33330000000
+1,cook,2030,2,R1,all-year,all-week,morning,gasstove,2025,0.91670000000
+1,cook,2035,2,R1,all-year,all-week,morning,gasstove,2025,0.91670000000
+1,cook,2035,3,R1,all-year,all-week,morning,gasstove,2030,0.58330000000
+1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2025,0.63330000000
+1,heat,2030,4,R1,all-year,all-week,morning,heatpump,2020,0.33330000000
+1,heat,2030,5,R1,all-year,all-week,morning,heatpump,2025,0.28330000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.63330000000
+1,heat,2035,5,R1,all-year,all-week,morning,heatpump,2025,0.28330000000
+1,heat,2035,6,R1,all-year,all-week,morning,heatpump,2030,0.58330000000
+2,CO2f,2030,0,R1,all-year,all-week,afternoon,gasboiler,2025,27.32030000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,27.32030000000
+2,cook,2030,1,R1,all-year,all-week,afternoon,gasstove,2020,0.22220000000
+2,cook,2030,2,R1,all-year,all-week,afternoon,gasstove,2025,0.61110000000
+2,cook,2035,2,R1,all-year,all-week,afternoon,gasstove,2025,0.61110000000
+2,cook,2035,3,R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
+2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.42220000000
+2,heat,2030,4,R1,all-year,all-week,afternoon,heatpump,2020,0.22220000000
+2,heat,2030,5,R1,all-year,all-week,afternoon,heatpump,2025,0.18890000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.42220000000
+2,heat,2035,5,R1,all-year,all-week,afternoon,heatpump,2025,0.18890000000
+2,heat,2035,6,R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
+3,CO2f,2030,0,R1,all-year,all-week,early-peak,gasboiler,2025,40.98040000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,40.98040000000
+3,cook,2030,1,R1,all-year,all-week,early-peak,gasstove,2020,0.33330000000
+3,cook,2030,2,R1,all-year,all-week,early-peak,gasstove,2025,0.91670000000
+3,cook,2035,2,R1,all-year,all-week,early-peak,gasstove,2025,0.91670000000
+3,cook,2035,3,R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
+3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.63330000000
+3,heat,2030,4,R1,all-year,all-week,early-peak,heatpump,2020,0.33330000000
+3,heat,2030,5,R1,all-year,all-week,early-peak,heatpump,2025,0.28330000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.63330000000
+3,heat,2035,5,R1,all-year,all-week,early-peak,heatpump,2025,0.28330000000
+3,heat,2035,6,R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
+4,CO2f,2030,0,R1,all-year,all-week,late-peak,gasboiler,2025,81.96080000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,81.96080000000
+4,cook,2030,1,R1,all-year,all-week,late-peak,gasstove,2020,0.66670000000
+4,cook,2030,2,R1,all-year,all-week,late-peak,gasstove,2025,1.83330000000
+4,cook,2035,2,R1,all-year,all-week,late-peak,gasstove,2025,1.83330000000
+4,cook,2035,3,R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
+4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2025,1.26670000000
+4,heat,2030,4,R1,all-year,all-week,late-peak,heatpump,2020,0.66670000000
+4,heat,2030,5,R1,all-year,all-week,late-peak,heatpump,2025,0.56670000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,1.26670000000
+4,heat,2035,5,R1,all-year,all-week,late-peak,heatpump,2025,0.56670000000
+4,heat,2035,6,R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
+5,CO2f,2030,0,R1,all-year,all-week,evening,gasboiler,2025,54.64050000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,54.64050000000
+5,cook,2030,1,R1,all-year,all-week,evening,gasstove,2020,0.44440000000
+5,cook,2030,2,R1,all-year,all-week,evening,gasstove,2025,1.22220000000
+5,cook,2035,2,R1,all-year,all-week,evening,gasstove,2025,1.22220000000
+5,cook,2035,3,R1,all-year,all-week,evening,gasstove,2030,0.77780000000
+5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2025,0.84440000000
+5,heat,2030,4,R1,all-year,all-week,evening,heatpump,2020,0.44440000000
+5,heat,2030,5,R1,all-year,all-week,evening,heatpump,2025,0.37780000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.84440000000
+5,heat,2035,5,R1,all-year,all-week,evening,heatpump,2025,0.37780000000
+5,heat,2035,6,R1,all-year,all-week,evening,heatpump,2030,0.77780000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2035.csv b/tests/example_outputs/medium/Residential/Supply/2035.csv
index 47d661d47..962b162fd 100644
--- a/tests/example_outputs/medium/Residential/Supply/2035.csv
+++ b/tests/example_outputs/medium/Residential/Supply/2035.csv
@@ -1,73 +1,73 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,night,27.32030000000
-0,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,night,23.58170000000
-0,cook,2035,2,R1,gasstove,2025,all-year,all-week,night,0.61110000000
-0,cook,2035,3,R1,gasstove,2030,all-year,all-week,night,0.38890000000
-0,cook,2040,3,R1,gasstove,2030,all-year,all-week,night,0.38890000000
-0,cook,2040,4,R1,gasstove,2035,all-year,all-week,night,0.77780000000
-0,heat,2035,0,R1,gasboiler,2025,all-year,all-week,night,0.42220000000
-0,heat,2035,5,R1,heatpump,2025,all-year,all-week,night,0.18890000000
-0,heat,2035,6,R1,heatpump,2030,all-year,all-week,night,0.38890000000
-0,heat,2040,1,R1,gasboiler,2035,all-year,all-week,night,0.36440000000
-0,heat,2040,6,R1,heatpump,2030,all-year,all-week,night,0.38890000000
-0,heat,2040,7,R1,heatpump,2035,all-year,all-week,night,0.41330000000
-1,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,morning,40.98040000000
-1,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,morning,35.37250000000
-1,cook,2035,2,R1,gasstove,2025,all-year,all-week,morning,0.91670000000
-1,cook,2035,3,R1,gasstove,2030,all-year,all-week,morning,0.58330000000
-1,cook,2040,3,R1,gasstove,2030,all-year,all-week,morning,0.58330000000
-1,cook,2040,4,R1,gasstove,2035,all-year,all-week,morning,1.16670000000
-1,heat,2035,0,R1,gasboiler,2025,all-year,all-week,morning,0.63330000000
-1,heat,2035,5,R1,heatpump,2025,all-year,all-week,morning,0.28330000000
-1,heat,2035,6,R1,heatpump,2030,all-year,all-week,morning,0.58330000000
-1,heat,2040,1,R1,gasboiler,2035,all-year,all-week,morning,0.54670000000
-1,heat,2040,6,R1,heatpump,2030,all-year,all-week,morning,0.58330000000
-1,heat,2040,7,R1,heatpump,2035,all-year,all-week,morning,0.62000000000
-2,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,27.32030000000
-2,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,afternoon,23.58170000000
-2,cook,2035,2,R1,gasstove,2025,all-year,all-week,afternoon,0.61110000000
-2,cook,2035,3,R1,gasstove,2030,all-year,all-week,afternoon,0.38890000000
-2,cook,2040,3,R1,gasstove,2030,all-year,all-week,afternoon,0.38890000000
-2,cook,2040,4,R1,gasstove,2035,all-year,all-week,afternoon,0.77780000000
-2,heat,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.42220000000
-2,heat,2035,5,R1,heatpump,2025,all-year,all-week,afternoon,0.18890000000
-2,heat,2035,6,R1,heatpump,2030,all-year,all-week,afternoon,0.38890000000
-2,heat,2040,1,R1,gasboiler,2035,all-year,all-week,afternoon,0.36440000000
-2,heat,2040,6,R1,heatpump,2030,all-year,all-week,afternoon,0.38890000000
-2,heat,2040,7,R1,heatpump,2035,all-year,all-week,afternoon,0.41330000000
-3,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,40.98040000000
-3,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,early-peak,35.37250000000
-3,cook,2035,2,R1,gasstove,2025,all-year,all-week,early-peak,0.91670000000
-3,cook,2035,3,R1,gasstove,2030,all-year,all-week,early-peak,0.58330000000
-3,cook,2040,3,R1,gasstove,2030,all-year,all-week,early-peak,0.58330000000
-3,cook,2040,4,R1,gasstove,2035,all-year,all-week,early-peak,1.16670000000
-3,heat,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.63330000000
-3,heat,2035,5,R1,heatpump,2025,all-year,all-week,early-peak,0.28330000000
-3,heat,2035,6,R1,heatpump,2030,all-year,all-week,early-peak,0.58330000000
-3,heat,2040,1,R1,gasboiler,2035,all-year,all-week,early-peak,0.54670000000
-3,heat,2040,6,R1,heatpump,2030,all-year,all-week,early-peak,0.58330000000
-3,heat,2040,7,R1,heatpump,2035,all-year,all-week,early-peak,0.62000000000
-4,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,81.96080000000
-4,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,late-peak,70.74510000000
-4,cook,2035,2,R1,gasstove,2025,all-year,all-week,late-peak,1.83330000000
-4,cook,2035,3,R1,gasstove,2030,all-year,all-week,late-peak,1.16670000000
-4,cook,2040,3,R1,gasstove,2030,all-year,all-week,late-peak,1.16670000000
-4,cook,2040,4,R1,gasstove,2035,all-year,all-week,late-peak,2.33330000000
-4,heat,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,1.26670000000
-4,heat,2035,5,R1,heatpump,2025,all-year,all-week,late-peak,0.56670000000
-4,heat,2035,6,R1,heatpump,2030,all-year,all-week,late-peak,1.16670000000
-4,heat,2040,1,R1,gasboiler,2035,all-year,all-week,late-peak,1.09330000000
-4,heat,2040,6,R1,heatpump,2030,all-year,all-week,late-peak,1.16670000000
-4,heat,2040,7,R1,heatpump,2035,all-year,all-week,late-peak,1.24000000000
-5,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,evening,54.64050000000
-5,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,evening,47.16340000000
-5,cook,2035,2,R1,gasstove,2025,all-year,all-week,evening,1.22220000000
-5,cook,2035,3,R1,gasstove,2030,all-year,all-week,evening,0.77780000000
-5,cook,2040,3,R1,gasstove,2030,all-year,all-week,evening,0.77780000000
-5,cook,2040,4,R1,gasstove,2035,all-year,all-week,evening,1.55560000000
-5,heat,2035,0,R1,gasboiler,2025,all-year,all-week,evening,0.84440000000
-5,heat,2035,5,R1,heatpump,2025,all-year,all-week,evening,0.37780000000
-5,heat,2035,6,R1,heatpump,2030,all-year,all-week,evening,0.77780000000
-5,heat,2040,1,R1,gasboiler,2035,all-year,all-week,evening,0.72890000000
-5,heat,2040,6,R1,heatpump,2030,all-year,all-week,evening,0.77780000000
-5,heat,2040,7,R1,heatpump,2035,all-year,all-week,evening,0.82670000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,27.32030000000
+0,CO2f,2040,1,R1,all-year,all-week,night,gasboiler,2035,23.58170000000
+0,cook,2035,2,R1,all-year,all-week,night,gasstove,2025,0.61110000000
+0,cook,2035,3,R1,all-year,all-week,night,gasstove,2030,0.38890000000
+0,cook,2040,3,R1,all-year,all-week,night,gasstove,2030,0.38890000000
+0,cook,2040,4,R1,all-year,all-week,night,gasstove,2035,0.77780000000
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.42220000000
+0,heat,2035,5,R1,all-year,all-week,night,heatpump,2025,0.18890000000
+0,heat,2035,6,R1,all-year,all-week,night,heatpump,2030,0.38890000000
+0,heat,2040,1,R1,all-year,all-week,night,gasboiler,2035,0.36440000000
+0,heat,2040,6,R1,all-year,all-week,night,heatpump,2030,0.38890000000
+0,heat,2040,7,R1,all-year,all-week,night,heatpump,2035,0.41330000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,40.98040000000
+1,CO2f,2040,1,R1,all-year,all-week,morning,gasboiler,2035,35.37250000000
+1,cook,2035,2,R1,all-year,all-week,morning,gasstove,2025,0.91670000000
+1,cook,2035,3,R1,all-year,all-week,morning,gasstove,2030,0.58330000000
+1,cook,2040,3,R1,all-year,all-week,morning,gasstove,2030,0.58330000000
+1,cook,2040,4,R1,all-year,all-week,morning,gasstove,2035,1.16670000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.63330000000
+1,heat,2035,5,R1,all-year,all-week,morning,heatpump,2025,0.28330000000
+1,heat,2035,6,R1,all-year,all-week,morning,heatpump,2030,0.58330000000
+1,heat,2040,1,R1,all-year,all-week,morning,gasboiler,2035,0.54670000000
+1,heat,2040,6,R1,all-year,all-week,morning,heatpump,2030,0.58330000000
+1,heat,2040,7,R1,all-year,all-week,morning,heatpump,2035,0.62000000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,27.32030000000
+2,CO2f,2040,1,R1,all-year,all-week,afternoon,gasboiler,2035,23.58170000000
+2,cook,2035,2,R1,all-year,all-week,afternoon,gasstove,2025,0.61110000000
+2,cook,2035,3,R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
+2,cook,2040,3,R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
+2,cook,2040,4,R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.42220000000
+2,heat,2035,5,R1,all-year,all-week,afternoon,heatpump,2025,0.18890000000
+2,heat,2035,6,R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
+2,heat,2040,1,R1,all-year,all-week,afternoon,gasboiler,2035,0.36440000000
+2,heat,2040,6,R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
+2,heat,2040,7,R1,all-year,all-week,afternoon,heatpump,2035,0.41330000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,40.98040000000
+3,CO2f,2040,1,R1,all-year,all-week,early-peak,gasboiler,2035,35.37250000000
+3,cook,2035,2,R1,all-year,all-week,early-peak,gasstove,2025,0.91670000000
+3,cook,2035,3,R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
+3,cook,2040,3,R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
+3,cook,2040,4,R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.63330000000
+3,heat,2035,5,R1,all-year,all-week,early-peak,heatpump,2025,0.28330000000
+3,heat,2035,6,R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
+3,heat,2040,1,R1,all-year,all-week,early-peak,gasboiler,2035,0.54670000000
+3,heat,2040,6,R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
+3,heat,2040,7,R1,all-year,all-week,early-peak,heatpump,2035,0.62000000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,81.96080000000
+4,CO2f,2040,1,R1,all-year,all-week,late-peak,gasboiler,2035,70.74510000000
+4,cook,2035,2,R1,all-year,all-week,late-peak,gasstove,2025,1.83330000000
+4,cook,2035,3,R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
+4,cook,2040,3,R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
+4,cook,2040,4,R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,1.26670000000
+4,heat,2035,5,R1,all-year,all-week,late-peak,heatpump,2025,0.56670000000
+4,heat,2035,6,R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
+4,heat,2040,1,R1,all-year,all-week,late-peak,gasboiler,2035,1.09330000000
+4,heat,2040,6,R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
+4,heat,2040,7,R1,all-year,all-week,late-peak,heatpump,2035,1.24000000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,54.64050000000
+5,CO2f,2040,1,R1,all-year,all-week,evening,gasboiler,2035,47.16340000000
+5,cook,2035,2,R1,all-year,all-week,evening,gasstove,2025,1.22220000000
+5,cook,2035,3,R1,all-year,all-week,evening,gasstove,2030,0.77780000000
+5,cook,2040,3,R1,all-year,all-week,evening,gasstove,2030,0.77780000000
+5,cook,2040,4,R1,all-year,all-week,evening,gasstove,2035,1.55560000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.84440000000
+5,heat,2035,5,R1,all-year,all-week,evening,heatpump,2025,0.37780000000
+5,heat,2035,6,R1,all-year,all-week,evening,heatpump,2030,0.77780000000
+5,heat,2040,1,R1,all-year,all-week,evening,gasboiler,2035,0.72890000000
+5,heat,2040,6,R1,all-year,all-week,evening,heatpump,2030,0.77780000000
+5,heat,2040,7,R1,all-year,all-week,evening,heatpump,2035,0.82670000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2040.csv b/tests/example_outputs/medium/Residential/Supply/2040.csv
index b5f47f36d..5fa835b2c 100644
--- a/tests/example_outputs/medium/Residential/Supply/2040.csv
+++ b/tests/example_outputs/medium/Residential/Supply/2040.csv
@@ -1,73 +1,73 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,night,23.58170000000
-0,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,night,23.58170000000
-0,cook,2040,1,R1,gasstove,2030,all-year,all-week,night,0.38890000000
-0,cook,2040,2,R1,gasstove,2035,all-year,all-week,night,0.77780000000
-0,cook,2045,2,R1,gasstove,2035,all-year,all-week,night,0.77780000000
-0,cook,2045,3,R1,gasstove,2040,all-year,all-week,night,0.55560000000
-0,heat,2040,0,R1,gasboiler,2035,all-year,all-week,night,0.36440000000
-0,heat,2040,4,R1,heatpump,2030,all-year,all-week,night,0.38890000000
-0,heat,2040,5,R1,heatpump,2035,all-year,all-week,night,0.41330000000
-0,heat,2045,0,R1,gasboiler,2035,all-year,all-week,night,0.36440000000
-0,heat,2045,5,R1,heatpump,2035,all-year,all-week,night,0.41330000000
-0,heat,2045,6,R1,heatpump,2040,all-year,all-week,night,0.55560000000
-1,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,morning,35.37250000000
-1,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,morning,35.37250000000
-1,cook,2040,1,R1,gasstove,2030,all-year,all-week,morning,0.58330000000
-1,cook,2040,2,R1,gasstove,2035,all-year,all-week,morning,1.16670000000
-1,cook,2045,2,R1,gasstove,2035,all-year,all-week,morning,1.16670000000
-1,cook,2045,3,R1,gasstove,2040,all-year,all-week,morning,0.83330000000
-1,heat,2040,0,R1,gasboiler,2035,all-year,all-week,morning,0.54670000000
-1,heat,2040,4,R1,heatpump,2030,all-year,all-week,morning,0.58330000000
-1,heat,2040,5,R1,heatpump,2035,all-year,all-week,morning,0.62000000000
-1,heat,2045,0,R1,gasboiler,2035,all-year,all-week,morning,0.54670000000
-1,heat,2045,5,R1,heatpump,2035,all-year,all-week,morning,0.62000000000
-1,heat,2045,6,R1,heatpump,2040,all-year,all-week,morning,0.83330000000
-2,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,afternoon,23.58170000000
-2,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,23.58170000000
-2,cook,2040,1,R1,gasstove,2030,all-year,all-week,afternoon,0.38890000000
-2,cook,2040,2,R1,gasstove,2035,all-year,all-week,afternoon,0.77780000000
-2,cook,2045,2,R1,gasstove,2035,all-year,all-week,afternoon,0.77780000000
-2,cook,2045,3,R1,gasstove,2040,all-year,all-week,afternoon,0.55560000000
-2,heat,2040,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.36440000000
-2,heat,2040,4,R1,heatpump,2030,all-year,all-week,afternoon,0.38890000000
-2,heat,2040,5,R1,heatpump,2035,all-year,all-week,afternoon,0.41330000000
-2,heat,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.36440000000
-2,heat,2045,5,R1,heatpump,2035,all-year,all-week,afternoon,0.41330000000
-2,heat,2045,6,R1,heatpump,2040,all-year,all-week,afternoon,0.55560000000
-3,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,early-peak,35.37250000000
-3,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,35.37250000000
-3,cook,2040,1,R1,gasstove,2030,all-year,all-week,early-peak,0.58330000000
-3,cook,2040,2,R1,gasstove,2035,all-year,all-week,early-peak,1.16670000000
-3,cook,2045,2,R1,gasstove,2035,all-year,all-week,early-peak,1.16670000000
-3,cook,2045,3,R1,gasstove,2040,all-year,all-week,early-peak,0.83330000000
-3,heat,2040,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.54670000000
-3,heat,2040,4,R1,heatpump,2030,all-year,all-week,early-peak,0.58330000000
-3,heat,2040,5,R1,heatpump,2035,all-year,all-week,early-peak,0.62000000000
-3,heat,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.54670000000
-3,heat,2045,5,R1,heatpump,2035,all-year,all-week,early-peak,0.62000000000
-3,heat,2045,6,R1,heatpump,2040,all-year,all-week,early-peak,0.83330000000
-4,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,late-peak,70.74510000000
-4,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,70.74510000000
-4,cook,2040,1,R1,gasstove,2030,all-year,all-week,late-peak,1.16670000000
-4,cook,2040,2,R1,gasstove,2035,all-year,all-week,late-peak,2.33330000000
-4,cook,2045,2,R1,gasstove,2035,all-year,all-week,late-peak,2.33330000000
-4,cook,2045,3,R1,gasstove,2040,all-year,all-week,late-peak,1.66670000000
-4,heat,2040,0,R1,gasboiler,2035,all-year,all-week,late-peak,1.09330000000
-4,heat,2040,4,R1,heatpump,2030,all-year,all-week,late-peak,1.16670000000
-4,heat,2040,5,R1,heatpump,2035,all-year,all-week,late-peak,1.24000000000
-4,heat,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,1.09330000000
-4,heat,2045,5,R1,heatpump,2035,all-year,all-week,late-peak,1.24000000000
-4,heat,2045,6,R1,heatpump,2040,all-year,all-week,late-peak,1.66670000000
-5,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,evening,47.16340000000
-5,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,evening,47.16340000000
-5,cook,2040,1,R1,gasstove,2030,all-year,all-week,evening,0.77780000000
-5,cook,2040,2,R1,gasstove,2035,all-year,all-week,evening,1.55560000000
-5,cook,2045,2,R1,gasstove,2035,all-year,all-week,evening,1.55560000000
-5,cook,2045,3,R1,gasstove,2040,all-year,all-week,evening,1.11110000000
-5,heat,2040,0,R1,gasboiler,2035,all-year,all-week,evening,0.72890000000
-5,heat,2040,4,R1,heatpump,2030,all-year,all-week,evening,0.77780000000
-5,heat,2040,5,R1,heatpump,2035,all-year,all-week,evening,0.82670000000
-5,heat,2045,0,R1,gasboiler,2035,all-year,all-week,evening,0.72890000000
-5,heat,2045,5,R1,heatpump,2035,all-year,all-week,evening,0.82670000000
-5,heat,2045,6,R1,heatpump,2040,all-year,all-week,evening,1.11110000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,CO2f,2040,0,R1,all-year,all-week,night,gasboiler,2035,23.58170000000
+0,CO2f,2045,0,R1,all-year,all-week,night,gasboiler,2035,23.58170000000
+0,cook,2040,1,R1,all-year,all-week,night,gasstove,2030,0.38890000000
+0,cook,2040,2,R1,all-year,all-week,night,gasstove,2035,0.77780000000
+0,cook,2045,2,R1,all-year,all-week,night,gasstove,2035,0.77780000000
+0,cook,2045,3,R1,all-year,all-week,night,gasstove,2040,0.55560000000
+0,heat,2040,0,R1,all-year,all-week,night,gasboiler,2035,0.36440000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2030,0.38890000000
+0,heat,2040,5,R1,all-year,all-week,night,heatpump,2035,0.41330000000
+0,heat,2045,0,R1,all-year,all-week,night,gasboiler,2035,0.36440000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2035,0.41330000000
+0,heat,2045,6,R1,all-year,all-week,night,heatpump,2040,0.55560000000
+1,CO2f,2040,0,R1,all-year,all-week,morning,gasboiler,2035,35.37250000000
+1,CO2f,2045,0,R1,all-year,all-week,morning,gasboiler,2035,35.37250000000
+1,cook,2040,1,R1,all-year,all-week,morning,gasstove,2030,0.58330000000
+1,cook,2040,2,R1,all-year,all-week,morning,gasstove,2035,1.16670000000
+1,cook,2045,2,R1,all-year,all-week,morning,gasstove,2035,1.16670000000
+1,cook,2045,3,R1,all-year,all-week,morning,gasstove,2040,0.83330000000
+1,heat,2040,0,R1,all-year,all-week,morning,gasboiler,2035,0.54670000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2030,0.58330000000
+1,heat,2040,5,R1,all-year,all-week,morning,heatpump,2035,0.62000000000
+1,heat,2045,0,R1,all-year,all-week,morning,gasboiler,2035,0.54670000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2035,0.62000000000
+1,heat,2045,6,R1,all-year,all-week,morning,heatpump,2040,0.83330000000
+2,CO2f,2040,0,R1,all-year,all-week,afternoon,gasboiler,2035,23.58170000000
+2,CO2f,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,23.58170000000
+2,cook,2040,1,R1,all-year,all-week,afternoon,gasstove,2030,0.38890000000
+2,cook,2040,2,R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
+2,cook,2045,2,R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
+2,cook,2045,3,R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
+2,heat,2040,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.36440000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2030,0.38890000000
+2,heat,2040,5,R1,all-year,all-week,afternoon,heatpump,2035,0.41330000000
+2,heat,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.36440000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2035,0.41330000000
+2,heat,2045,6,R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
+3,CO2f,2040,0,R1,all-year,all-week,early-peak,gasboiler,2035,35.37250000000
+3,CO2f,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,35.37250000000
+3,cook,2040,1,R1,all-year,all-week,early-peak,gasstove,2030,0.58330000000
+3,cook,2040,2,R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
+3,cook,2045,2,R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
+3,cook,2045,3,R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
+3,heat,2040,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.54670000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2030,0.58330000000
+3,heat,2040,5,R1,all-year,all-week,early-peak,heatpump,2035,0.62000000000
+3,heat,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.54670000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2035,0.62000000000
+3,heat,2045,6,R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
+4,CO2f,2040,0,R1,all-year,all-week,late-peak,gasboiler,2035,70.74510000000
+4,CO2f,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,70.74510000000
+4,cook,2040,1,R1,all-year,all-week,late-peak,gasstove,2030,1.16670000000
+4,cook,2040,2,R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
+4,cook,2045,2,R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
+4,cook,2045,3,R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
+4,heat,2040,0,R1,all-year,all-week,late-peak,gasboiler,2035,1.09330000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2030,1.16670000000
+4,heat,2040,5,R1,all-year,all-week,late-peak,heatpump,2035,1.24000000000
+4,heat,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,1.09330000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2035,1.24000000000
+4,heat,2045,6,R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
+5,CO2f,2040,0,R1,all-year,all-week,evening,gasboiler,2035,47.16340000000
+5,CO2f,2045,0,R1,all-year,all-week,evening,gasboiler,2035,47.16340000000
+5,cook,2040,1,R1,all-year,all-week,evening,gasstove,2030,0.77780000000
+5,cook,2040,2,R1,all-year,all-week,evening,gasstove,2035,1.55560000000
+5,cook,2045,2,R1,all-year,all-week,evening,gasstove,2035,1.55560000000
+5,cook,2045,3,R1,all-year,all-week,evening,gasstove,2040,1.11110000000
+5,heat,2040,0,R1,all-year,all-week,evening,gasboiler,2035,0.72890000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2030,0.77780000000
+5,heat,2040,5,R1,all-year,all-week,evening,heatpump,2035,0.82670000000
+5,heat,2045,0,R1,all-year,all-week,evening,gasboiler,2035,0.72890000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2035,0.82670000000
+5,heat,2045,6,R1,all-year,all-week,evening,heatpump,2040,1.11110000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2045.csv b/tests/example_outputs/medium/Residential/Supply/2045.csv
index aecfc127f..e7610fcc5 100644
--- a/tests/example_outputs/medium/Residential/Supply/2045.csv
+++ b/tests/example_outputs/medium/Residential/Supply/2045.csv
@@ -1,73 +1,73 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,night,23.58170000000
-0,CO2f,2050,1,R1,gasboiler,2045,all-year,all-week,night,17.31240000000
-0,cook,2045,2,R1,gasstove,2035,all-year,all-week,night,0.77780000000
-0,cook,2045,3,R1,gasstove,2040,all-year,all-week,night,0.55560000000
-0,cook,2050,3,R1,gasstove,2040,all-year,all-week,night,0.55560000000
-0,cook,2050,4,R1,gasstove,2045,all-year,all-week,night,0.94440000000
-0,heat,2045,0,R1,gasboiler,2035,all-year,all-week,night,0.36440000000
-0,heat,2045,5,R1,heatpump,2035,all-year,all-week,night,0.41330000000
-0,heat,2045,6,R1,heatpump,2040,all-year,all-week,night,0.55560000000
-0,heat,2050,1,R1,gasboiler,2045,all-year,all-week,night,0.26760000000
-0,heat,2050,6,R1,heatpump,2040,all-year,all-week,night,0.55560000000
-0,heat,2050,7,R1,heatpump,2045,all-year,all-week,night,0.67690000000
-1,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,morning,35.37250000000
-1,CO2f,2050,1,R1,gasboiler,2045,all-year,all-week,morning,25.96860000000
-1,cook,2045,2,R1,gasstove,2035,all-year,all-week,morning,1.16670000000
-1,cook,2045,3,R1,gasstove,2040,all-year,all-week,morning,0.83330000000
-1,cook,2050,3,R1,gasstove,2040,all-year,all-week,morning,0.83330000000
-1,cook,2050,4,R1,gasstove,2045,all-year,all-week,morning,1.41670000000
-1,heat,2045,0,R1,gasboiler,2035,all-year,all-week,morning,0.54670000000
-1,heat,2045,5,R1,heatpump,2035,all-year,all-week,morning,0.62000000000
-1,heat,2045,6,R1,heatpump,2040,all-year,all-week,morning,0.83330000000
-1,heat,2050,1,R1,gasboiler,2045,all-year,all-week,morning,0.40130000000
-1,heat,2050,6,R1,heatpump,2040,all-year,all-week,morning,0.83330000000
-1,heat,2050,7,R1,heatpump,2045,all-year,all-week,morning,1.01530000000
-2,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,23.58170000000
-2,CO2f,2050,1,R1,gasboiler,2045,all-year,all-week,afternoon,17.31240000000
-2,cook,2045,2,R1,gasstove,2035,all-year,all-week,afternoon,0.77780000000
-2,cook,2045,3,R1,gasstove,2040,all-year,all-week,afternoon,0.55560000000
-2,cook,2050,3,R1,gasstove,2040,all-year,all-week,afternoon,0.55560000000
-2,cook,2050,4,R1,gasstove,2045,all-year,all-week,afternoon,0.94440000000
-2,heat,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.36440000000
-2,heat,2045,5,R1,heatpump,2035,all-year,all-week,afternoon,0.41330000000
-2,heat,2045,6,R1,heatpump,2040,all-year,all-week,afternoon,0.55560000000
-2,heat,2050,1,R1,gasboiler,2045,all-year,all-week,afternoon,0.26760000000
-2,heat,2050,6,R1,heatpump,2040,all-year,all-week,afternoon,0.55560000000
-2,heat,2050,7,R1,heatpump,2045,all-year,all-week,afternoon,0.67690000000
-3,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,35.37250000000
-3,CO2f,2050,1,R1,gasboiler,2045,all-year,all-week,early-peak,25.96860000000
-3,cook,2045,2,R1,gasstove,2035,all-year,all-week,early-peak,1.16670000000
-3,cook,2045,3,R1,gasstove,2040,all-year,all-week,early-peak,0.83330000000
-3,cook,2050,3,R1,gasstove,2040,all-year,all-week,early-peak,0.83330000000
-3,cook,2050,4,R1,gasstove,2045,all-year,all-week,early-peak,1.41670000000
-3,heat,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.54670000000
-3,heat,2045,5,R1,heatpump,2035,all-year,all-week,early-peak,0.62000000000
-3,heat,2045,6,R1,heatpump,2040,all-year,all-week,early-peak,0.83330000000
-3,heat,2050,1,R1,gasboiler,2045,all-year,all-week,early-peak,0.40130000000
-3,heat,2050,6,R1,heatpump,2040,all-year,all-week,early-peak,0.83330000000
-3,heat,2050,7,R1,heatpump,2045,all-year,all-week,early-peak,1.01530000000
-4,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,70.74510000000
-4,CO2f,2050,1,R1,gasboiler,2045,all-year,all-week,late-peak,51.93730000000
-4,cook,2045,2,R1,gasstove,2035,all-year,all-week,late-peak,2.33330000000
-4,cook,2045,3,R1,gasstove,2040,all-year,all-week,late-peak,1.66670000000
-4,cook,2050,3,R1,gasstove,2040,all-year,all-week,late-peak,1.66670000000
-4,cook,2050,4,R1,gasstove,2045,all-year,all-week,late-peak,2.83330000000
-4,heat,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,1.09330000000
-4,heat,2045,5,R1,heatpump,2035,all-year,all-week,late-peak,1.24000000000
-4,heat,2045,6,R1,heatpump,2040,all-year,all-week,late-peak,1.66670000000
-4,heat,2050,1,R1,gasboiler,2045,all-year,all-week,late-peak,0.80270000000
-4,heat,2050,6,R1,heatpump,2040,all-year,all-week,late-peak,1.66670000000
-4,heat,2050,7,R1,heatpump,2045,all-year,all-week,late-peak,2.03070000000
-5,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,evening,47.16340000000
-5,CO2f,2050,1,R1,gasboiler,2045,all-year,all-week,evening,34.62480000000
-5,cook,2045,2,R1,gasstove,2035,all-year,all-week,evening,1.55560000000
-5,cook,2045,3,R1,gasstove,2040,all-year,all-week,evening,1.11110000000
-5,cook,2050,3,R1,gasstove,2040,all-year,all-week,evening,1.11110000000
-5,cook,2050,4,R1,gasstove,2045,all-year,all-week,evening,1.88890000000
-5,heat,2045,0,R1,gasboiler,2035,all-year,all-week,evening,0.72890000000
-5,heat,2045,5,R1,heatpump,2035,all-year,all-week,evening,0.82670000000
-5,heat,2045,6,R1,heatpump,2040,all-year,all-week,evening,1.11110000000
-5,heat,2050,1,R1,gasboiler,2045,all-year,all-week,evening,0.53510000000
-5,heat,2050,6,R1,heatpump,2040,all-year,all-week,evening,1.11110000000
-5,heat,2050,7,R1,heatpump,2045,all-year,all-week,evening,1.35380000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,CO2f,2045,0,R1,all-year,all-week,night,gasboiler,2035,23.58170000000
+0,CO2f,2050,1,R1,all-year,all-week,night,gasboiler,2045,17.31240000000
+0,cook,2045,2,R1,all-year,all-week,night,gasstove,2035,0.77780000000
+0,cook,2045,3,R1,all-year,all-week,night,gasstove,2040,0.55560000000
+0,cook,2050,3,R1,all-year,all-week,night,gasstove,2040,0.55560000000
+0,cook,2050,4,R1,all-year,all-week,night,gasstove,2045,0.94440000000
+0,heat,2045,0,R1,all-year,all-week,night,gasboiler,2035,0.36440000000
+0,heat,2045,5,R1,all-year,all-week,night,heatpump,2035,0.41330000000
+0,heat,2045,6,R1,all-year,all-week,night,heatpump,2040,0.55560000000
+0,heat,2050,1,R1,all-year,all-week,night,gasboiler,2045,0.26760000000
+0,heat,2050,6,R1,all-year,all-week,night,heatpump,2040,0.55560000000
+0,heat,2050,7,R1,all-year,all-week,night,heatpump,2045,0.67690000000
+1,CO2f,2045,0,R1,all-year,all-week,morning,gasboiler,2035,35.37250000000
+1,CO2f,2050,1,R1,all-year,all-week,morning,gasboiler,2045,25.96860000000
+1,cook,2045,2,R1,all-year,all-week,morning,gasstove,2035,1.16670000000
+1,cook,2045,3,R1,all-year,all-week,morning,gasstove,2040,0.83330000000
+1,cook,2050,3,R1,all-year,all-week,morning,gasstove,2040,0.83330000000
+1,cook,2050,4,R1,all-year,all-week,morning,gasstove,2045,1.41670000000
+1,heat,2045,0,R1,all-year,all-week,morning,gasboiler,2035,0.54670000000
+1,heat,2045,5,R1,all-year,all-week,morning,heatpump,2035,0.62000000000
+1,heat,2045,6,R1,all-year,all-week,morning,heatpump,2040,0.83330000000
+1,heat,2050,1,R1,all-year,all-week,morning,gasboiler,2045,0.40130000000
+1,heat,2050,6,R1,all-year,all-week,morning,heatpump,2040,0.83330000000
+1,heat,2050,7,R1,all-year,all-week,morning,heatpump,2045,1.01530000000
+2,CO2f,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,23.58170000000
+2,CO2f,2050,1,R1,all-year,all-week,afternoon,gasboiler,2045,17.31240000000
+2,cook,2045,2,R1,all-year,all-week,afternoon,gasstove,2035,0.77780000000
+2,cook,2045,3,R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
+2,cook,2050,3,R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
+2,cook,2050,4,R1,all-year,all-week,afternoon,gasstove,2045,0.94440000000
+2,heat,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.36440000000
+2,heat,2045,5,R1,all-year,all-week,afternoon,heatpump,2035,0.41330000000
+2,heat,2045,6,R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
+2,heat,2050,1,R1,all-year,all-week,afternoon,gasboiler,2045,0.26760000000
+2,heat,2050,6,R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
+2,heat,2050,7,R1,all-year,all-week,afternoon,heatpump,2045,0.67690000000
+3,CO2f,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,35.37250000000
+3,CO2f,2050,1,R1,all-year,all-week,early-peak,gasboiler,2045,25.96860000000
+3,cook,2045,2,R1,all-year,all-week,early-peak,gasstove,2035,1.16670000000
+3,cook,2045,3,R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
+3,cook,2050,3,R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
+3,cook,2050,4,R1,all-year,all-week,early-peak,gasstove,2045,1.41670000000
+3,heat,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.54670000000
+3,heat,2045,5,R1,all-year,all-week,early-peak,heatpump,2035,0.62000000000
+3,heat,2045,6,R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
+3,heat,2050,1,R1,all-year,all-week,early-peak,gasboiler,2045,0.40130000000
+3,heat,2050,6,R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
+3,heat,2050,7,R1,all-year,all-week,early-peak,heatpump,2045,1.01530000000
+4,CO2f,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,70.74510000000
+4,CO2f,2050,1,R1,all-year,all-week,late-peak,gasboiler,2045,51.93730000000
+4,cook,2045,2,R1,all-year,all-week,late-peak,gasstove,2035,2.33330000000
+4,cook,2045,3,R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
+4,cook,2050,3,R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
+4,cook,2050,4,R1,all-year,all-week,late-peak,gasstove,2045,2.83330000000
+4,heat,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,1.09330000000
+4,heat,2045,5,R1,all-year,all-week,late-peak,heatpump,2035,1.24000000000
+4,heat,2045,6,R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
+4,heat,2050,1,R1,all-year,all-week,late-peak,gasboiler,2045,0.80270000000
+4,heat,2050,6,R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
+4,heat,2050,7,R1,all-year,all-week,late-peak,heatpump,2045,2.03070000000
+5,CO2f,2045,0,R1,all-year,all-week,evening,gasboiler,2035,47.16340000000
+5,CO2f,2050,1,R1,all-year,all-week,evening,gasboiler,2045,34.62480000000
+5,cook,2045,2,R1,all-year,all-week,evening,gasstove,2035,1.55560000000
+5,cook,2045,3,R1,all-year,all-week,evening,gasstove,2040,1.11110000000
+5,cook,2050,3,R1,all-year,all-week,evening,gasstove,2040,1.11110000000
+5,cook,2050,4,R1,all-year,all-week,evening,gasstove,2045,1.88890000000
+5,heat,2045,0,R1,all-year,all-week,evening,gasboiler,2035,0.72890000000
+5,heat,2045,5,R1,all-year,all-week,evening,heatpump,2035,0.82670000000
+5,heat,2045,6,R1,all-year,all-week,evening,heatpump,2040,1.11110000000
+5,heat,2050,1,R1,all-year,all-week,evening,gasboiler,2045,0.53510000000
+5,heat,2050,6,R1,all-year,all-week,evening,heatpump,2040,1.11110000000
+5,heat,2050,7,R1,all-year,all-week,evening,heatpump,2045,1.35380000000
diff --git a/tests/example_outputs/medium/Residential/Supply/2050.csv b/tests/example_outputs/medium/Residential/Supply/2050.csv
index e4342fef1..08447a877 100644
--- a/tests/example_outputs/medium/Residential/Supply/2050.csv
+++ b/tests/example_outputs/medium/Residential/Supply/2050.csv
@@ -1,73 +1,73 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,CO2f,2050,5,R1,2045,gasboiler,all-year,all-week,night,17.31240000000
-0,CO2f,2055,5,R1,2045,gasboiler,all-year,all-week,night,17.31240000000
-0,cook,2050,3,R1,2040,gasstove,all-year,all-week,night,0.55560000000
-0,cook,2050,6,R1,2045,gasstove,all-year,all-week,night,0.94440000000
-0,cook,2055,6,R1,2045,gasstove,all-year,all-week,night,0.94440000000
-0,cook,2055,8,R1,2050,gasstove,all-year,all-week,night,0.55560000000
-0,heat,2050,4,R1,2040,heatpump,all-year,all-week,night,0.55560000000
-0,heat,2050,5,R1,2045,gasboiler,all-year,all-week,night,0.26760000000
-0,heat,2050,7,R1,2045,heatpump,all-year,all-week,night,0.67690000000
-0,heat,2055,5,R1,2045,gasboiler,all-year,all-week,night,0.26760000000
-0,heat,2055,7,R1,2045,heatpump,all-year,all-week,night,0.67690000000
-0,heat,2055,9,R1,2050,heatpump,all-year,all-week,night,0.55560000000
-1,CO2f,2050,5,R1,2045,gasboiler,all-year,all-week,morning,25.96860000000
-1,CO2f,2055,5,R1,2045,gasboiler,all-year,all-week,morning,25.96860000000
-1,cook,2050,3,R1,2040,gasstove,all-year,all-week,morning,0.83330000000
-1,cook,2050,6,R1,2045,gasstove,all-year,all-week,morning,1.41670000000
-1,cook,2055,6,R1,2045,gasstove,all-year,all-week,morning,1.41670000000
-1,cook,2055,8,R1,2050,gasstove,all-year,all-week,morning,0.83330000000
-1,heat,2050,4,R1,2040,heatpump,all-year,all-week,morning,0.83330000000
-1,heat,2050,5,R1,2045,gasboiler,all-year,all-week,morning,0.40130000000
-1,heat,2050,7,R1,2045,heatpump,all-year,all-week,morning,1.01530000000
-1,heat,2055,5,R1,2045,gasboiler,all-year,all-week,morning,0.40130000000
-1,heat,2055,7,R1,2045,heatpump,all-year,all-week,morning,1.01530000000
-1,heat,2055,9,R1,2050,heatpump,all-year,all-week,morning,0.83330000000
-2,CO2f,2050,5,R1,2045,gasboiler,all-year,all-week,afternoon,17.31240000000
-2,CO2f,2055,5,R1,2045,gasboiler,all-year,all-week,afternoon,17.31240000000
-2,cook,2050,3,R1,2040,gasstove,all-year,all-week,afternoon,0.55560000000
-2,cook,2050,6,R1,2045,gasstove,all-year,all-week,afternoon,0.94440000000
-2,cook,2055,6,R1,2045,gasstove,all-year,all-week,afternoon,0.94440000000
-2,cook,2055,8,R1,2050,gasstove,all-year,all-week,afternoon,0.55560000000
-2,heat,2050,4,R1,2040,heatpump,all-year,all-week,afternoon,0.55560000000
-2,heat,2050,5,R1,2045,gasboiler,all-year,all-week,afternoon,0.26760000000
-2,heat,2050,7,R1,2045,heatpump,all-year,all-week,afternoon,0.67690000000
-2,heat,2055,5,R1,2045,gasboiler,all-year,all-week,afternoon,0.26760000000
-2,heat,2055,7,R1,2045,heatpump,all-year,all-week,afternoon,0.67690000000
-2,heat,2055,9,R1,2050,heatpump,all-year,all-week,afternoon,0.55560000000
-3,CO2f,2050,5,R1,2045,gasboiler,all-year,all-week,early-peak,25.96860000000
-3,CO2f,2055,5,R1,2045,gasboiler,all-year,all-week,early-peak,25.96860000000
-3,cook,2050,3,R1,2040,gasstove,all-year,all-week,early-peak,0.83330000000
-3,cook,2050,6,R1,2045,gasstove,all-year,all-week,early-peak,1.41670000000
-3,cook,2055,6,R1,2045,gasstove,all-year,all-week,early-peak,1.41670000000
-3,cook,2055,8,R1,2050,gasstove,all-year,all-week,early-peak,0.83330000000
-3,heat,2050,4,R1,2040,heatpump,all-year,all-week,early-peak,0.83330000000
-3,heat,2050,5,R1,2045,gasboiler,all-year,all-week,early-peak,0.40130000000
-3,heat,2050,7,R1,2045,heatpump,all-year,all-week,early-peak,1.01530000000
-3,heat,2055,5,R1,2045,gasboiler,all-year,all-week,early-peak,0.40130000000
-3,heat,2055,7,R1,2045,heatpump,all-year,all-week,early-peak,1.01530000000
-3,heat,2055,9,R1,2050,heatpump,all-year,all-week,early-peak,0.83330000000
-4,CO2f,2050,5,R1,2045,gasboiler,all-year,all-week,late-peak,51.93730000000
-4,CO2f,2055,5,R1,2045,gasboiler,all-year,all-week,late-peak,51.93730000000
-4,cook,2050,3,R1,2040,gasstove,all-year,all-week,late-peak,1.66670000000
-4,cook,2050,6,R1,2045,gasstove,all-year,all-week,late-peak,2.83330000000
-4,cook,2055,6,R1,2045,gasstove,all-year,all-week,late-peak,2.83330000000
-4,cook,2055,8,R1,2050,gasstove,all-year,all-week,late-peak,1.66670000000
-4,heat,2050,4,R1,2040,heatpump,all-year,all-week,late-peak,1.66670000000
-4,heat,2050,5,R1,2045,gasboiler,all-year,all-week,late-peak,0.80270000000
-4,heat,2050,7,R1,2045,heatpump,all-year,all-week,late-peak,2.03070000000
-4,heat,2055,5,R1,2045,gasboiler,all-year,all-week,late-peak,0.80270000000
-4,heat,2055,7,R1,2045,heatpump,all-year,all-week,late-peak,2.03070000000
-4,heat,2055,9,R1,2050,heatpump,all-year,all-week,late-peak,1.66670000000
-5,CO2f,2050,5,R1,2045,gasboiler,all-year,all-week,evening,34.62480000000
-5,CO2f,2055,5,R1,2045,gasboiler,all-year,all-week,evening,34.62480000000
-5,cook,2050,3,R1,2040,gasstove,all-year,all-week,evening,1.11110000000
-5,cook,2050,6,R1,2045,gasstove,all-year,all-week,evening,1.88890000000
-5,cook,2055,6,R1,2045,gasstove,all-year,all-week,evening,1.88890000000
-5,cook,2055,8,R1,2050,gasstove,all-year,all-week,evening,1.11110000000
-5,heat,2050,4,R1,2040,heatpump,all-year,all-week,evening,1.11110000000
-5,heat,2050,5,R1,2045,gasboiler,all-year,all-week,evening,0.53510000000
-5,heat,2050,7,R1,2045,heatpump,all-year,all-week,evening,1.35380000000
-5,heat,2055,5,R1,2045,gasboiler,all-year,all-week,evening,0.53510000000
-5,heat,2055,7,R1,2045,heatpump,all-year,all-week,evening,1.35380000000
-5,heat,2055,9,R1,2050,heatpump,all-year,all-week,evening,1.11110000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,CO2f,2050,1,R1,all-year,all-week,night,gasboiler,2045,17.31240000000
+0,CO2f,2055,1,R1,all-year,all-week,night,gasboiler,2045,17.31240000000
+0,cook,2050,3,R1,all-year,all-week,night,gasstove,2040,0.55560000000
+0,cook,2050,4,R1,all-year,all-week,night,gasstove,2045,0.94440000000
+0,cook,2055,4,R1,all-year,all-week,night,gasstove,2045,0.94440000000
+0,cook,2055,5,R1,all-year,all-week,night,gasstove,2050,0.55560000000
+0,heat,2050,1,R1,all-year,all-week,night,gasboiler,2045,0.26760000000
+0,heat,2050,7,R1,all-year,all-week,night,heatpump,2040,0.55560000000
+0,heat,2050,8,R1,all-year,all-week,night,heatpump,2045,0.67690000000
+0,heat,2055,1,R1,all-year,all-week,night,gasboiler,2045,0.26760000000
+0,heat,2055,8,R1,all-year,all-week,night,heatpump,2045,0.67690000000
+0,heat,2055,9,R1,all-year,all-week,night,heatpump,2050,0.55560000000
+1,CO2f,2050,1,R1,all-year,all-week,morning,gasboiler,2045,25.96860000000
+1,CO2f,2055,1,R1,all-year,all-week,morning,gasboiler,2045,25.96860000000
+1,cook,2050,3,R1,all-year,all-week,morning,gasstove,2040,0.83330000000
+1,cook,2050,4,R1,all-year,all-week,morning,gasstove,2045,1.41670000000
+1,cook,2055,4,R1,all-year,all-week,morning,gasstove,2045,1.41670000000
+1,cook,2055,5,R1,all-year,all-week,morning,gasstove,2050,0.83330000000
+1,heat,2050,1,R1,all-year,all-week,morning,gasboiler,2045,0.40130000000
+1,heat,2050,7,R1,all-year,all-week,morning,heatpump,2040,0.83330000000
+1,heat,2050,8,R1,all-year,all-week,morning,heatpump,2045,1.01530000000
+1,heat,2055,1,R1,all-year,all-week,morning,gasboiler,2045,0.40130000000
+1,heat,2055,8,R1,all-year,all-week,morning,heatpump,2045,1.01530000000
+1,heat,2055,9,R1,all-year,all-week,morning,heatpump,2050,0.83330000000
+2,CO2f,2050,1,R1,all-year,all-week,afternoon,gasboiler,2045,17.31240000000
+2,CO2f,2055,1,R1,all-year,all-week,afternoon,gasboiler,2045,17.31240000000
+2,cook,2050,3,R1,all-year,all-week,afternoon,gasstove,2040,0.55560000000
+2,cook,2050,4,R1,all-year,all-week,afternoon,gasstove,2045,0.94440000000
+2,cook,2055,4,R1,all-year,all-week,afternoon,gasstove,2045,0.94440000000
+2,cook,2055,5,R1,all-year,all-week,afternoon,gasstove,2050,0.55560000000
+2,heat,2050,1,R1,all-year,all-week,afternoon,gasboiler,2045,0.26760000000
+2,heat,2050,7,R1,all-year,all-week,afternoon,heatpump,2040,0.55560000000
+2,heat,2050,8,R1,all-year,all-week,afternoon,heatpump,2045,0.67690000000
+2,heat,2055,1,R1,all-year,all-week,afternoon,gasboiler,2045,0.26760000000
+2,heat,2055,8,R1,all-year,all-week,afternoon,heatpump,2045,0.67690000000
+2,heat,2055,9,R1,all-year,all-week,afternoon,heatpump,2050,0.55560000000
+3,CO2f,2050,1,R1,all-year,all-week,early-peak,gasboiler,2045,25.96860000000
+3,CO2f,2055,1,R1,all-year,all-week,early-peak,gasboiler,2045,25.96860000000
+3,cook,2050,3,R1,all-year,all-week,early-peak,gasstove,2040,0.83330000000
+3,cook,2050,4,R1,all-year,all-week,early-peak,gasstove,2045,1.41670000000
+3,cook,2055,4,R1,all-year,all-week,early-peak,gasstove,2045,1.41670000000
+3,cook,2055,5,R1,all-year,all-week,early-peak,gasstove,2050,0.83330000000
+3,heat,2050,1,R1,all-year,all-week,early-peak,gasboiler,2045,0.40130000000
+3,heat,2050,7,R1,all-year,all-week,early-peak,heatpump,2040,0.83330000000
+3,heat,2050,8,R1,all-year,all-week,early-peak,heatpump,2045,1.01530000000
+3,heat,2055,1,R1,all-year,all-week,early-peak,gasboiler,2045,0.40130000000
+3,heat,2055,8,R1,all-year,all-week,early-peak,heatpump,2045,1.01530000000
+3,heat,2055,9,R1,all-year,all-week,early-peak,heatpump,2050,0.83330000000
+4,CO2f,2050,1,R1,all-year,all-week,late-peak,gasboiler,2045,51.93730000000
+4,CO2f,2055,1,R1,all-year,all-week,late-peak,gasboiler,2045,51.93730000000
+4,cook,2050,3,R1,all-year,all-week,late-peak,gasstove,2040,1.66670000000
+4,cook,2050,4,R1,all-year,all-week,late-peak,gasstove,2045,2.83330000000
+4,cook,2055,4,R1,all-year,all-week,late-peak,gasstove,2045,2.83330000000
+4,cook,2055,5,R1,all-year,all-week,late-peak,gasstove,2050,1.66670000000
+4,heat,2050,1,R1,all-year,all-week,late-peak,gasboiler,2045,0.80270000000
+4,heat,2050,7,R1,all-year,all-week,late-peak,heatpump,2040,1.66670000000
+4,heat,2050,8,R1,all-year,all-week,late-peak,heatpump,2045,2.03070000000
+4,heat,2055,1,R1,all-year,all-week,late-peak,gasboiler,2045,0.80270000000
+4,heat,2055,8,R1,all-year,all-week,late-peak,heatpump,2045,2.03070000000
+4,heat,2055,9,R1,all-year,all-week,late-peak,heatpump,2050,1.66670000000
+5,CO2f,2050,1,R1,all-year,all-week,evening,gasboiler,2045,34.62480000000
+5,CO2f,2055,1,R1,all-year,all-week,evening,gasboiler,2045,34.62480000000
+5,cook,2050,3,R1,all-year,all-week,evening,gasstove,2040,1.11110000000
+5,cook,2050,4,R1,all-year,all-week,evening,gasstove,2045,1.88890000000
+5,cook,2055,4,R1,all-year,all-week,evening,gasstove,2045,1.88890000000
+5,cook,2055,5,R1,all-year,all-week,evening,gasstove,2050,1.11110000000
+5,heat,2050,1,R1,all-year,all-week,evening,gasboiler,2045,0.53510000000
+5,heat,2050,7,R1,all-year,all-week,evening,heatpump,2040,1.11110000000
+5,heat,2050,8,R1,all-year,all-week,evening,heatpump,2045,1.35380000000
+5,heat,2055,1,R1,all-year,all-week,evening,gasboiler,2045,0.53510000000
+5,heat,2055,8,R1,all-year,all-week,evening,heatpump,2045,1.35380000000
+5,heat,2055,9,R1,all-year,all-week,evening,heatpump,2050,1.11110000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2010.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2010.csv
index a029b8559..9198760ca 100644
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2010.csv
+++ b/tests/example_outputs/minimum_service/Industry/Capacity/2010.csv
@@ -1,61 +1,61 @@
-asset,year,region,installed,technology,capacity
-0,2010,R1,2010,procammonia_1,26.00000000000
-0,2011,R1,2010,procammonia_1,25.13330000000
-0,2012,R1,2010,procammonia_1,24.26670000000
-0,2013,R1,2010,procammonia_1,23.40000000000
-0,2014,R1,2010,procammonia_1,22.53330000000
-0,2015,R1,2010,procammonia_1,29.90000000000
-0,2016,R1,2010,procammonia_1,29.03330000000
-0,2017,R1,2010,procammonia_1,28.16670000000
-0,2018,R1,2010,procammonia_1,27.30000000000
-0,2019,R1,2010,procammonia_1,26.43330000000
-0,2020,R1,2010,procammonia_1,25.56670000000
-0,2021,R1,2010,procammonia_1,24.70000000000
-0,2022,R1,2010,procammonia_1,23.83330000000
-0,2023,R1,2010,procammonia_1,22.96670000000
-0,2024,R1,2010,procammonia_1,22.10000000000
-0,2025,R1,2010,procammonia_1,21.23330000000
-0,2026,R1,2010,procammonia_1,20.36670000000
-0,2027,R1,2010,procammonia_1,19.50000000000
-0,2028,R1,2010,procammonia_1,18.63330000000
-0,2029,R1,2010,procammonia_1,17.76670000000
-0,2030,R1,2010,procammonia_1,16.90000000000
-0,2031,R1,2010,procammonia_1,16.03330000000
-0,2032,R1,2010,procammonia_1,15.16670000000
-0,2033,R1,2010,procammonia_1,14.30000000000
-0,2034,R1,2010,procammonia_1,13.43330000000
-0,2035,R1,2010,procammonia_1,4.33330000000
-0,2036,R1,2010,procammonia_1,3.46670000000
-0,2037,R1,2010,procammonia_1,2.60000000000
-0,2038,R1,2010,procammonia_1,1.73330000000
-0,2039,R1,2010,procammonia_1,0.86670000000
-1,2010,R1,2010,procammonia_2,26.00000000000
-1,2011,R1,2010,procammonia_2,25.13330000000
-1,2012,R1,2010,procammonia_2,24.26670000000
-1,2013,R1,2010,procammonia_2,23.40000000000
-1,2014,R1,2010,procammonia_2,22.53330000000
-1,2015,R1,2010,procammonia_2,24.35470000000
-1,2016,R1,2010,procammonia_2,23.48800000000
-1,2017,R1,2010,procammonia_2,22.62140000000
-1,2018,R1,2010,procammonia_2,21.75470000000
-1,2019,R1,2010,procammonia_2,20.88800000000
-1,2020,R1,2010,procammonia_2,20.02140000000
-1,2021,R1,2010,procammonia_2,19.15470000000
-1,2022,R1,2010,procammonia_2,18.28800000000
-1,2023,R1,2010,procammonia_2,17.42140000000
-1,2024,R1,2010,procammonia_2,16.55470000000
-1,2025,R1,2010,procammonia_2,15.68800000000
-1,2026,R1,2010,procammonia_2,14.82140000000
-1,2027,R1,2010,procammonia_2,13.95470000000
-1,2028,R1,2010,procammonia_2,13.08800000000
-1,2029,R1,2010,procammonia_2,12.22140000000
-1,2030,R1,2010,procammonia_2,11.35470000000
-1,2031,R1,2010,procammonia_2,10.48800000000
-1,2032,R1,2010,procammonia_2,9.62140000000
-1,2033,R1,2010,procammonia_2,8.75470000000
-1,2034,R1,2010,procammonia_2,7.88800000000
-1,2035,R1,2010,procammonia_2,4.33330000000
-1,2036,R1,2010,procammonia_2,3.46670000000
-1,2037,R1,2010,procammonia_2,2.60000000000
-1,2038,R1,2010,procammonia_2,1.73330000000
-1,2039,R1,2010,procammonia_2,0.86670000000
+asset,year,region,technology,installed,capacity
+0,2010,R1,procammonia_1,2010,26.00000000000
+0,2011,R1,procammonia_1,2010,25.13330000000
+0,2012,R1,procammonia_1,2010,24.26670000000
+0,2013,R1,procammonia_1,2010,23.40000000000
+0,2014,R1,procammonia_1,2010,22.53330000000
+0,2015,R1,procammonia_1,2010,29.90000000000
+0,2016,R1,procammonia_1,2010,29.03330000000
+0,2017,R1,procammonia_1,2010,28.16670000000
+0,2018,R1,procammonia_1,2010,27.30000000000
+0,2019,R1,procammonia_1,2010,26.43330000000
+0,2020,R1,procammonia_1,2010,25.56670000000
+0,2021,R1,procammonia_1,2010,24.70000000000
+0,2022,R1,procammonia_1,2010,23.83330000000
+0,2023,R1,procammonia_1,2010,22.96670000000
+0,2024,R1,procammonia_1,2010,22.10000000000
+0,2025,R1,procammonia_1,2010,21.23330000000
+0,2026,R1,procammonia_1,2010,20.36670000000
+0,2027,R1,procammonia_1,2010,19.50000000000
+0,2028,R1,procammonia_1,2010,18.63330000000
+0,2029,R1,procammonia_1,2010,17.76670000000
+0,2030,R1,procammonia_1,2010,16.90000000000
+0,2031,R1,procammonia_1,2010,16.03330000000
+0,2032,R1,procammonia_1,2010,15.16670000000
+0,2033,R1,procammonia_1,2010,14.30000000000
+0,2034,R1,procammonia_1,2010,13.43330000000
+0,2035,R1,procammonia_1,2010,4.33330000000
+0,2036,R1,procammonia_1,2010,3.46670000000
+0,2037,R1,procammonia_1,2010,2.60000000000
+0,2038,R1,procammonia_1,2010,1.73330000000
+0,2039,R1,procammonia_1,2010,0.86670000000
+1,2010,R1,procammonia_2,2010,26.00000000000
+1,2011,R1,procammonia_2,2010,25.13330000000
+1,2012,R1,procammonia_2,2010,24.26670000000
+1,2013,R1,procammonia_2,2010,23.40000000000
+1,2014,R1,procammonia_2,2010,22.53330000000
+1,2015,R1,procammonia_2,2010,24.35470000000
+1,2016,R1,procammonia_2,2010,23.48800000000
+1,2017,R1,procammonia_2,2010,22.62140000000
+1,2018,R1,procammonia_2,2010,21.75470000000
+1,2019,R1,procammonia_2,2010,20.88800000000
+1,2020,R1,procammonia_2,2010,20.02140000000
+1,2021,R1,procammonia_2,2010,19.15470000000
+1,2022,R1,procammonia_2,2010,18.28800000000
+1,2023,R1,procammonia_2,2010,17.42140000000
+1,2024,R1,procammonia_2,2010,16.55470000000
+1,2025,R1,procammonia_2,2010,15.68800000000
+1,2026,R1,procammonia_2,2010,14.82140000000
+1,2027,R1,procammonia_2,2010,13.95470000000
+1,2028,R1,procammonia_2,2010,13.08800000000
+1,2029,R1,procammonia_2,2010,12.22140000000
+1,2030,R1,procammonia_2,2010,11.35470000000
+1,2031,R1,procammonia_2,2010,10.48800000000
+1,2032,R1,procammonia_2,2010,9.62140000000
+1,2033,R1,procammonia_2,2010,8.75470000000
+1,2034,R1,procammonia_2,2010,7.88800000000
+1,2035,R1,procammonia_2,2010,4.33330000000
+1,2036,R1,procammonia_2,2010,3.46670000000
+1,2037,R1,procammonia_2,2010,2.60000000000
+1,2038,R1,procammonia_2,2010,1.73330000000
+1,2039,R1,procammonia_2,2010,0.86670000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2015.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2015.csv
index c12af06ea..b19cd90a2 100644
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2015.csv
+++ b/tests/example_outputs/minimum_service/Industry/Capacity/2015.csv
@@ -1,71 +1,71 @@
-asset,year,region,installed,technology,capacity
-0,2015,R1,2010,procammonia_1,29.90000000000
-0,2016,R1,2010,procammonia_1,29.03330000000
-0,2017,R1,2010,procammonia_1,28.16670000000
-0,2018,R1,2010,procammonia_1,27.30000000000
-0,2019,R1,2010,procammonia_1,26.43330000000
-0,2020,R1,2010,procammonia_1,25.56670000000
-0,2021,R1,2010,procammonia_1,24.70000000000
-0,2022,R1,2010,procammonia_1,23.83330000000
-0,2023,R1,2010,procammonia_1,22.96670000000
-0,2024,R1,2010,procammonia_1,22.10000000000
-0,2025,R1,2010,procammonia_1,21.23330000000
-0,2026,R1,2010,procammonia_1,20.36670000000
-0,2027,R1,2010,procammonia_1,19.50000000000
-0,2028,R1,2010,procammonia_1,18.63330000000
-0,2029,R1,2010,procammonia_1,17.76670000000
-0,2030,R1,2010,procammonia_1,16.90000000000
-0,2031,R1,2010,procammonia_1,16.03330000000
-0,2032,R1,2010,procammonia_1,15.16670000000
-0,2033,R1,2010,procammonia_1,14.30000000000
-0,2034,R1,2010,procammonia_1,13.43330000000
-0,2035,R1,2010,procammonia_1,4.33330000000
-0,2036,R1,2010,procammonia_1,3.46670000000
-0,2037,R1,2010,procammonia_1,2.60000000000
-0,2038,R1,2010,procammonia_1,1.73330000000
-0,2039,R1,2010,procammonia_1,0.86670000000
-1,2015,R1,2010,procammonia_2,24.35470000000
-1,2016,R1,2010,procammonia_2,23.48800000000
-1,2017,R1,2010,procammonia_2,22.62140000000
-1,2018,R1,2010,procammonia_2,21.75470000000
-1,2019,R1,2010,procammonia_2,20.88800000000
-1,2020,R1,2010,procammonia_2,20.02140000000
-1,2021,R1,2010,procammonia_2,19.15470000000
-1,2022,R1,2010,procammonia_2,18.28800000000
-1,2023,R1,2010,procammonia_2,17.42140000000
-1,2024,R1,2010,procammonia_2,16.55470000000
-1,2025,R1,2010,procammonia_2,15.68800000000
-1,2026,R1,2010,procammonia_2,14.82140000000
-1,2027,R1,2010,procammonia_2,13.95470000000
-1,2028,R1,2010,procammonia_2,13.08800000000
-1,2029,R1,2010,procammonia_2,12.22140000000
-1,2030,R1,2010,procammonia_2,11.35470000000
-1,2031,R1,2010,procammonia_2,10.48800000000
-1,2032,R1,2010,procammonia_2,9.62140000000
-1,2033,R1,2010,procammonia_2,8.75470000000
-1,2034,R1,2010,procammonia_2,7.88800000000
-1,2035,R1,2010,procammonia_2,4.33330000000
-1,2036,R1,2010,procammonia_2,3.46670000000
-1,2037,R1,2010,procammonia_2,2.60000000000
-1,2038,R1,2010,procammonia_2,1.73330000000
-1,2039,R1,2010,procammonia_2,0.86670000000
-2,2020,R1,2015,procammonia_1,8.66670000000
-2,2021,R1,2015,procammonia_1,8.66670000000
-2,2022,R1,2015,procammonia_1,8.66670000000
-2,2023,R1,2015,procammonia_1,8.66670000000
-2,2024,R1,2015,procammonia_1,8.66670000000
-2,2025,R1,2015,procammonia_1,8.66670000000
-2,2026,R1,2015,procammonia_1,8.66670000000
-2,2027,R1,2015,procammonia_1,8.66670000000
-2,2028,R1,2015,procammonia_1,8.66670000000
-2,2029,R1,2015,procammonia_1,8.66670000000
-2,2030,R1,2015,procammonia_1,8.66670000000
-2,2031,R1,2015,procammonia_1,8.66670000000
-2,2032,R1,2015,procammonia_1,8.66670000000
-2,2033,R1,2015,procammonia_1,8.66670000000
-2,2034,R1,2015,procammonia_1,8.66670000000
-2,2035,R1,2015,procammonia_1,8.66670000000
-2,2036,R1,2015,procammonia_1,8.66670000000
-2,2037,R1,2015,procammonia_1,8.66670000000
-2,2038,R1,2015,procammonia_1,8.66670000000
-2,2039,R1,2015,procammonia_1,8.66670000000
+asset,year,region,technology,installed,capacity
+0,2015,R1,procammonia_1,2010,29.90000000000
+0,2016,R1,procammonia_1,2010,29.03330000000
+0,2017,R1,procammonia_1,2010,28.16670000000
+0,2018,R1,procammonia_1,2010,27.30000000000
+0,2019,R1,procammonia_1,2010,26.43330000000
+0,2020,R1,procammonia_1,2010,25.56670000000
+0,2021,R1,procammonia_1,2010,24.70000000000
+0,2022,R1,procammonia_1,2010,23.83330000000
+0,2023,R1,procammonia_1,2010,22.96670000000
+0,2024,R1,procammonia_1,2010,22.10000000000
+0,2025,R1,procammonia_1,2010,21.23330000000
+0,2026,R1,procammonia_1,2010,20.36670000000
+0,2027,R1,procammonia_1,2010,19.50000000000
+0,2028,R1,procammonia_1,2010,18.63330000000
+0,2029,R1,procammonia_1,2010,17.76670000000
+0,2030,R1,procammonia_1,2010,16.90000000000
+0,2031,R1,procammonia_1,2010,16.03330000000
+0,2032,R1,procammonia_1,2010,15.16670000000
+0,2033,R1,procammonia_1,2010,14.30000000000
+0,2034,R1,procammonia_1,2010,13.43330000000
+0,2035,R1,procammonia_1,2010,4.33330000000
+0,2036,R1,procammonia_1,2010,3.46670000000
+0,2037,R1,procammonia_1,2010,2.60000000000
+0,2038,R1,procammonia_1,2010,1.73330000000
+0,2039,R1,procammonia_1,2010,0.86670000000
+1,2020,R1,procammonia_1,2015,8.66670000000
+1,2021,R1,procammonia_1,2015,8.66670000000
+1,2022,R1,procammonia_1,2015,8.66670000000
+1,2023,R1,procammonia_1,2015,8.66670000000
+1,2024,R1,procammonia_1,2015,8.66670000000
+1,2025,R1,procammonia_1,2015,8.66670000000
+1,2026,R1,procammonia_1,2015,8.66670000000
+1,2027,R1,procammonia_1,2015,8.66670000000
+1,2028,R1,procammonia_1,2015,8.66670000000
+1,2029,R1,procammonia_1,2015,8.66670000000
+1,2030,R1,procammonia_1,2015,8.66670000000
+1,2031,R1,procammonia_1,2015,8.66670000000
+1,2032,R1,procammonia_1,2015,8.66670000000
+1,2033,R1,procammonia_1,2015,8.66670000000
+1,2034,R1,procammonia_1,2015,8.66670000000
+1,2035,R1,procammonia_1,2015,8.66670000000
+1,2036,R1,procammonia_1,2015,8.66670000000
+1,2037,R1,procammonia_1,2015,8.66670000000
+1,2038,R1,procammonia_1,2015,8.66670000000
+1,2039,R1,procammonia_1,2015,8.66670000000
+2,2015,R1,procammonia_2,2010,24.35470000000
+2,2016,R1,procammonia_2,2010,23.48800000000
+2,2017,R1,procammonia_2,2010,22.62140000000
+2,2018,R1,procammonia_2,2010,21.75470000000
+2,2019,R1,procammonia_2,2010,20.88800000000
+2,2020,R1,procammonia_2,2010,20.02140000000
+2,2021,R1,procammonia_2,2010,19.15470000000
+2,2022,R1,procammonia_2,2010,18.28800000000
+2,2023,R1,procammonia_2,2010,17.42140000000
+2,2024,R1,procammonia_2,2010,16.55470000000
+2,2025,R1,procammonia_2,2010,15.68800000000
+2,2026,R1,procammonia_2,2010,14.82140000000
+2,2027,R1,procammonia_2,2010,13.95470000000
+2,2028,R1,procammonia_2,2010,13.08800000000
+2,2029,R1,procammonia_2,2010,12.22140000000
+2,2030,R1,procammonia_2,2010,11.35470000000
+2,2031,R1,procammonia_2,2010,10.48800000000
+2,2032,R1,procammonia_2,2010,9.62140000000
+2,2033,R1,procammonia_2,2010,8.75470000000
+2,2034,R1,procammonia_2,2010,7.88800000000
+2,2035,R1,procammonia_2,2010,4.33330000000
+2,2036,R1,procammonia_2,2010,3.46670000000
+2,2037,R1,procammonia_2,2010,2.60000000000
+2,2038,R1,procammonia_2,2010,1.73330000000
+2,2039,R1,procammonia_2,2010,0.86670000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2030.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2030.csv
index acdd1076e..84f7fc0f0 100644
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2030.csv
+++ b/tests/example_outputs/minimum_service/Industry/Capacity/2030.csv
@@ -1,83 +1,83 @@
-asset,year,region,installed,technology,capacity
-0,2030,R1,2010,procammonia_1,16.90000000000
-0,2031,R1,2010,procammonia_1,16.03330000000
-0,2032,R1,2010,procammonia_1,15.16670000000
-0,2033,R1,2010,procammonia_1,14.30000000000
-0,2034,R1,2010,procammonia_1,13.43330000000
-0,2035,R1,2010,procammonia_1,4.33330000000
-0,2036,R1,2010,procammonia_1,3.46670000000
-0,2037,R1,2010,procammonia_1,2.60000000000
-0,2038,R1,2010,procammonia_1,1.73330000000
-0,2039,R1,2010,procammonia_1,0.86670000000
-1,2030,R1,2010,procammonia_2,11.35470000000
-1,2031,R1,2010,procammonia_2,10.48800000000
-1,2032,R1,2010,procammonia_2,9.62140000000
-1,2033,R1,2010,procammonia_2,8.75470000000
-1,2034,R1,2010,procammonia_2,7.88800000000
-1,2035,R1,2010,procammonia_2,4.33330000000
-1,2036,R1,2010,procammonia_2,3.46670000000
-1,2037,R1,2010,procammonia_2,2.60000000000
-1,2038,R1,2010,procammonia_2,1.73330000000
-1,2039,R1,2010,procammonia_2,0.86670000000
-2,2030,R1,2015,procammonia_1,8.66670000000
-2,2031,R1,2015,procammonia_1,8.66670000000
-2,2032,R1,2015,procammonia_1,8.66670000000
-2,2033,R1,2015,procammonia_1,8.66670000000
-2,2034,R1,2015,procammonia_1,8.66670000000
-2,2035,R1,2015,procammonia_1,8.66670000000
-2,2036,R1,2015,procammonia_1,8.66670000000
-2,2037,R1,2015,procammonia_1,8.66670000000
-2,2038,R1,2015,procammonia_1,8.66670000000
-2,2039,R1,2015,procammonia_1,8.66670000000
-3,2030,R1,2020,procammonia_1,8.70630000000
-3,2031,R1,2020,procammonia_1,8.70630000000
-3,2032,R1,2020,procammonia_1,8.70630000000
-3,2033,R1,2020,procammonia_1,8.70630000000
-3,2034,R1,2020,procammonia_1,8.70630000000
-3,2035,R1,2020,procammonia_1,8.70630000000
-3,2036,R1,2020,procammonia_1,8.70630000000
-3,2037,R1,2020,procammonia_1,8.70630000000
-3,2038,R1,2020,procammonia_1,8.70630000000
-3,2039,R1,2020,procammonia_1,8.70630000000
-3,2040,R1,2020,procammonia_1,8.70630000000
-3,2041,R1,2020,procammonia_1,8.70630000000
-3,2042,R1,2020,procammonia_1,8.70630000000
-3,2043,R1,2020,procammonia_1,8.70630000000
-3,2044,R1,2020,procammonia_1,8.70630000000
-4,2030,R1,2025,procammonia_1,8.70630000000
-4,2031,R1,2025,procammonia_1,8.70630000000
-4,2032,R1,2025,procammonia_1,8.70630000000
-4,2033,R1,2025,procammonia_1,8.70630000000
-4,2034,R1,2025,procammonia_1,8.70630000000
-4,2035,R1,2025,procammonia_1,8.70630000000
-4,2036,R1,2025,procammonia_1,8.70630000000
-4,2037,R1,2025,procammonia_1,8.70630000000
-4,2038,R1,2025,procammonia_1,8.70630000000
-4,2039,R1,2025,procammonia_1,8.70630000000
-4,2040,R1,2025,procammonia_1,8.70630000000
-4,2041,R1,2025,procammonia_1,8.70630000000
-4,2042,R1,2025,procammonia_1,8.70630000000
-4,2043,R1,2025,procammonia_1,8.70630000000
-4,2044,R1,2025,procammonia_1,8.70630000000
-4,2045,R1,2025,procammonia_1,8.70630000000
-4,2046,R1,2025,procammonia_1,8.70630000000
-4,2047,R1,2025,procammonia_1,8.70630000000
-4,2048,R1,2025,procammonia_1,8.70630000000
-4,2049,R1,2025,procammonia_1,8.70630000000
-5,2035,R1,2030,procammonia_1,18.79580000000
-5,2036,R1,2030,procammonia_1,18.79580000000
-5,2037,R1,2030,procammonia_1,18.79580000000
-5,2038,R1,2030,procammonia_1,18.79580000000
-5,2039,R1,2030,procammonia_1,18.79580000000
-5,2040,R1,2030,procammonia_1,18.79580000000
-5,2041,R1,2030,procammonia_1,18.79580000000
-5,2042,R1,2030,procammonia_1,18.79580000000
-5,2043,R1,2030,procammonia_1,18.79580000000
-5,2044,R1,2030,procammonia_1,18.79580000000
-5,2045,R1,2030,procammonia_1,18.79580000000
-5,2046,R1,2030,procammonia_1,18.79580000000
-5,2047,R1,2030,procammonia_1,18.79580000000
-5,2048,R1,2030,procammonia_1,18.79580000000
-5,2049,R1,2030,procammonia_1,18.79580000000
-5,2050,R1,2030,procammonia_1,18.79580000000
-5,2054,R1,2030,procammonia_1,18.79580000000
+asset,year,region,technology,installed,capacity
+0,2030,R1,procammonia_1,2010,16.90000000000
+0,2031,R1,procammonia_1,2010,16.03330000000
+0,2032,R1,procammonia_1,2010,15.16670000000
+0,2033,R1,procammonia_1,2010,14.30000000000
+0,2034,R1,procammonia_1,2010,13.43330000000
+0,2035,R1,procammonia_1,2010,4.33330000000
+0,2036,R1,procammonia_1,2010,3.46670000000
+0,2037,R1,procammonia_1,2010,2.60000000000
+0,2038,R1,procammonia_1,2010,1.73330000000
+0,2039,R1,procammonia_1,2010,0.86670000000
+1,2030,R1,procammonia_1,2015,8.66670000000
+1,2031,R1,procammonia_1,2015,8.66670000000
+1,2032,R1,procammonia_1,2015,8.66670000000
+1,2033,R1,procammonia_1,2015,8.66670000000
+1,2034,R1,procammonia_1,2015,8.66670000000
+1,2035,R1,procammonia_1,2015,8.66670000000
+1,2036,R1,procammonia_1,2015,8.66670000000
+1,2037,R1,procammonia_1,2015,8.66670000000
+1,2038,R1,procammonia_1,2015,8.66670000000
+1,2039,R1,procammonia_1,2015,8.66670000000
+2,2030,R1,procammonia_1,2020,8.70630000000
+2,2031,R1,procammonia_1,2020,8.70630000000
+2,2032,R1,procammonia_1,2020,8.70630000000
+2,2033,R1,procammonia_1,2020,8.70630000000
+2,2034,R1,procammonia_1,2020,8.70630000000
+2,2035,R1,procammonia_1,2020,8.70630000000
+2,2036,R1,procammonia_1,2020,8.70630000000
+2,2037,R1,procammonia_1,2020,8.70630000000
+2,2038,R1,procammonia_1,2020,8.70630000000
+2,2039,R1,procammonia_1,2020,8.70630000000
+2,2040,R1,procammonia_1,2020,8.70630000000
+2,2041,R1,procammonia_1,2020,8.70630000000
+2,2042,R1,procammonia_1,2020,8.70630000000
+2,2043,R1,procammonia_1,2020,8.70630000000
+2,2044,R1,procammonia_1,2020,8.70630000000
+3,2030,R1,procammonia_1,2025,8.70630000000
+3,2031,R1,procammonia_1,2025,8.70630000000
+3,2032,R1,procammonia_1,2025,8.70630000000
+3,2033,R1,procammonia_1,2025,8.70630000000
+3,2034,R1,procammonia_1,2025,8.70630000000
+3,2035,R1,procammonia_1,2025,8.70630000000
+3,2036,R1,procammonia_1,2025,8.70630000000
+3,2037,R1,procammonia_1,2025,8.70630000000
+3,2038,R1,procammonia_1,2025,8.70630000000
+3,2039,R1,procammonia_1,2025,8.70630000000
+3,2040,R1,procammonia_1,2025,8.70630000000
+3,2041,R1,procammonia_1,2025,8.70630000000
+3,2042,R1,procammonia_1,2025,8.70630000000
+3,2043,R1,procammonia_1,2025,8.70630000000
+3,2044,R1,procammonia_1,2025,8.70630000000
+3,2045,R1,procammonia_1,2025,8.70630000000
+3,2046,R1,procammonia_1,2025,8.70630000000
+3,2047,R1,procammonia_1,2025,8.70630000000
+3,2048,R1,procammonia_1,2025,8.70630000000
+3,2049,R1,procammonia_1,2025,8.70630000000
+4,2035,R1,procammonia_1,2030,18.79580000000
+4,2036,R1,procammonia_1,2030,18.79580000000
+4,2037,R1,procammonia_1,2030,18.79580000000
+4,2038,R1,procammonia_1,2030,18.79580000000
+4,2039,R1,procammonia_1,2030,18.79580000000
+4,2040,R1,procammonia_1,2030,18.79580000000
+4,2041,R1,procammonia_1,2030,18.79580000000
+4,2042,R1,procammonia_1,2030,18.79580000000
+4,2043,R1,procammonia_1,2030,18.79580000000
+4,2044,R1,procammonia_1,2030,18.79580000000
+4,2045,R1,procammonia_1,2030,18.79580000000
+4,2046,R1,procammonia_1,2030,18.79580000000
+4,2047,R1,procammonia_1,2030,18.79580000000
+4,2048,R1,procammonia_1,2030,18.79580000000
+4,2049,R1,procammonia_1,2030,18.79580000000
+4,2050,R1,procammonia_1,2030,18.79580000000
+4,2054,R1,procammonia_1,2030,18.79580000000
+5,2030,R1,procammonia_2,2010,11.35470000000
+5,2031,R1,procammonia_2,2010,10.48800000000
+5,2032,R1,procammonia_2,2010,9.62140000000
+5,2033,R1,procammonia_2,2010,8.75470000000
+5,2034,R1,procammonia_2,2010,7.88800000000
+5,2035,R1,procammonia_2,2010,4.33330000000
+5,2036,R1,procammonia_2,2010,3.46670000000
+5,2037,R1,procammonia_2,2010,2.60000000000
+5,2038,R1,procammonia_2,2010,1.73330000000
+5,2039,R1,procammonia_2,2010,0.86670000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2035.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2035.csv
index bc72ed0f7..f9cb9656d 100644
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2035.csv
+++ b/tests/example_outputs/minimum_service/Industry/Capacity/2035.csv
@@ -1,72 +1,72 @@
-asset,year,region,installed,technology,capacity
-0,2035,R1,2010,procammonia_1,4.33330000000
-0,2036,R1,2010,procammonia_1,3.46670000000
-0,2037,R1,2010,procammonia_1,2.60000000000
-0,2038,R1,2010,procammonia_1,1.73330000000
-0,2039,R1,2010,procammonia_1,0.86670000000
-1,2035,R1,2010,procammonia_2,4.33330000000
-1,2036,R1,2010,procammonia_2,3.46670000000
-1,2037,R1,2010,procammonia_2,2.60000000000
-1,2038,R1,2010,procammonia_2,1.73330000000
-1,2039,R1,2010,procammonia_2,0.86670000000
-2,2035,R1,2015,procammonia_1,8.66670000000
-2,2036,R1,2015,procammonia_1,8.66670000000
-2,2037,R1,2015,procammonia_1,8.66670000000
-2,2038,R1,2015,procammonia_1,8.66670000000
-2,2039,R1,2015,procammonia_1,8.66670000000
-3,2035,R1,2020,procammonia_1,8.70630000000
-3,2036,R1,2020,procammonia_1,8.70630000000
-3,2037,R1,2020,procammonia_1,8.70630000000
-3,2038,R1,2020,procammonia_1,8.70630000000
-3,2039,R1,2020,procammonia_1,8.70630000000
-3,2040,R1,2020,procammonia_1,8.70630000000
-3,2041,R1,2020,procammonia_1,8.70630000000
-3,2042,R1,2020,procammonia_1,8.70630000000
-3,2043,R1,2020,procammonia_1,8.70630000000
-3,2044,R1,2020,procammonia_1,8.70630000000
-4,2035,R1,2025,procammonia_1,8.70630000000
-4,2036,R1,2025,procammonia_1,8.70630000000
-4,2037,R1,2025,procammonia_1,8.70630000000
-4,2038,R1,2025,procammonia_1,8.70630000000
-4,2039,R1,2025,procammonia_1,8.70630000000
-4,2040,R1,2025,procammonia_1,8.70630000000
-4,2041,R1,2025,procammonia_1,8.70630000000
-4,2042,R1,2025,procammonia_1,8.70630000000
-4,2043,R1,2025,procammonia_1,8.70630000000
-4,2044,R1,2025,procammonia_1,8.70630000000
-4,2045,R1,2025,procammonia_1,8.70630000000
-4,2046,R1,2025,procammonia_1,8.70630000000
-4,2047,R1,2025,procammonia_1,8.70630000000
-4,2048,R1,2025,procammonia_1,8.70630000000
-4,2049,R1,2025,procammonia_1,8.70630000000
-5,2035,R1,2030,procammonia_1,18.79580000000
-5,2036,R1,2030,procammonia_1,18.79580000000
-5,2037,R1,2030,procammonia_1,18.79580000000
-5,2038,R1,2030,procammonia_1,18.79580000000
-5,2039,R1,2030,procammonia_1,18.79580000000
-5,2040,R1,2030,procammonia_1,18.79580000000
-5,2041,R1,2030,procammonia_1,18.79580000000
-5,2042,R1,2030,procammonia_1,18.79580000000
-5,2043,R1,2030,procammonia_1,18.79580000000
-5,2044,R1,2030,procammonia_1,18.79580000000
-5,2045,R1,2030,procammonia_1,18.79580000000
-5,2046,R1,2030,procammonia_1,18.79580000000
-5,2047,R1,2030,procammonia_1,18.79580000000
-5,2048,R1,2030,procammonia_1,18.79580000000
-5,2049,R1,2030,procammonia_1,18.79580000000
-5,2050,R1,2030,procammonia_1,18.79580000000
-5,2054,R1,2030,procammonia_1,18.79580000000
-6,2040,R1,2035,procammonia_1,16.54120000000
-6,2041,R1,2035,procammonia_1,16.54120000000
-6,2042,R1,2035,procammonia_1,16.54120000000
-6,2043,R1,2035,procammonia_1,16.54120000000
-6,2044,R1,2035,procammonia_1,16.54120000000
-6,2045,R1,2035,procammonia_1,16.54120000000
-6,2046,R1,2035,procammonia_1,16.54120000000
-6,2047,R1,2035,procammonia_1,16.54120000000
-6,2048,R1,2035,procammonia_1,16.54120000000
-6,2049,R1,2035,procammonia_1,16.54120000000
-6,2050,R1,2035,procammonia_1,16.54120000000
-6,2054,R1,2035,procammonia_1,16.54120000000
-6,2055,R1,2035,procammonia_1,16.54120000000
-6,2059,R1,2035,procammonia_1,16.54120000000
+asset,year,region,technology,installed,capacity
+0,2035,R1,procammonia_1,2010,4.33330000000
+0,2036,R1,procammonia_1,2010,3.46670000000
+0,2037,R1,procammonia_1,2010,2.60000000000
+0,2038,R1,procammonia_1,2010,1.73330000000
+0,2039,R1,procammonia_1,2010,0.86670000000
+1,2035,R1,procammonia_1,2015,8.66670000000
+1,2036,R1,procammonia_1,2015,8.66670000000
+1,2037,R1,procammonia_1,2015,8.66670000000
+1,2038,R1,procammonia_1,2015,8.66670000000
+1,2039,R1,procammonia_1,2015,8.66670000000
+2,2035,R1,procammonia_1,2020,8.70630000000
+2,2036,R1,procammonia_1,2020,8.70630000000
+2,2037,R1,procammonia_1,2020,8.70630000000
+2,2038,R1,procammonia_1,2020,8.70630000000
+2,2039,R1,procammonia_1,2020,8.70630000000
+2,2040,R1,procammonia_1,2020,8.70630000000
+2,2041,R1,procammonia_1,2020,8.70630000000
+2,2042,R1,procammonia_1,2020,8.70630000000
+2,2043,R1,procammonia_1,2020,8.70630000000
+2,2044,R1,procammonia_1,2020,8.70630000000
+3,2035,R1,procammonia_1,2025,8.70630000000
+3,2036,R1,procammonia_1,2025,8.70630000000
+3,2037,R1,procammonia_1,2025,8.70630000000
+3,2038,R1,procammonia_1,2025,8.70630000000
+3,2039,R1,procammonia_1,2025,8.70630000000
+3,2040,R1,procammonia_1,2025,8.70630000000
+3,2041,R1,procammonia_1,2025,8.70630000000
+3,2042,R1,procammonia_1,2025,8.70630000000
+3,2043,R1,procammonia_1,2025,8.70630000000
+3,2044,R1,procammonia_1,2025,8.70630000000
+3,2045,R1,procammonia_1,2025,8.70630000000
+3,2046,R1,procammonia_1,2025,8.70630000000
+3,2047,R1,procammonia_1,2025,8.70630000000
+3,2048,R1,procammonia_1,2025,8.70630000000
+3,2049,R1,procammonia_1,2025,8.70630000000
+4,2035,R1,procammonia_1,2030,18.79580000000
+4,2036,R1,procammonia_1,2030,18.79580000000
+4,2037,R1,procammonia_1,2030,18.79580000000
+4,2038,R1,procammonia_1,2030,18.79580000000
+4,2039,R1,procammonia_1,2030,18.79580000000
+4,2040,R1,procammonia_1,2030,18.79580000000
+4,2041,R1,procammonia_1,2030,18.79580000000
+4,2042,R1,procammonia_1,2030,18.79580000000
+4,2043,R1,procammonia_1,2030,18.79580000000
+4,2044,R1,procammonia_1,2030,18.79580000000
+4,2045,R1,procammonia_1,2030,18.79580000000
+4,2046,R1,procammonia_1,2030,18.79580000000
+4,2047,R1,procammonia_1,2030,18.79580000000
+4,2048,R1,procammonia_1,2030,18.79580000000
+4,2049,R1,procammonia_1,2030,18.79580000000
+4,2050,R1,procammonia_1,2030,18.79580000000
+4,2054,R1,procammonia_1,2030,18.79580000000
+5,2040,R1,procammonia_1,2035,16.54120000000
+5,2041,R1,procammonia_1,2035,16.54120000000
+5,2042,R1,procammonia_1,2035,16.54120000000
+5,2043,R1,procammonia_1,2035,16.54120000000
+5,2044,R1,procammonia_1,2035,16.54120000000
+5,2045,R1,procammonia_1,2035,16.54120000000
+5,2046,R1,procammonia_1,2035,16.54120000000
+5,2047,R1,procammonia_1,2035,16.54120000000
+5,2048,R1,procammonia_1,2035,16.54120000000
+5,2049,R1,procammonia_1,2035,16.54120000000
+5,2050,R1,procammonia_1,2035,16.54120000000
+5,2054,R1,procammonia_1,2035,16.54120000000
+5,2055,R1,procammonia_1,2035,16.54120000000
+5,2059,R1,procammonia_1,2035,16.54120000000
+6,2035,R1,procammonia_2,2010,4.33330000000
+6,2036,R1,procammonia_2,2010,3.46670000000
+6,2037,R1,procammonia_2,2010,2.60000000000
+6,2038,R1,procammonia_2,2010,1.73330000000
+6,2039,R1,procammonia_2,2010,0.86670000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2040.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2040.csv
index c5fb6176c..75d1da9f7 100644
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2040.csv
+++ b/tests/example_outputs/minimum_service/Industry/Capacity/2040.csv
@@ -1,53 +1,53 @@
-asset,year,region,installed,technology,capacity
-3,2040,R1,2020,procammonia_1,8.70630000000
-3,2041,R1,2020,procammonia_1,8.70630000000
-3,2042,R1,2020,procammonia_1,8.70630000000
-3,2043,R1,2020,procammonia_1,8.70630000000
-3,2044,R1,2020,procammonia_1,8.70630000000
-4,2040,R1,2025,procammonia_1,8.70630000000
-4,2041,R1,2025,procammonia_1,8.70630000000
-4,2042,R1,2025,procammonia_1,8.70630000000
-4,2043,R1,2025,procammonia_1,8.70630000000
-4,2044,R1,2025,procammonia_1,8.70630000000
-4,2045,R1,2025,procammonia_1,8.70630000000
-4,2046,R1,2025,procammonia_1,8.70630000000
-4,2047,R1,2025,procammonia_1,8.70630000000
-4,2048,R1,2025,procammonia_1,8.70630000000
-4,2049,R1,2025,procammonia_1,8.70630000000
-5,2040,R1,2030,procammonia_1,18.79580000000
-5,2041,R1,2030,procammonia_1,18.79580000000
-5,2042,R1,2030,procammonia_1,18.79580000000
-5,2043,R1,2030,procammonia_1,18.79580000000
-5,2044,R1,2030,procammonia_1,18.79580000000
-5,2045,R1,2030,procammonia_1,18.79580000000
-5,2046,R1,2030,procammonia_1,18.79580000000
-5,2047,R1,2030,procammonia_1,18.79580000000
-5,2048,R1,2030,procammonia_1,18.79580000000
-5,2049,R1,2030,procammonia_1,18.79580000000
-5,2050,R1,2030,procammonia_1,18.79580000000
-5,2054,R1,2030,procammonia_1,18.79580000000
-6,2040,R1,2035,procammonia_1,16.54120000000
-6,2041,R1,2035,procammonia_1,16.54120000000
-6,2042,R1,2035,procammonia_1,16.54120000000
-6,2043,R1,2035,procammonia_1,16.54120000000
-6,2044,R1,2035,procammonia_1,16.54120000000
-6,2045,R1,2035,procammonia_1,16.54120000000
-6,2046,R1,2035,procammonia_1,16.54120000000
-6,2047,R1,2035,procammonia_1,16.54120000000
-6,2048,R1,2035,procammonia_1,16.54120000000
-6,2049,R1,2035,procammonia_1,16.54120000000
-6,2050,R1,2035,procammonia_1,16.54120000000
-6,2054,R1,2035,procammonia_1,16.54120000000
-6,2055,R1,2035,procammonia_1,16.54120000000
-6,2059,R1,2035,procammonia_1,16.54120000000
-7,2045,R1,2040,procammonia_1,7.21970000000
-7,2046,R1,2040,procammonia_1,7.21970000000
-7,2047,R1,2040,procammonia_1,7.21970000000
-7,2048,R1,2040,procammonia_1,7.21970000000
-7,2049,R1,2040,procammonia_1,7.21970000000
-7,2050,R1,2040,procammonia_1,7.21970000000
-7,2054,R1,2040,procammonia_1,7.21970000000
-7,2055,R1,2040,procammonia_1,7.21970000000
-7,2059,R1,2040,procammonia_1,7.21970000000
-7,2060,R1,2040,procammonia_1,7.21970000000
-7,2064,R1,2040,procammonia_1,7.21970000000
+asset,year,region,technology,installed,capacity
+2,2040,R1,procammonia_1,2020,8.70630000000
+2,2041,R1,procammonia_1,2020,8.70630000000
+2,2042,R1,procammonia_1,2020,8.70630000000
+2,2043,R1,procammonia_1,2020,8.70630000000
+2,2044,R1,procammonia_1,2020,8.70630000000
+3,2040,R1,procammonia_1,2025,8.70630000000
+3,2041,R1,procammonia_1,2025,8.70630000000
+3,2042,R1,procammonia_1,2025,8.70630000000
+3,2043,R1,procammonia_1,2025,8.70630000000
+3,2044,R1,procammonia_1,2025,8.70630000000
+3,2045,R1,procammonia_1,2025,8.70630000000
+3,2046,R1,procammonia_1,2025,8.70630000000
+3,2047,R1,procammonia_1,2025,8.70630000000
+3,2048,R1,procammonia_1,2025,8.70630000000
+3,2049,R1,procammonia_1,2025,8.70630000000
+4,2040,R1,procammonia_1,2030,18.79580000000
+4,2041,R1,procammonia_1,2030,18.79580000000
+4,2042,R1,procammonia_1,2030,18.79580000000
+4,2043,R1,procammonia_1,2030,18.79580000000
+4,2044,R1,procammonia_1,2030,18.79580000000
+4,2045,R1,procammonia_1,2030,18.79580000000
+4,2046,R1,procammonia_1,2030,18.79580000000
+4,2047,R1,procammonia_1,2030,18.79580000000
+4,2048,R1,procammonia_1,2030,18.79580000000
+4,2049,R1,procammonia_1,2030,18.79580000000
+4,2050,R1,procammonia_1,2030,18.79580000000
+4,2054,R1,procammonia_1,2030,18.79580000000
+5,2040,R1,procammonia_1,2035,16.54120000000
+5,2041,R1,procammonia_1,2035,16.54120000000
+5,2042,R1,procammonia_1,2035,16.54120000000
+5,2043,R1,procammonia_1,2035,16.54120000000
+5,2044,R1,procammonia_1,2035,16.54120000000
+5,2045,R1,procammonia_1,2035,16.54120000000
+5,2046,R1,procammonia_1,2035,16.54120000000
+5,2047,R1,procammonia_1,2035,16.54120000000
+5,2048,R1,procammonia_1,2035,16.54120000000
+5,2049,R1,procammonia_1,2035,16.54120000000
+5,2050,R1,procammonia_1,2035,16.54120000000
+5,2054,R1,procammonia_1,2035,16.54120000000
+5,2055,R1,procammonia_1,2035,16.54120000000
+5,2059,R1,procammonia_1,2035,16.54120000000
+6,2045,R1,procammonia_1,2040,7.21970000000
+6,2046,R1,procammonia_1,2040,7.21970000000
+6,2047,R1,procammonia_1,2040,7.21970000000
+6,2048,R1,procammonia_1,2040,7.21970000000
+6,2049,R1,procammonia_1,2040,7.21970000000
+6,2050,R1,procammonia_1,2040,7.21970000000
+6,2054,R1,procammonia_1,2040,7.21970000000
+6,2055,R1,procammonia_1,2040,7.21970000000
+6,2059,R1,procammonia_1,2040,7.21970000000
+6,2060,R1,procammonia_1,2040,7.21970000000
+6,2064,R1,procammonia_1,2040,7.21970000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2045.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2045.csv
index de5a53ac3..39bf2bb19 100644
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2045.csv
+++ b/tests/example_outputs/minimum_service/Industry/Capacity/2045.csv
@@ -1,41 +1,41 @@
-asset,year,region,installed,technology,capacity
-4,2045,R1,2025,procammonia_1,8.70630000000
-4,2046,R1,2025,procammonia_1,8.70630000000
-4,2047,R1,2025,procammonia_1,8.70630000000
-4,2048,R1,2025,procammonia_1,8.70630000000
-4,2049,R1,2025,procammonia_1,8.70630000000
-5,2045,R1,2030,procammonia_1,18.79580000000
-5,2046,R1,2030,procammonia_1,18.79580000000
-5,2047,R1,2030,procammonia_1,18.79580000000
-5,2048,R1,2030,procammonia_1,18.79580000000
-5,2049,R1,2030,procammonia_1,18.79580000000
-5,2050,R1,2030,procammonia_1,18.79580000000
-5,2054,R1,2030,procammonia_1,18.79580000000
-6,2045,R1,2035,procammonia_1,16.54120000000
-6,2046,R1,2035,procammonia_1,16.54120000000
-6,2047,R1,2035,procammonia_1,16.54120000000
-6,2048,R1,2035,procammonia_1,16.54120000000
-6,2049,R1,2035,procammonia_1,16.54120000000
-6,2050,R1,2035,procammonia_1,16.54120000000
-6,2054,R1,2035,procammonia_1,16.54120000000
-6,2055,R1,2035,procammonia_1,16.54120000000
-6,2059,R1,2035,procammonia_1,16.54120000000
-7,2045,R1,2040,procammonia_1,7.21970000000
-7,2046,R1,2040,procammonia_1,7.21970000000
-7,2047,R1,2040,procammonia_1,7.21970000000
-7,2048,R1,2040,procammonia_1,7.21970000000
-7,2049,R1,2040,procammonia_1,7.21970000000
-7,2050,R1,2040,procammonia_1,7.21970000000
-7,2054,R1,2040,procammonia_1,7.21970000000
-7,2055,R1,2040,procammonia_1,7.21970000000
-7,2059,R1,2040,procammonia_1,7.21970000000
-7,2060,R1,2040,procammonia_1,7.21970000000
-7,2064,R1,2040,procammonia_1,7.21970000000
-8,2050,R1,2045,procammonia_1,7.21970000000
-8,2054,R1,2045,procammonia_1,7.21970000000
-8,2055,R1,2045,procammonia_1,7.21970000000
-8,2059,R1,2045,procammonia_1,7.21970000000
-8,2060,R1,2045,procammonia_1,7.21970000000
-8,2064,R1,2045,procammonia_1,7.21970000000
-8,2065,R1,2045,procammonia_1,7.21970000000
-8,2069,R1,2045,procammonia_1,7.21970000000
+asset,year,region,technology,installed,capacity
+3,2045,R1,procammonia_1,2025,8.70630000000
+3,2046,R1,procammonia_1,2025,8.70630000000
+3,2047,R1,procammonia_1,2025,8.70630000000
+3,2048,R1,procammonia_1,2025,8.70630000000
+3,2049,R1,procammonia_1,2025,8.70630000000
+4,2045,R1,procammonia_1,2030,18.79580000000
+4,2046,R1,procammonia_1,2030,18.79580000000
+4,2047,R1,procammonia_1,2030,18.79580000000
+4,2048,R1,procammonia_1,2030,18.79580000000
+4,2049,R1,procammonia_1,2030,18.79580000000
+4,2050,R1,procammonia_1,2030,18.79580000000
+4,2054,R1,procammonia_1,2030,18.79580000000
+5,2045,R1,procammonia_1,2035,16.54120000000
+5,2046,R1,procammonia_1,2035,16.54120000000
+5,2047,R1,procammonia_1,2035,16.54120000000
+5,2048,R1,procammonia_1,2035,16.54120000000
+5,2049,R1,procammonia_1,2035,16.54120000000
+5,2050,R1,procammonia_1,2035,16.54120000000
+5,2054,R1,procammonia_1,2035,16.54120000000
+5,2055,R1,procammonia_1,2035,16.54120000000
+5,2059,R1,procammonia_1,2035,16.54120000000
+6,2045,R1,procammonia_1,2040,7.21970000000
+6,2046,R1,procammonia_1,2040,7.21970000000
+6,2047,R1,procammonia_1,2040,7.21970000000
+6,2048,R1,procammonia_1,2040,7.21970000000
+6,2049,R1,procammonia_1,2040,7.21970000000
+6,2050,R1,procammonia_1,2040,7.21970000000
+6,2054,R1,procammonia_1,2040,7.21970000000
+6,2055,R1,procammonia_1,2040,7.21970000000
+6,2059,R1,procammonia_1,2040,7.21970000000
+6,2060,R1,procammonia_1,2040,7.21970000000
+6,2064,R1,procammonia_1,2040,7.21970000000
+7,2050,R1,procammonia_1,2045,7.21970000000
+7,2054,R1,procammonia_1,2045,7.21970000000
+7,2055,R1,procammonia_1,2045,7.21970000000
+7,2059,R1,procammonia_1,2045,7.21970000000
+7,2060,R1,procammonia_1,2045,7.21970000000
+7,2064,R1,procammonia_1,2045,7.21970000000
+7,2065,R1,procammonia_1,2045,7.21970000000
+7,2069,R1,procammonia_1,2045,7.21970000000
diff --git a/tests/example_outputs/minimum_service/Industry/Capacity/2050.csv b/tests/example_outputs/minimum_service/Industry/Capacity/2050.csv
index 848fbb696..4944fcf3e 100644
--- a/tests/example_outputs/minimum_service/Industry/Capacity/2050.csv
+++ b/tests/example_outputs/minimum_service/Industry/Capacity/2050.csv
@@ -1,29 +1,29 @@
-asset,year,region,installed,technology,capacity
-5,2050,R1,2030,procammonia_1,18.79580000000
-5,2054,R1,2030,procammonia_1,18.79580000000
-6,2050,R1,2035,procammonia_1,16.54120000000
-6,2054,R1,2035,procammonia_1,16.54120000000
-6,2055,R1,2035,procammonia_1,16.54120000000
-6,2059,R1,2035,procammonia_1,16.54120000000
-7,2050,R1,2040,procammonia_1,7.21970000000
-7,2054,R1,2040,procammonia_1,7.21970000000
-7,2055,R1,2040,procammonia_1,7.21970000000
-7,2059,R1,2040,procammonia_1,7.21970000000
-7,2060,R1,2040,procammonia_1,7.21970000000
-7,2064,R1,2040,procammonia_1,7.21970000000
-8,2050,R1,2045,procammonia_1,7.21970000000
-8,2054,R1,2045,procammonia_1,7.21970000000
-8,2055,R1,2045,procammonia_1,7.21970000000
-8,2059,R1,2045,procammonia_1,7.21970000000
-8,2060,R1,2045,procammonia_1,7.21970000000
-8,2064,R1,2045,procammonia_1,7.21970000000
-8,2065,R1,2045,procammonia_1,7.21970000000
-8,2069,R1,2045,procammonia_1,7.21970000000
-9,2055,R1,2050,procammonia_1,18.79580000000
-9,2059,R1,2050,procammonia_1,18.79580000000
-9,2060,R1,2050,procammonia_1,18.79580000000
-9,2064,R1,2050,procammonia_1,18.79580000000
-9,2065,R1,2050,procammonia_1,18.79580000000
-9,2069,R1,2050,procammonia_1,18.79580000000
-9,2070,R1,2050,procammonia_1,18.79580000000
-9,2074,R1,2050,procammonia_1,18.79580000000
+asset,year,region,technology,installed,capacity
+4,2050,R1,procammonia_1,2030,18.79580000000
+4,2054,R1,procammonia_1,2030,18.79580000000
+5,2050,R1,procammonia_1,2035,16.54120000000
+5,2054,R1,procammonia_1,2035,16.54120000000
+5,2055,R1,procammonia_1,2035,16.54120000000
+5,2059,R1,procammonia_1,2035,16.54120000000
+6,2050,R1,procammonia_1,2040,7.21970000000
+6,2054,R1,procammonia_1,2040,7.21970000000
+6,2055,R1,procammonia_1,2040,7.21970000000
+6,2059,R1,procammonia_1,2040,7.21970000000
+6,2060,R1,procammonia_1,2040,7.21970000000
+6,2064,R1,procammonia_1,2040,7.21970000000
+7,2050,R1,procammonia_1,2045,7.21970000000
+7,2054,R1,procammonia_1,2045,7.21970000000
+7,2055,R1,procammonia_1,2045,7.21970000000
+7,2059,R1,procammonia_1,2045,7.21970000000
+7,2060,R1,procammonia_1,2045,7.21970000000
+7,2064,R1,procammonia_1,2045,7.21970000000
+7,2065,R1,procammonia_1,2045,7.21970000000
+7,2069,R1,procammonia_1,2045,7.21970000000
+8,2055,R1,procammonia_1,2050,18.79580000000
+8,2059,R1,procammonia_1,2050,18.79580000000
+8,2060,R1,procammonia_1,2050,18.79580000000
+8,2064,R1,procammonia_1,2050,18.79580000000
+8,2065,R1,procammonia_1,2050,18.79580000000
+8,2069,R1,procammonia_1,2050,18.79580000000
+8,2070,R1,procammonia_1,2050,18.79580000000
+8,2074,R1,procammonia_1,2050,18.79580000000
diff --git a/tests/example_outputs/minimum_service/Industry/Supply/2010.csv b/tests/example_outputs/minimum_service/Industry/Supply/2010.csv
index 070d9f71a..d0e14abfa 100644
--- a/tests/example_outputs/minimum_service/Industry/Supply/2010.csv
+++ b/tests/example_outputs/minimum_service/Industry/Supply/2010.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,CO2f,2010,0,R1,2010,procammonia_1,winter,all-week,all-day,30397.66160000000
-0,CO2f,2010,1,R1,2010,procammonia_2,winter,all-week,all-day,22694.61780000000
-0,CO2f,2015,0,R1,2010,procammonia_1,winter,all-week,all-day,34271.87340000000
-0,CO2f,2015,1,R1,2010,procammonia_2,winter,all-week,all-day,20841.64410000000
-0,ammonia,2010,0,R1,2010,procammonia_1,winter,all-week,all-day,7.29300000000
-0,ammonia,2010,1,R1,2010,procammonia_2,winter,all-week,all-day,7.29300000000
-0,ammonia,2015,0,R1,2010,procammonia_1,winter,all-week,all-day,8.22250000000
-0,ammonia,2015,1,R1,2010,procammonia_2,winter,all-week,all-day,6.69750000000
-1,CO2f,2010,0,R1,2010,procammonia_1,summer,all-week,all-day,31318.80280000000
-1,CO2f,2010,1,R1,2010,procammonia_2,summer,all-week,all-day,23382.33350000000
-1,CO2f,2015,0,R1,2010,procammonia_1,summer,all-week,all-day,35310.41500000000
-1,CO2f,2015,1,R1,2010,procammonia_2,summer,all-week,all-day,21473.20910000000
-1,ammonia,2010,0,R1,2010,procammonia_1,summer,all-week,all-day,7.51400000000
-1,ammonia,2010,1,R1,2010,procammonia_2,summer,all-week,all-day,7.51400000000
-1,ammonia,2015,0,R1,2010,procammonia_1,summer,all-week,all-day,8.47170000000
-1,ammonia,2015,1,R1,2010,procammonia_2,summer,all-week,all-day,6.90050000000
-2,CO2f,2010,0,R1,2010,procammonia_1,spring-autumn,all-week,all-day,30397.66160000000
-2,CO2f,2010,1,R1,2010,procammonia_2,spring-autumn,all-week,all-day,22694.61780000000
-2,CO2f,2015,0,R1,2010,procammonia_1,spring-autumn,all-week,all-day,34271.87340000000
-2,CO2f,2015,1,R1,2010,procammonia_2,spring-autumn,all-week,all-day,20841.64410000000
-2,ammonia,2010,0,R1,2010,procammonia_1,spring-autumn,all-week,all-day,7.29300000000
-2,ammonia,2010,1,R1,2010,procammonia_2,spring-autumn,all-week,all-day,7.29300000000
-2,ammonia,2015,0,R1,2010,procammonia_1,spring-autumn,all-week,all-day,8.22250000000
-2,ammonia,2015,1,R1,2010,procammonia_2,spring-autumn,all-week,all-day,6.69750000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,CO2f,2010,0,R1,winter,all-week,all-day,procammonia_1,2010,30397.66160000000
+0,CO2f,2010,1,R1,winter,all-week,all-day,procammonia_2,2010,22694.61780000000
+0,CO2f,2015,0,R1,winter,all-week,all-day,procammonia_1,2010,34271.87340000000
+0,CO2f,2015,1,R1,winter,all-week,all-day,procammonia_2,2010,20841.64410000000
+0,ammonia,2010,0,R1,winter,all-week,all-day,procammonia_1,2010,7.29300000000
+0,ammonia,2010,1,R1,winter,all-week,all-day,procammonia_2,2010,7.29300000000
+0,ammonia,2015,0,R1,winter,all-week,all-day,procammonia_1,2010,8.22250000000
+0,ammonia,2015,1,R1,winter,all-week,all-day,procammonia_2,2010,6.69750000000
+1,CO2f,2010,0,R1,summer,all-week,all-day,procammonia_1,2010,31318.80280000000
+1,CO2f,2010,1,R1,summer,all-week,all-day,procammonia_2,2010,23382.33350000000
+1,CO2f,2015,0,R1,summer,all-week,all-day,procammonia_1,2010,35310.41500000000
+1,CO2f,2015,1,R1,summer,all-week,all-day,procammonia_2,2010,21473.20910000000
+1,ammonia,2010,0,R1,summer,all-week,all-day,procammonia_1,2010,7.51400000000
+1,ammonia,2010,1,R1,summer,all-week,all-day,procammonia_2,2010,7.51400000000
+1,ammonia,2015,0,R1,summer,all-week,all-day,procammonia_1,2010,8.47170000000
+1,ammonia,2015,1,R1,summer,all-week,all-day,procammonia_2,2010,6.90050000000
+2,CO2f,2010,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,30397.66160000000
+2,CO2f,2010,1,R1,spring-autumn,all-week,all-day,procammonia_2,2010,22694.61780000000
+2,CO2f,2015,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,34271.87340000000
+2,CO2f,2015,1,R1,spring-autumn,all-week,all-day,procammonia_2,2010,20841.64410000000
+2,ammonia,2010,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,7.29300000000
+2,ammonia,2010,1,R1,spring-autumn,all-week,all-day,procammonia_2,2010,7.29300000000
+2,ammonia,2015,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,8.22250000000
+2,ammonia,2015,1,R1,spring-autumn,all-week,all-day,procammonia_2,2010,6.69750000000
diff --git a/tests/example_outputs/minimum_service/Industry/Supply/2015.csv b/tests/example_outputs/minimum_service/Industry/Supply/2015.csv
index fc5fd2bc6..b7ce66c28 100644
--- a/tests/example_outputs/minimum_service/Industry/Supply/2015.csv
+++ b/tests/example_outputs/minimum_service/Industry/Supply/2015.csv
@@ -1,31 +1,31 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,CO2f,2015,0,R1,2010,procammonia_1,winter,all-week,all-day,34271.87340000000
-0,CO2f,2015,1,R1,2010,procammonia_2,winter,all-week,all-day,20841.64410000000
-0,CO2f,2020,0,R1,2010,procammonia_1,winter,all-week,all-day,29304.93520000000
-0,CO2f,2020,1,R1,2010,procammonia_2,winter,all-week,all-day,17133.37320000000
-0,CO2f,2020,2,R1,2015,procammonia_1,winter,all-week,all-day,9857.22610000000
-0,ammonia,2015,0,R1,2010,procammonia_1,winter,all-week,all-day,8.22250000000
-0,ammonia,2015,1,R1,2010,procammonia_2,winter,all-week,all-day,6.69750000000
-0,ammonia,2020,0,R1,2010,procammonia_1,winter,all-week,all-day,7.03080000000
-0,ammonia,2020,1,R1,2010,procammonia_2,winter,all-week,all-day,5.50590000000
-0,ammonia,2020,2,R1,2015,procammonia_1,winter,all-week,all-day,2.38330000000
-1,CO2f,2015,0,R1,2010,procammonia_1,summer,all-week,all-day,35310.41500000000
-1,CO2f,2015,1,R1,2010,procammonia_2,summer,all-week,all-day,21473.20910000000
-1,CO2f,2020,0,R1,2010,procammonia_1,summer,all-week,all-day,30192.96350000000
-1,CO2f,2020,1,R1,2010,procammonia_2,summer,all-week,all-day,17652.56630000000
-1,CO2f,2020,2,R1,2015,procammonia_1,summer,all-week,all-day,10155.92990000000
-1,ammonia,2015,0,R1,2010,procammonia_1,summer,all-week,all-day,8.47170000000
-1,ammonia,2015,1,R1,2010,procammonia_2,summer,all-week,all-day,6.90050000000
-1,ammonia,2020,0,R1,2010,procammonia_1,summer,all-week,all-day,7.24390000000
-1,ammonia,2020,1,R1,2010,procammonia_2,summer,all-week,all-day,5.67270000000
-1,ammonia,2020,2,R1,2015,procammonia_1,summer,all-week,all-day,2.45560000000
-2,CO2f,2015,0,R1,2010,procammonia_1,spring-autumn,all-week,all-day,34271.87340000000
-2,CO2f,2015,1,R1,2010,procammonia_2,spring-autumn,all-week,all-day,20841.64410000000
-2,CO2f,2020,0,R1,2010,procammonia_1,spring-autumn,all-week,all-day,29304.93520000000
-2,CO2f,2020,1,R1,2010,procammonia_2,spring-autumn,all-week,all-day,17133.37320000000
-2,CO2f,2020,2,R1,2015,procammonia_1,spring-autumn,all-week,all-day,9857.22610000000
-2,ammonia,2015,0,R1,2010,procammonia_1,spring-autumn,all-week,all-day,8.22250000000
-2,ammonia,2015,1,R1,2010,procammonia_2,spring-autumn,all-week,all-day,6.69750000000
-2,ammonia,2020,0,R1,2010,procammonia_1,spring-autumn,all-week,all-day,7.03080000000
-2,ammonia,2020,1,R1,2010,procammonia_2,spring-autumn,all-week,all-day,5.50590000000
-2,ammonia,2020,2,R1,2015,procammonia_1,spring-autumn,all-week,all-day,2.38330000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,CO2f,2015,0,R1,winter,all-week,all-day,procammonia_1,2010,34271.87340000000
+0,CO2f,2015,2,R1,winter,all-week,all-day,procammonia_2,2010,20841.64410000000
+0,CO2f,2020,0,R1,winter,all-week,all-day,procammonia_1,2010,29304.93520000000
+0,CO2f,2020,1,R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
+0,CO2f,2020,2,R1,winter,all-week,all-day,procammonia_2,2010,17133.37320000000
+0,ammonia,2015,0,R1,winter,all-week,all-day,procammonia_1,2010,8.22250000000
+0,ammonia,2015,2,R1,winter,all-week,all-day,procammonia_2,2010,6.69750000000
+0,ammonia,2020,0,R1,winter,all-week,all-day,procammonia_1,2010,7.03080000000
+0,ammonia,2020,1,R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
+0,ammonia,2020,2,R1,winter,all-week,all-day,procammonia_2,2010,5.50590000000
+1,CO2f,2015,0,R1,summer,all-week,all-day,procammonia_1,2010,35310.41500000000
+1,CO2f,2015,2,R1,summer,all-week,all-day,procammonia_2,2010,21473.20910000000
+1,CO2f,2020,0,R1,summer,all-week,all-day,procammonia_1,2010,30192.96350000000
+1,CO2f,2020,1,R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
+1,CO2f,2020,2,R1,summer,all-week,all-day,procammonia_2,2010,17652.56630000000
+1,ammonia,2015,0,R1,summer,all-week,all-day,procammonia_1,2010,8.47170000000
+1,ammonia,2015,2,R1,summer,all-week,all-day,procammonia_2,2010,6.90050000000
+1,ammonia,2020,0,R1,summer,all-week,all-day,procammonia_1,2010,7.24390000000
+1,ammonia,2020,1,R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
+1,ammonia,2020,2,R1,summer,all-week,all-day,procammonia_2,2010,5.67270000000
+2,CO2f,2015,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,34271.87340000000
+2,CO2f,2015,2,R1,spring-autumn,all-week,all-day,procammonia_2,2010,20841.64410000000
+2,CO2f,2020,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,29304.93520000000
+2,CO2f,2020,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
+2,CO2f,2020,2,R1,spring-autumn,all-week,all-day,procammonia_2,2010,17133.37320000000
+2,ammonia,2015,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,8.22250000000
+2,ammonia,2015,2,R1,spring-autumn,all-week,all-day,procammonia_2,2010,6.69750000000
+2,ammonia,2020,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,7.03080000000
+2,ammonia,2020,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
+2,ammonia,2020,2,R1,spring-autumn,all-week,all-day,procammonia_2,2010,5.50590000000
diff --git a/tests/example_outputs/minimum_service/Industry/Supply/2020.csv b/tests/example_outputs/minimum_service/Industry/Supply/2020.csv
index 19f1a1458..bc3092923 100644
--- a/tests/example_outputs/minimum_service/Industry/Supply/2020.csv
+++ b/tests/example_outputs/minimum_service/Industry/Supply/2020.csv
@@ -1,43 +1,43 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,CO2f,2020,0,R1,procammonia_1,2010,winter,all-week,all-day,29304.93520000000
-0,CO2f,2020,1,R1,procammonia_1,2015,winter,all-week,all-day,9857.22610000000
-0,CO2f,2020,3,R1,procammonia_2,2010,winter,all-week,all-day,17133.37320000000
-0,CO2f,2025,0,R1,procammonia_1,2010,winter,all-week,all-day,24337.99700000000
-0,CO2f,2025,1,R1,procammonia_1,2015,winter,all-week,all-day,9857.22610000000
-0,CO2f,2025,2,R1,procammonia_1,2020,winter,all-week,all-day,9825.27560000000
-0,CO2f,2025,3,R1,procammonia_2,2010,winter,all-week,all-day,13425.10230000000
-0,ammonia,2020,0,R1,procammonia_1,2010,winter,all-week,all-day,7.03080000000
-0,ammonia,2020,1,R1,procammonia_1,2015,winter,all-week,all-day,2.38330000000
-0,ammonia,2020,3,R1,procammonia_2,2010,winter,all-week,all-day,5.50590000000
-0,ammonia,2025,0,R1,procammonia_1,2010,winter,all-week,all-day,5.83920000000
-0,ammonia,2025,1,R1,procammonia_1,2015,winter,all-week,all-day,2.38330000000
-0,ammonia,2025,2,R1,procammonia_1,2020,winter,all-week,all-day,2.39420000000
-0,ammonia,2025,3,R1,procammonia_2,2010,winter,all-week,all-day,4.31420000000
-1,CO2f,2020,0,R1,procammonia_1,2010,summer,all-week,all-day,30192.96350000000
-1,CO2f,2020,1,R1,procammonia_1,2015,summer,all-week,all-day,10155.92990000000
-1,CO2f,2020,3,R1,procammonia_2,2010,summer,all-week,all-day,17652.56630000000
-1,CO2f,2025,0,R1,procammonia_1,2010,summer,all-week,all-day,25075.51210000000
-1,CO2f,2025,1,R1,procammonia_1,2015,summer,all-week,all-day,10155.92990000000
-1,CO2f,2025,2,R1,procammonia_1,2020,summer,all-week,all-day,10123.01120000000
-1,CO2f,2025,3,R1,procammonia_2,2010,summer,all-week,all-day,13831.92360000000
-1,ammonia,2020,0,R1,procammonia_1,2010,summer,all-week,all-day,7.24390000000
-1,ammonia,2020,1,R1,procammonia_1,2015,summer,all-week,all-day,2.45560000000
-1,ammonia,2020,3,R1,procammonia_2,2010,summer,all-week,all-day,5.67270000000
-1,ammonia,2025,0,R1,procammonia_1,2010,summer,all-week,all-day,6.01610000000
-1,ammonia,2025,1,R1,procammonia_1,2015,summer,all-week,all-day,2.45560000000
-1,ammonia,2025,2,R1,procammonia_1,2020,summer,all-week,all-day,2.46680000000
-1,ammonia,2025,3,R1,procammonia_2,2010,summer,all-week,all-day,4.44490000000
-2,CO2f,2020,0,R1,procammonia_1,2010,spring-autumn,all-week,all-day,29304.93520000000
-2,CO2f,2020,1,R1,procammonia_1,2015,spring-autumn,all-week,all-day,9857.22610000000
-2,CO2f,2020,3,R1,procammonia_2,2010,spring-autumn,all-week,all-day,17133.37320000000
-2,CO2f,2025,0,R1,procammonia_1,2010,spring-autumn,all-week,all-day,24337.99700000000
-2,CO2f,2025,1,R1,procammonia_1,2015,spring-autumn,all-week,all-day,9857.22610000000
-2,CO2f,2025,2,R1,procammonia_1,2020,spring-autumn,all-week,all-day,9825.27560000000
-2,CO2f,2025,3,R1,procammonia_2,2010,spring-autumn,all-week,all-day,13425.10230000000
-2,ammonia,2020,0,R1,procammonia_1,2010,spring-autumn,all-week,all-day,7.03080000000
-2,ammonia,2020,1,R1,procammonia_1,2015,spring-autumn,all-week,all-day,2.38330000000
-2,ammonia,2020,3,R1,procammonia_2,2010,spring-autumn,all-week,all-day,5.50590000000
-2,ammonia,2025,0,R1,procammonia_1,2010,spring-autumn,all-week,all-day,5.83920000000
-2,ammonia,2025,1,R1,procammonia_1,2015,spring-autumn,all-week,all-day,2.38330000000
-2,ammonia,2025,2,R1,procammonia_1,2020,spring-autumn,all-week,all-day,2.39420000000
-2,ammonia,2025,3,R1,procammonia_2,2010,spring-autumn,all-week,all-day,4.31420000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,CO2f,2020,0,R1,winter,all-week,all-day,procammonia_1,2010,29304.93520000000
+0,CO2f,2020,1,R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
+0,CO2f,2020,3,R1,winter,all-week,all-day,procammonia_2,2010,17133.37320000000
+0,CO2f,2025,0,R1,winter,all-week,all-day,procammonia_1,2010,24337.99700000000
+0,CO2f,2025,1,R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
+0,CO2f,2025,2,R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
+0,CO2f,2025,3,R1,winter,all-week,all-day,procammonia_2,2010,13425.10230000000
+0,ammonia,2020,0,R1,winter,all-week,all-day,procammonia_1,2010,7.03080000000
+0,ammonia,2020,1,R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
+0,ammonia,2020,3,R1,winter,all-week,all-day,procammonia_2,2010,5.50590000000
+0,ammonia,2025,0,R1,winter,all-week,all-day,procammonia_1,2010,5.83920000000
+0,ammonia,2025,1,R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
+0,ammonia,2025,2,R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
+0,ammonia,2025,3,R1,winter,all-week,all-day,procammonia_2,2010,4.31420000000
+1,CO2f,2020,0,R1,summer,all-week,all-day,procammonia_1,2010,30192.96350000000
+1,CO2f,2020,1,R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
+1,CO2f,2020,3,R1,summer,all-week,all-day,procammonia_2,2010,17652.56630000000
+1,CO2f,2025,0,R1,summer,all-week,all-day,procammonia_1,2010,25075.51210000000
+1,CO2f,2025,1,R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
+1,CO2f,2025,2,R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
+1,CO2f,2025,3,R1,summer,all-week,all-day,procammonia_2,2010,13831.92360000000
+1,ammonia,2020,0,R1,summer,all-week,all-day,procammonia_1,2010,7.24390000000
+1,ammonia,2020,1,R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
+1,ammonia,2020,3,R1,summer,all-week,all-day,procammonia_2,2010,5.67270000000
+1,ammonia,2025,0,R1,summer,all-week,all-day,procammonia_1,2010,6.01610000000
+1,ammonia,2025,1,R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
+1,ammonia,2025,2,R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
+1,ammonia,2025,3,R1,summer,all-week,all-day,procammonia_2,2010,4.44490000000
+2,CO2f,2020,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,29304.93520000000
+2,CO2f,2020,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
+2,CO2f,2020,3,R1,spring-autumn,all-week,all-day,procammonia_2,2010,17133.37320000000
+2,CO2f,2025,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,24337.99700000000
+2,CO2f,2025,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
+2,CO2f,2025,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
+2,CO2f,2025,3,R1,spring-autumn,all-week,all-day,procammonia_2,2010,13425.10230000000
+2,ammonia,2020,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,7.03080000000
+2,ammonia,2020,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
+2,ammonia,2020,3,R1,spring-autumn,all-week,all-day,procammonia_2,2010,5.50590000000
+2,ammonia,2025,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,5.83920000000
+2,ammonia,2025,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
+2,ammonia,2025,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
+2,ammonia,2025,3,R1,spring-autumn,all-week,all-day,procammonia_2,2010,4.31420000000
diff --git a/tests/example_outputs/minimum_service/Industry/Supply/2025.csv b/tests/example_outputs/minimum_service/Industry/Supply/2025.csv
index 9df08ee3e..618f98195 100644
--- a/tests/example_outputs/minimum_service/Industry/Supply/2025.csv
+++ b/tests/example_outputs/minimum_service/Industry/Supply/2025.csv
@@ -1,55 +1,55 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,CO2f,2025,0,R1,procammonia_1,2010,winter,all-week,all-day,24337.99700000000
-0,CO2f,2025,1,R1,procammonia_1,2015,winter,all-week,all-day,9857.22610000000
-0,CO2f,2025,2,R1,procammonia_1,2020,winter,all-week,all-day,9825.27560000000
-0,CO2f,2025,4,R1,procammonia_2,2010,winter,all-week,all-day,13425.10230000000
-0,CO2f,2030,0,R1,procammonia_1,2010,winter,all-week,all-day,19371.05890000000
-0,CO2f,2030,1,R1,procammonia_1,2015,winter,all-week,all-day,9857.22610000000
-0,CO2f,2030,2,R1,procammonia_1,2020,winter,all-week,all-day,9825.27560000000
-0,CO2f,2030,3,R1,procammonia_1,2025,winter,all-week,all-day,9748.27500000000
-0,CO2f,2030,4,R1,procammonia_2,2010,winter,all-week,all-day,9716.83140000000
-0,ammonia,2025,0,R1,procammonia_1,2010,winter,all-week,all-day,5.83920000000
-0,ammonia,2025,1,R1,procammonia_1,2015,winter,all-week,all-day,2.38330000000
-0,ammonia,2025,2,R1,procammonia_1,2020,winter,all-week,all-day,2.39420000000
-0,ammonia,2025,4,R1,procammonia_2,2010,winter,all-week,all-day,4.31420000000
-0,ammonia,2030,0,R1,procammonia_1,2010,winter,all-week,all-day,4.64750000000
-0,ammonia,2030,1,R1,procammonia_1,2015,winter,all-week,all-day,2.38330000000
-0,ammonia,2030,2,R1,procammonia_1,2020,winter,all-week,all-day,2.39420000000
-0,ammonia,2030,3,R1,procammonia_1,2025,winter,all-week,all-day,2.39420000000
-0,ammonia,2030,4,R1,procammonia_2,2010,winter,all-week,all-day,3.12250000000
-1,CO2f,2025,0,R1,procammonia_1,2010,summer,all-week,all-day,25075.51210000000
-1,CO2f,2025,1,R1,procammonia_1,2015,summer,all-week,all-day,10155.92990000000
-1,CO2f,2025,2,R1,procammonia_1,2020,summer,all-week,all-day,10123.01120000000
-1,CO2f,2025,4,R1,procammonia_2,2010,summer,all-week,all-day,13831.92360000000
-1,CO2f,2030,0,R1,procammonia_1,2010,summer,all-week,all-day,19958.06060000000
-1,CO2f,2030,1,R1,procammonia_1,2015,summer,all-week,all-day,10155.92990000000
-1,CO2f,2030,2,R1,procammonia_1,2020,summer,all-week,all-day,10123.01120000000
-1,CO2f,2030,3,R1,procammonia_1,2025,summer,all-week,all-day,10043.67720000000
-1,CO2f,2030,4,R1,procammonia_2,2010,summer,all-week,all-day,10011.28090000000
-1,ammonia,2025,0,R1,procammonia_1,2010,summer,all-week,all-day,6.01610000000
-1,ammonia,2025,1,R1,procammonia_1,2015,summer,all-week,all-day,2.45560000000
-1,ammonia,2025,2,R1,procammonia_1,2020,summer,all-week,all-day,2.46680000000
-1,ammonia,2025,4,R1,procammonia_2,2010,summer,all-week,all-day,4.44490000000
-1,ammonia,2030,0,R1,procammonia_1,2010,summer,all-week,all-day,4.78830000000
-1,ammonia,2030,1,R1,procammonia_1,2015,summer,all-week,all-day,2.45560000000
-1,ammonia,2030,2,R1,procammonia_1,2020,summer,all-week,all-day,2.46680000000
-1,ammonia,2030,3,R1,procammonia_1,2025,summer,all-week,all-day,2.46680000000
-1,ammonia,2030,4,R1,procammonia_2,2010,summer,all-week,all-day,3.21720000000
-2,CO2f,2025,0,R1,procammonia_1,2010,spring-autumn,all-week,all-day,24337.99700000000
-2,CO2f,2025,1,R1,procammonia_1,2015,spring-autumn,all-week,all-day,9857.22610000000
-2,CO2f,2025,2,R1,procammonia_1,2020,spring-autumn,all-week,all-day,9825.27560000000
-2,CO2f,2025,4,R1,procammonia_2,2010,spring-autumn,all-week,all-day,13425.10230000000
-2,CO2f,2030,0,R1,procammonia_1,2010,spring-autumn,all-week,all-day,19371.05890000000
-2,CO2f,2030,1,R1,procammonia_1,2015,spring-autumn,all-week,all-day,9857.22610000000
-2,CO2f,2030,2,R1,procammonia_1,2020,spring-autumn,all-week,all-day,9825.27560000000
-2,CO2f,2030,3,R1,procammonia_1,2025,spring-autumn,all-week,all-day,9748.27500000000
-2,CO2f,2030,4,R1,procammonia_2,2010,spring-autumn,all-week,all-day,9716.83140000000
-2,ammonia,2025,0,R1,procammonia_1,2010,spring-autumn,all-week,all-day,5.83920000000
-2,ammonia,2025,1,R1,procammonia_1,2015,spring-autumn,all-week,all-day,2.38330000000
-2,ammonia,2025,2,R1,procammonia_1,2020,spring-autumn,all-week,all-day,2.39420000000
-2,ammonia,2025,4,R1,procammonia_2,2010,spring-autumn,all-week,all-day,4.31420000000
-2,ammonia,2030,0,R1,procammonia_1,2010,spring-autumn,all-week,all-day,4.64750000000
-2,ammonia,2030,1,R1,procammonia_1,2015,spring-autumn,all-week,all-day,2.38330000000
-2,ammonia,2030,2,R1,procammonia_1,2020,spring-autumn,all-week,all-day,2.39420000000
-2,ammonia,2030,3,R1,procammonia_1,2025,spring-autumn,all-week,all-day,2.39420000000
-2,ammonia,2030,4,R1,procammonia_2,2010,spring-autumn,all-week,all-day,3.12250000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,CO2f,2025,0,R1,winter,all-week,all-day,procammonia_1,2010,24337.99700000000
+0,CO2f,2025,1,R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
+0,CO2f,2025,2,R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
+0,CO2f,2025,4,R1,winter,all-week,all-day,procammonia_2,2010,13425.10230000000
+0,CO2f,2030,0,R1,winter,all-week,all-day,procammonia_1,2010,19371.05890000000
+0,CO2f,2030,1,R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
+0,CO2f,2030,2,R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
+0,CO2f,2030,3,R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
+0,CO2f,2030,4,R1,winter,all-week,all-day,procammonia_2,2010,9716.83140000000
+0,ammonia,2025,0,R1,winter,all-week,all-day,procammonia_1,2010,5.83920000000
+0,ammonia,2025,1,R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
+0,ammonia,2025,2,R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
+0,ammonia,2025,4,R1,winter,all-week,all-day,procammonia_2,2010,4.31420000000
+0,ammonia,2030,0,R1,winter,all-week,all-day,procammonia_1,2010,4.64750000000
+0,ammonia,2030,1,R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
+0,ammonia,2030,2,R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
+0,ammonia,2030,3,R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
+0,ammonia,2030,4,R1,winter,all-week,all-day,procammonia_2,2010,3.12250000000
+1,CO2f,2025,0,R1,summer,all-week,all-day,procammonia_1,2010,25075.51210000000
+1,CO2f,2025,1,R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
+1,CO2f,2025,2,R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
+1,CO2f,2025,4,R1,summer,all-week,all-day,procammonia_2,2010,13831.92360000000
+1,CO2f,2030,0,R1,summer,all-week,all-day,procammonia_1,2010,19958.06060000000
+1,CO2f,2030,1,R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
+1,CO2f,2030,2,R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
+1,CO2f,2030,3,R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
+1,CO2f,2030,4,R1,summer,all-week,all-day,procammonia_2,2010,10011.28090000000
+1,ammonia,2025,0,R1,summer,all-week,all-day,procammonia_1,2010,6.01610000000
+1,ammonia,2025,1,R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
+1,ammonia,2025,2,R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
+1,ammonia,2025,4,R1,summer,all-week,all-day,procammonia_2,2010,4.44490000000
+1,ammonia,2030,0,R1,summer,all-week,all-day,procammonia_1,2010,4.78830000000
+1,ammonia,2030,1,R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
+1,ammonia,2030,2,R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
+1,ammonia,2030,3,R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
+1,ammonia,2030,4,R1,summer,all-week,all-day,procammonia_2,2010,3.21720000000
+2,CO2f,2025,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,24337.99700000000
+2,CO2f,2025,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
+2,CO2f,2025,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
+2,CO2f,2025,4,R1,spring-autumn,all-week,all-day,procammonia_2,2010,13425.10230000000
+2,CO2f,2030,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,19371.05890000000
+2,CO2f,2030,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
+2,CO2f,2030,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
+2,CO2f,2030,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
+2,CO2f,2030,4,R1,spring-autumn,all-week,all-day,procammonia_2,2010,9716.83140000000
+2,ammonia,2025,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,5.83920000000
+2,ammonia,2025,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
+2,ammonia,2025,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
+2,ammonia,2025,4,R1,spring-autumn,all-week,all-day,procammonia_2,2010,4.31420000000
+2,ammonia,2030,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,4.64750000000
+2,ammonia,2030,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
+2,ammonia,2030,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
+2,ammonia,2030,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
+2,ammonia,2030,4,R1,spring-autumn,all-week,all-day,procammonia_2,2010,3.12250000000
diff --git a/tests/example_outputs/minimum_service/Industry/Supply/2030.csv b/tests/example_outputs/minimum_service/Industry/Supply/2030.csv
index b405de932..971a1bc6c 100644
--- a/tests/example_outputs/minimum_service/Industry/Supply/2030.csv
+++ b/tests/example_outputs/minimum_service/Industry/Supply/2030.csv
@@ -1,67 +1,67 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,CO2f,2030,0,R1,2010,procammonia_1,winter,all-week,all-day,19371.05890000000
-0,CO2f,2030,1,R1,2010,procammonia_2,winter,all-week,all-day,9716.83140000000
-0,CO2f,2030,2,R1,2015,procammonia_1,winter,all-week,all-day,9857.22610000000
-0,CO2f,2030,3,R1,2020,procammonia_1,winter,all-week,all-day,9825.27560000000
-0,CO2f,2030,4,R1,2025,procammonia_1,winter,all-week,all-day,9748.27500000000
-0,CO2f,2035,0,R1,2010,procammonia_1,winter,all-week,all-day,4966.93820000000
-0,CO2f,2035,1,R1,2010,procammonia_2,winter,all-week,all-day,3708.27090000000
-0,CO2f,2035,2,R1,2015,procammonia_1,winter,all-week,all-day,9857.22610000000
-0,CO2f,2035,3,R1,2020,procammonia_1,winter,all-week,all-day,9825.27560000000
-0,CO2f,2035,4,R1,2025,procammonia_1,winter,all-week,all-day,9748.27500000000
-0,CO2f,2035,5,R1,2030,procammonia_1,winter,all-week,all-day,20879.16640000000
-0,ammonia,2030,0,R1,2010,procammonia_1,winter,all-week,all-day,4.64750000000
-0,ammonia,2030,1,R1,2010,procammonia_2,winter,all-week,all-day,3.12250000000
-0,ammonia,2030,2,R1,2015,procammonia_1,winter,all-week,all-day,2.38330000000
-0,ammonia,2030,3,R1,2020,procammonia_1,winter,all-week,all-day,2.39420000000
-0,ammonia,2030,4,R1,2025,procammonia_1,winter,all-week,all-day,2.39420000000
-0,ammonia,2035,0,R1,2010,procammonia_1,winter,all-week,all-day,1.19170000000
-0,ammonia,2035,1,R1,2010,procammonia_2,winter,all-week,all-day,1.19170000000
-0,ammonia,2035,2,R1,2015,procammonia_1,winter,all-week,all-day,2.38330000000
-0,ammonia,2035,3,R1,2020,procammonia_1,winter,all-week,all-day,2.39420000000
-0,ammonia,2035,4,R1,2025,procammonia_1,winter,all-week,all-day,2.39420000000
-0,ammonia,2035,5,R1,2030,procammonia_1,winter,all-week,all-day,5.16890000000
-1,CO2f,2030,0,R1,2010,procammonia_1,summer,all-week,all-day,19958.06060000000
-1,CO2f,2030,1,R1,2010,procammonia_2,summer,all-week,all-day,10011.28090000000
-1,CO2f,2030,2,R1,2015,procammonia_1,summer,all-week,all-day,10155.92990000000
-1,CO2f,2030,3,R1,2020,procammonia_1,summer,all-week,all-day,10123.01120000000
-1,CO2f,2030,4,R1,2025,procammonia_1,summer,all-week,all-day,10043.67720000000
-1,CO2f,2035,0,R1,2010,procammonia_1,summer,all-week,all-day,5117.45140000000
-1,CO2f,2035,1,R1,2010,procammonia_2,summer,all-week,all-day,3820.64270000000
-1,CO2f,2035,2,R1,2015,procammonia_1,summer,all-week,all-day,10155.92990000000
-1,CO2f,2035,3,R1,2020,procammonia_1,summer,all-week,all-day,10123.01120000000
-1,CO2f,2035,4,R1,2025,procammonia_1,summer,all-week,all-day,10043.67720000000
-1,CO2f,2035,5,R1,2030,procammonia_1,summer,all-week,all-day,21511.86840000000
-1,ammonia,2030,0,R1,2010,procammonia_1,summer,all-week,all-day,4.78830000000
-1,ammonia,2030,1,R1,2010,procammonia_2,summer,all-week,all-day,3.21720000000
-1,ammonia,2030,2,R1,2015,procammonia_1,summer,all-week,all-day,2.45560000000
-1,ammonia,2030,3,R1,2020,procammonia_1,summer,all-week,all-day,2.46680000000
-1,ammonia,2030,4,R1,2025,procammonia_1,summer,all-week,all-day,2.46680000000
-1,ammonia,2035,0,R1,2010,procammonia_1,summer,all-week,all-day,1.22780000000
-1,ammonia,2035,1,R1,2010,procammonia_2,summer,all-week,all-day,1.22780000000
-1,ammonia,2035,2,R1,2015,procammonia_1,summer,all-week,all-day,2.45560000000
-1,ammonia,2035,3,R1,2020,procammonia_1,summer,all-week,all-day,2.46680000000
-1,ammonia,2035,4,R1,2025,procammonia_1,summer,all-week,all-day,2.46680000000
-1,ammonia,2035,5,R1,2030,procammonia_1,summer,all-week,all-day,5.32550000000
-2,CO2f,2030,0,R1,2010,procammonia_1,spring-autumn,all-week,all-day,19371.05890000000
-2,CO2f,2030,1,R1,2010,procammonia_2,spring-autumn,all-week,all-day,9716.83140000000
-2,CO2f,2030,2,R1,2015,procammonia_1,spring-autumn,all-week,all-day,9857.22610000000
-2,CO2f,2030,3,R1,2020,procammonia_1,spring-autumn,all-week,all-day,9825.27560000000
-2,CO2f,2030,4,R1,2025,procammonia_1,spring-autumn,all-week,all-day,9748.27500000000
-2,CO2f,2035,0,R1,2010,procammonia_1,spring-autumn,all-week,all-day,4966.93820000000
-2,CO2f,2035,1,R1,2010,procammonia_2,spring-autumn,all-week,all-day,3708.27090000000
-2,CO2f,2035,2,R1,2015,procammonia_1,spring-autumn,all-week,all-day,9857.22610000000
-2,CO2f,2035,3,R1,2020,procammonia_1,spring-autumn,all-week,all-day,9825.27560000000
-2,CO2f,2035,4,R1,2025,procammonia_1,spring-autumn,all-week,all-day,9748.27500000000
-2,CO2f,2035,5,R1,2030,procammonia_1,spring-autumn,all-week,all-day,20879.16640000000
-2,ammonia,2030,0,R1,2010,procammonia_1,spring-autumn,all-week,all-day,4.64750000000
-2,ammonia,2030,1,R1,2010,procammonia_2,spring-autumn,all-week,all-day,3.12250000000
-2,ammonia,2030,2,R1,2015,procammonia_1,spring-autumn,all-week,all-day,2.38330000000
-2,ammonia,2030,3,R1,2020,procammonia_1,spring-autumn,all-week,all-day,2.39420000000
-2,ammonia,2030,4,R1,2025,procammonia_1,spring-autumn,all-week,all-day,2.39420000000
-2,ammonia,2035,0,R1,2010,procammonia_1,spring-autumn,all-week,all-day,1.19170000000
-2,ammonia,2035,1,R1,2010,procammonia_2,spring-autumn,all-week,all-day,1.19170000000
-2,ammonia,2035,2,R1,2015,procammonia_1,spring-autumn,all-week,all-day,2.38330000000
-2,ammonia,2035,3,R1,2020,procammonia_1,spring-autumn,all-week,all-day,2.39420000000
-2,ammonia,2035,4,R1,2025,procammonia_1,spring-autumn,all-week,all-day,2.39420000000
-2,ammonia,2035,5,R1,2030,procammonia_1,spring-autumn,all-week,all-day,5.16890000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,CO2f,2030,0,R1,winter,all-week,all-day,procammonia_1,2010,19371.05890000000
+0,CO2f,2030,1,R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
+0,CO2f,2030,2,R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
+0,CO2f,2030,3,R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
+0,CO2f,2030,5,R1,winter,all-week,all-day,procammonia_2,2010,9716.83140000000
+0,CO2f,2035,0,R1,winter,all-week,all-day,procammonia_1,2010,4966.93820000000
+0,CO2f,2035,1,R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
+0,CO2f,2035,2,R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
+0,CO2f,2035,3,R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
+0,CO2f,2035,4,R1,winter,all-week,all-day,procammonia_1,2030,20879.16640000000
+0,CO2f,2035,5,R1,winter,all-week,all-day,procammonia_2,2010,3708.27090000000
+0,ammonia,2030,0,R1,winter,all-week,all-day,procammonia_1,2010,4.64750000000
+0,ammonia,2030,1,R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
+0,ammonia,2030,2,R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
+0,ammonia,2030,3,R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
+0,ammonia,2030,5,R1,winter,all-week,all-day,procammonia_2,2010,3.12250000000
+0,ammonia,2035,0,R1,winter,all-week,all-day,procammonia_1,2010,1.19170000000
+0,ammonia,2035,1,R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
+0,ammonia,2035,2,R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
+0,ammonia,2035,3,R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
+0,ammonia,2035,4,R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
+0,ammonia,2035,5,R1,winter,all-week,all-day,procammonia_2,2010,1.19170000000
+1,CO2f,2030,0,R1,summer,all-week,all-day,procammonia_1,2010,19958.06060000000
+1,CO2f,2030,1,R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
+1,CO2f,2030,2,R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
+1,CO2f,2030,3,R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
+1,CO2f,2030,5,R1,summer,all-week,all-day,procammonia_2,2010,10011.28090000000
+1,CO2f,2035,0,R1,summer,all-week,all-day,procammonia_1,2010,5117.45140000000
+1,CO2f,2035,1,R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
+1,CO2f,2035,2,R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
+1,CO2f,2035,3,R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
+1,CO2f,2035,4,R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
+1,CO2f,2035,5,R1,summer,all-week,all-day,procammonia_2,2010,3820.64270000000
+1,ammonia,2030,0,R1,summer,all-week,all-day,procammonia_1,2010,4.78830000000
+1,ammonia,2030,1,R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
+1,ammonia,2030,2,R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
+1,ammonia,2030,3,R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
+1,ammonia,2030,5,R1,summer,all-week,all-day,procammonia_2,2010,3.21720000000
+1,ammonia,2035,0,R1,summer,all-week,all-day,procammonia_1,2010,1.22780000000
+1,ammonia,2035,1,R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
+1,ammonia,2035,2,R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
+1,ammonia,2035,3,R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
+1,ammonia,2035,4,R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
+1,ammonia,2035,5,R1,summer,all-week,all-day,procammonia_2,2010,1.22780000000
+2,CO2f,2030,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,19371.05890000000
+2,CO2f,2030,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
+2,CO2f,2030,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
+2,CO2f,2030,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
+2,CO2f,2030,5,R1,spring-autumn,all-week,all-day,procammonia_2,2010,9716.83140000000
+2,CO2f,2035,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,4966.93820000000
+2,CO2f,2035,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
+2,CO2f,2035,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
+2,CO2f,2035,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
+2,CO2f,2035,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16640000000
+2,CO2f,2035,5,R1,spring-autumn,all-week,all-day,procammonia_2,2010,3708.27090000000
+2,ammonia,2030,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,4.64750000000
+2,ammonia,2030,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
+2,ammonia,2030,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
+2,ammonia,2030,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
+2,ammonia,2030,5,R1,spring-autumn,all-week,all-day,procammonia_2,2010,3.12250000000
+2,ammonia,2035,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,1.19170000000
+2,ammonia,2035,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
+2,ammonia,2035,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
+2,ammonia,2035,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
+2,ammonia,2035,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
+2,ammonia,2035,5,R1,spring-autumn,all-week,all-day,procammonia_2,2010,1.19170000000
diff --git a/tests/example_outputs/minimum_service/Industry/Supply/2035.csv b/tests/example_outputs/minimum_service/Industry/Supply/2035.csv
index 82b3aa482..68b96dd67 100644
--- a/tests/example_outputs/minimum_service/Industry/Supply/2035.csv
+++ b/tests/example_outputs/minimum_service/Industry/Supply/2035.csv
@@ -1,61 +1,61 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,CO2f,2035,0,R1,2010,procammonia_1,winter,all-week,all-day,4966.93820000000
-0,CO2f,2035,1,R1,2010,procammonia_2,winter,all-week,all-day,3708.27090000000
-0,CO2f,2035,2,R1,2015,procammonia_1,winter,all-week,all-day,9857.22610000000
-0,CO2f,2035,3,R1,2020,procammonia_1,winter,all-week,all-day,9825.27560000000
-0,CO2f,2035,4,R1,2025,procammonia_1,winter,all-week,all-day,9748.27500000000
-0,CO2f,2035,5,R1,2030,procammonia_1,winter,all-week,all-day,20879.16640000000
-0,CO2f,2040,3,R1,2020,procammonia_1,winter,all-week,all-day,9825.27560000000
-0,CO2f,2040,4,R1,2025,procammonia_1,winter,all-week,all-day,9748.27500000000
-0,CO2f,2040,5,R1,2030,procammonia_1,winter,all-week,all-day,20879.16630000000
-0,CO2f,2040,6,R1,2035,procammonia_1,winter,all-week,all-day,18228.27250000000
-0,ammonia,2035,0,R1,2010,procammonia_1,winter,all-week,all-day,1.19170000000
-0,ammonia,2035,1,R1,2010,procammonia_2,winter,all-week,all-day,1.19170000000
-0,ammonia,2035,2,R1,2015,procammonia_1,winter,all-week,all-day,2.38330000000
-0,ammonia,2035,3,R1,2020,procammonia_1,winter,all-week,all-day,2.39420000000
-0,ammonia,2035,4,R1,2025,procammonia_1,winter,all-week,all-day,2.39420000000
-0,ammonia,2035,5,R1,2030,procammonia_1,winter,all-week,all-day,5.16890000000
-0,ammonia,2040,3,R1,2020,procammonia_1,winter,all-week,all-day,2.39420000000
-0,ammonia,2040,4,R1,2025,procammonia_1,winter,all-week,all-day,2.39420000000
-0,ammonia,2040,5,R1,2030,procammonia_1,winter,all-week,all-day,5.16890000000
-0,ammonia,2040,6,R1,2035,procammonia_1,winter,all-week,all-day,4.54880000000
-1,CO2f,2035,0,R1,2010,procammonia_1,summer,all-week,all-day,5117.45140000000
-1,CO2f,2035,1,R1,2010,procammonia_2,summer,all-week,all-day,3820.64270000000
-1,CO2f,2035,2,R1,2015,procammonia_1,summer,all-week,all-day,10155.92990000000
-1,CO2f,2035,3,R1,2020,procammonia_1,summer,all-week,all-day,10123.01120000000
-1,CO2f,2035,4,R1,2025,procammonia_1,summer,all-week,all-day,10043.67720000000
-1,CO2f,2035,5,R1,2030,procammonia_1,summer,all-week,all-day,21511.86840000000
-1,CO2f,2040,3,R1,2020,procammonia_1,summer,all-week,all-day,10123.01120000000
-1,CO2f,2040,4,R1,2025,procammonia_1,summer,all-week,all-day,10043.67720000000
-1,CO2f,2040,5,R1,2030,procammonia_1,summer,all-week,all-day,21511.86840000000
-1,CO2f,2040,6,R1,2035,procammonia_1,summer,all-week,all-day,18780.64440000000
-1,ammonia,2035,0,R1,2010,procammonia_1,summer,all-week,all-day,1.22780000000
-1,ammonia,2035,1,R1,2010,procammonia_2,summer,all-week,all-day,1.22780000000
-1,ammonia,2035,2,R1,2015,procammonia_1,summer,all-week,all-day,2.45560000000
-1,ammonia,2035,3,R1,2020,procammonia_1,summer,all-week,all-day,2.46680000000
-1,ammonia,2035,4,R1,2025,procammonia_1,summer,all-week,all-day,2.46680000000
-1,ammonia,2035,5,R1,2030,procammonia_1,summer,all-week,all-day,5.32550000000
-1,ammonia,2040,3,R1,2020,procammonia_1,summer,all-week,all-day,2.46680000000
-1,ammonia,2040,4,R1,2025,procammonia_1,summer,all-week,all-day,2.46680000000
-1,ammonia,2040,5,R1,2030,procammonia_1,summer,all-week,all-day,5.32550000000
-1,ammonia,2040,6,R1,2035,procammonia_1,summer,all-week,all-day,4.68670000000
-2,CO2f,2035,0,R1,2010,procammonia_1,spring-autumn,all-week,all-day,4966.93820000000
-2,CO2f,2035,1,R1,2010,procammonia_2,spring-autumn,all-week,all-day,3708.27090000000
-2,CO2f,2035,2,R1,2015,procammonia_1,spring-autumn,all-week,all-day,9857.22610000000
-2,CO2f,2035,3,R1,2020,procammonia_1,spring-autumn,all-week,all-day,9825.27560000000
-2,CO2f,2035,4,R1,2025,procammonia_1,spring-autumn,all-week,all-day,9748.27500000000
-2,CO2f,2035,5,R1,2030,procammonia_1,spring-autumn,all-week,all-day,20879.16640000000
-2,CO2f,2040,3,R1,2020,procammonia_1,spring-autumn,all-week,all-day,9825.27560000000
-2,CO2f,2040,4,R1,2025,procammonia_1,spring-autumn,all-week,all-day,9748.27500000000
-2,CO2f,2040,5,R1,2030,procammonia_1,spring-autumn,all-week,all-day,20879.16630000000
-2,CO2f,2040,6,R1,2035,procammonia_1,spring-autumn,all-week,all-day,18228.27250000000
-2,ammonia,2035,0,R1,2010,procammonia_1,spring-autumn,all-week,all-day,1.19170000000
-2,ammonia,2035,1,R1,2010,procammonia_2,spring-autumn,all-week,all-day,1.19170000000
-2,ammonia,2035,2,R1,2015,procammonia_1,spring-autumn,all-week,all-day,2.38330000000
-2,ammonia,2035,3,R1,2020,procammonia_1,spring-autumn,all-week,all-day,2.39420000000
-2,ammonia,2035,4,R1,2025,procammonia_1,spring-autumn,all-week,all-day,2.39420000000
-2,ammonia,2035,5,R1,2030,procammonia_1,spring-autumn,all-week,all-day,5.16890000000
-2,ammonia,2040,3,R1,2020,procammonia_1,spring-autumn,all-week,all-day,2.39420000000
-2,ammonia,2040,4,R1,2025,procammonia_1,spring-autumn,all-week,all-day,2.39420000000
-2,ammonia,2040,5,R1,2030,procammonia_1,spring-autumn,all-week,all-day,5.16890000000
-2,ammonia,2040,6,R1,2035,procammonia_1,spring-autumn,all-week,all-day,4.54880000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,CO2f,2035,0,R1,winter,all-week,all-day,procammonia_1,2010,4966.93820000000
+0,CO2f,2035,1,R1,winter,all-week,all-day,procammonia_1,2015,9857.22610000000
+0,CO2f,2035,2,R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
+0,CO2f,2035,3,R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
+0,CO2f,2035,4,R1,winter,all-week,all-day,procammonia_1,2030,20879.16640000000
+0,CO2f,2035,6,R1,winter,all-week,all-day,procammonia_2,2010,3708.27090000000
+0,CO2f,2040,2,R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
+0,CO2f,2040,3,R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
+0,CO2f,2040,4,R1,winter,all-week,all-day,procammonia_1,2030,20879.16630000000
+0,CO2f,2040,5,R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
+0,ammonia,2035,0,R1,winter,all-week,all-day,procammonia_1,2010,1.19170000000
+0,ammonia,2035,1,R1,winter,all-week,all-day,procammonia_1,2015,2.38330000000
+0,ammonia,2035,2,R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
+0,ammonia,2035,3,R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
+0,ammonia,2035,4,R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
+0,ammonia,2035,6,R1,winter,all-week,all-day,procammonia_2,2010,1.19170000000
+0,ammonia,2040,2,R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
+0,ammonia,2040,3,R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
+0,ammonia,2040,4,R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
+0,ammonia,2040,5,R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
+1,CO2f,2035,0,R1,summer,all-week,all-day,procammonia_1,2010,5117.45140000000
+1,CO2f,2035,1,R1,summer,all-week,all-day,procammonia_1,2015,10155.92990000000
+1,CO2f,2035,2,R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
+1,CO2f,2035,3,R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
+1,CO2f,2035,4,R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
+1,CO2f,2035,6,R1,summer,all-week,all-day,procammonia_2,2010,3820.64270000000
+1,CO2f,2040,2,R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
+1,CO2f,2040,3,R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
+1,CO2f,2040,4,R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
+1,CO2f,2040,5,R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
+1,ammonia,2035,0,R1,summer,all-week,all-day,procammonia_1,2010,1.22780000000
+1,ammonia,2035,1,R1,summer,all-week,all-day,procammonia_1,2015,2.45560000000
+1,ammonia,2035,2,R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
+1,ammonia,2035,3,R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
+1,ammonia,2035,4,R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
+1,ammonia,2035,6,R1,summer,all-week,all-day,procammonia_2,2010,1.22780000000
+1,ammonia,2040,2,R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
+1,ammonia,2040,3,R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
+1,ammonia,2040,4,R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
+1,ammonia,2040,5,R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
+2,CO2f,2035,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,4966.93820000000
+2,CO2f,2035,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,9857.22610000000
+2,CO2f,2035,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
+2,CO2f,2035,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
+2,CO2f,2035,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16640000000
+2,CO2f,2035,6,R1,spring-autumn,all-week,all-day,procammonia_2,2010,3708.27090000000
+2,CO2f,2040,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
+2,CO2f,2040,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
+2,CO2f,2040,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16630000000
+2,CO2f,2040,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
+2,ammonia,2035,0,R1,spring-autumn,all-week,all-day,procammonia_1,2010,1.19170000000
+2,ammonia,2035,1,R1,spring-autumn,all-week,all-day,procammonia_1,2015,2.38330000000
+2,ammonia,2035,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
+2,ammonia,2035,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
+2,ammonia,2035,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
+2,ammonia,2035,6,R1,spring-autumn,all-week,all-day,procammonia_2,2010,1.19170000000
+2,ammonia,2040,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
+2,ammonia,2040,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
+2,ammonia,2040,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
+2,ammonia,2040,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
diff --git a/tests/example_outputs/minimum_service/Industry/Supply/2040.csv b/tests/example_outputs/minimum_service/Industry/Supply/2040.csv
index 0d4ad5eaf..21e8b0e5e 100644
--- a/tests/example_outputs/minimum_service/Industry/Supply/2040.csv
+++ b/tests/example_outputs/minimum_service/Industry/Supply/2040.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,CO2f,2040,3,R1,2020,procammonia_1,winter,all-week,all-day,9825.27560000000
-0,CO2f,2040,4,R1,2025,procammonia_1,winter,all-week,all-day,9748.27500000000
-0,CO2f,2040,5,R1,2030,procammonia_1,winter,all-week,all-day,20879.16630000000
-0,CO2f,2040,6,R1,2035,procammonia_1,winter,all-week,all-day,18228.27250000000
-0,CO2f,2045,4,R1,2025,procammonia_1,winter,all-week,all-day,9748.27500000000
-0,CO2f,2045,5,R1,2030,procammonia_1,winter,all-week,all-day,20879.16630000000
-0,CO2f,2045,6,R1,2035,procammonia_1,winter,all-week,all-day,18228.27250000000
-0,CO2f,2045,7,R1,2040,procammonia_1,winter,all-week,all-day,7892.26240000000
-0,ammonia,2040,3,R1,2020,procammonia_1,winter,all-week,all-day,2.39420000000
-0,ammonia,2040,4,R1,2025,procammonia_1,winter,all-week,all-day,2.39420000000
-0,ammonia,2040,5,R1,2030,procammonia_1,winter,all-week,all-day,5.16890000000
-0,ammonia,2040,6,R1,2035,procammonia_1,winter,all-week,all-day,4.54880000000
-0,ammonia,2045,4,R1,2025,procammonia_1,winter,all-week,all-day,2.39420000000
-0,ammonia,2045,5,R1,2030,procammonia_1,winter,all-week,all-day,5.16890000000
-0,ammonia,2045,6,R1,2035,procammonia_1,winter,all-week,all-day,4.54880000000
-0,ammonia,2045,7,R1,2040,procammonia_1,winter,all-week,all-day,1.98540000000
-1,CO2f,2040,3,R1,2020,procammonia_1,summer,all-week,all-day,10123.01120000000
-1,CO2f,2040,4,R1,2025,procammonia_1,summer,all-week,all-day,10043.67720000000
-1,CO2f,2040,5,R1,2030,procammonia_1,summer,all-week,all-day,21511.86840000000
-1,CO2f,2040,6,R1,2035,procammonia_1,summer,all-week,all-day,18780.64440000000
-1,CO2f,2045,4,R1,2025,procammonia_1,summer,all-week,all-day,10043.67720000000
-1,CO2f,2045,5,R1,2030,procammonia_1,summer,all-week,all-day,21511.86840000000
-1,CO2f,2045,6,R1,2035,procammonia_1,summer,all-week,all-day,18780.64440000000
-1,CO2f,2045,7,R1,2040,procammonia_1,summer,all-week,all-day,8131.42190000000
-1,ammonia,2040,3,R1,2020,procammonia_1,summer,all-week,all-day,2.46680000000
-1,ammonia,2040,4,R1,2025,procammonia_1,summer,all-week,all-day,2.46680000000
-1,ammonia,2040,5,R1,2030,procammonia_1,summer,all-week,all-day,5.32550000000
-1,ammonia,2040,6,R1,2035,procammonia_1,summer,all-week,all-day,4.68670000000
-1,ammonia,2045,4,R1,2025,procammonia_1,summer,all-week,all-day,2.46680000000
-1,ammonia,2045,5,R1,2030,procammonia_1,summer,all-week,all-day,5.32550000000
-1,ammonia,2045,6,R1,2035,procammonia_1,summer,all-week,all-day,4.68670000000
-1,ammonia,2045,7,R1,2040,procammonia_1,summer,all-week,all-day,2.04560000000
-2,CO2f,2040,3,R1,2020,procammonia_1,spring-autumn,all-week,all-day,9825.27560000000
-2,CO2f,2040,4,R1,2025,procammonia_1,spring-autumn,all-week,all-day,9748.27500000000
-2,CO2f,2040,5,R1,2030,procammonia_1,spring-autumn,all-week,all-day,20879.16630000000
-2,CO2f,2040,6,R1,2035,procammonia_1,spring-autumn,all-week,all-day,18228.27250000000
-2,CO2f,2045,4,R1,2025,procammonia_1,spring-autumn,all-week,all-day,9748.27500000000
-2,CO2f,2045,5,R1,2030,procammonia_1,spring-autumn,all-week,all-day,20879.16630000000
-2,CO2f,2045,6,R1,2035,procammonia_1,spring-autumn,all-week,all-day,18228.27250000000
-2,CO2f,2045,7,R1,2040,procammonia_1,spring-autumn,all-week,all-day,7892.26240000000
-2,ammonia,2040,3,R1,2020,procammonia_1,spring-autumn,all-week,all-day,2.39420000000
-2,ammonia,2040,4,R1,2025,procammonia_1,spring-autumn,all-week,all-day,2.39420000000
-2,ammonia,2040,5,R1,2030,procammonia_1,spring-autumn,all-week,all-day,5.16890000000
-2,ammonia,2040,6,R1,2035,procammonia_1,spring-autumn,all-week,all-day,4.54880000000
-2,ammonia,2045,4,R1,2025,procammonia_1,spring-autumn,all-week,all-day,2.39420000000
-2,ammonia,2045,5,R1,2030,procammonia_1,spring-autumn,all-week,all-day,5.16890000000
-2,ammonia,2045,6,R1,2035,procammonia_1,spring-autumn,all-week,all-day,4.54880000000
-2,ammonia,2045,7,R1,2040,procammonia_1,spring-autumn,all-week,all-day,1.98540000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,CO2f,2040,2,R1,winter,all-week,all-day,procammonia_1,2020,9825.27560000000
+0,CO2f,2040,3,R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
+0,CO2f,2040,4,R1,winter,all-week,all-day,procammonia_1,2030,20879.16630000000
+0,CO2f,2040,5,R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
+0,CO2f,2045,3,R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
+0,CO2f,2045,4,R1,winter,all-week,all-day,procammonia_1,2030,20879.16630000000
+0,CO2f,2045,5,R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
+0,CO2f,2045,6,R1,winter,all-week,all-day,procammonia_1,2040,7892.26240000000
+0,ammonia,2040,2,R1,winter,all-week,all-day,procammonia_1,2020,2.39420000000
+0,ammonia,2040,3,R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
+0,ammonia,2040,4,R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
+0,ammonia,2040,5,R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
+0,ammonia,2045,3,R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
+0,ammonia,2045,4,R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
+0,ammonia,2045,5,R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
+0,ammonia,2045,6,R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000
+1,CO2f,2040,2,R1,summer,all-week,all-day,procammonia_1,2020,10123.01120000000
+1,CO2f,2040,3,R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
+1,CO2f,2040,4,R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
+1,CO2f,2040,5,R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
+1,CO2f,2045,3,R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
+1,CO2f,2045,4,R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
+1,CO2f,2045,5,R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
+1,CO2f,2045,6,R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000
+1,ammonia,2040,2,R1,summer,all-week,all-day,procammonia_1,2020,2.46680000000
+1,ammonia,2040,3,R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
+1,ammonia,2040,4,R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
+1,ammonia,2040,5,R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
+1,ammonia,2045,3,R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
+1,ammonia,2045,4,R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
+1,ammonia,2045,5,R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
+1,ammonia,2045,6,R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000
+2,CO2f,2040,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,9825.27560000000
+2,CO2f,2040,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
+2,CO2f,2040,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16630000000
+2,CO2f,2040,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
+2,CO2f,2045,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
+2,CO2f,2045,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16630000000
+2,CO2f,2045,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
+2,CO2f,2045,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000
+2,ammonia,2040,2,R1,spring-autumn,all-week,all-day,procammonia_1,2020,2.39420000000
+2,ammonia,2040,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
+2,ammonia,2040,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
+2,ammonia,2040,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
+2,ammonia,2045,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
+2,ammonia,2045,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
+2,ammonia,2045,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
+2,ammonia,2045,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,1.98540000000
diff --git a/tests/example_outputs/minimum_service/Industry/Supply/2045.csv b/tests/example_outputs/minimum_service/Industry/Supply/2045.csv
index fe2c25146..91510f365 100644
--- a/tests/example_outputs/minimum_service/Industry/Supply/2045.csv
+++ b/tests/example_outputs/minimum_service/Industry/Supply/2045.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,CO2f,2045,4,R1,2025,procammonia_1,winter,all-week,all-day,9748.27500000000
-0,CO2f,2045,5,R1,2030,procammonia_1,winter,all-week,all-day,20879.16630000000
-0,CO2f,2045,6,R1,2035,procammonia_1,winter,all-week,all-day,18228.27250000000
-0,CO2f,2045,7,R1,2040,procammonia_1,winter,all-week,all-day,7892.26240000000
-0,CO2f,2050,5,R1,2030,procammonia_1,winter,all-week,all-day,20879.16640000000
-0,CO2f,2050,6,R1,2035,procammonia_1,winter,all-week,all-day,18228.27250000000
-0,CO2f,2050,7,R1,2040,procammonia_1,winter,all-week,all-day,7892.26240000000
-0,CO2f,2050,8,R1,2045,procammonia_1,winter,all-week,all-day,7828.40920000000
-0,ammonia,2045,4,R1,2025,procammonia_1,winter,all-week,all-day,2.39420000000
-0,ammonia,2045,5,R1,2030,procammonia_1,winter,all-week,all-day,5.16890000000
-0,ammonia,2045,6,R1,2035,procammonia_1,winter,all-week,all-day,4.54880000000
-0,ammonia,2045,7,R1,2040,procammonia_1,winter,all-week,all-day,1.98540000000
-0,ammonia,2050,5,R1,2030,procammonia_1,winter,all-week,all-day,5.16890000000
-0,ammonia,2050,6,R1,2035,procammonia_1,winter,all-week,all-day,4.54880000000
-0,ammonia,2050,7,R1,2040,procammonia_1,winter,all-week,all-day,1.98540000000
-0,ammonia,2050,8,R1,2045,procammonia_1,winter,all-week,all-day,1.98540000000
-1,CO2f,2045,4,R1,2025,procammonia_1,summer,all-week,all-day,10043.67720000000
-1,CO2f,2045,5,R1,2030,procammonia_1,summer,all-week,all-day,21511.86840000000
-1,CO2f,2045,6,R1,2035,procammonia_1,summer,all-week,all-day,18780.64440000000
-1,CO2f,2045,7,R1,2040,procammonia_1,summer,all-week,all-day,8131.42190000000
-1,CO2f,2050,5,R1,2030,procammonia_1,summer,all-week,all-day,21511.86840000000
-1,CO2f,2050,6,R1,2035,procammonia_1,summer,all-week,all-day,18780.64440000000
-1,CO2f,2050,7,R1,2040,procammonia_1,summer,all-week,all-day,8131.42190000000
-1,CO2f,2050,8,R1,2045,procammonia_1,summer,all-week,all-day,8065.63370000000
-1,ammonia,2045,4,R1,2025,procammonia_1,summer,all-week,all-day,2.46680000000
-1,ammonia,2045,5,R1,2030,procammonia_1,summer,all-week,all-day,5.32550000000
-1,ammonia,2045,6,R1,2035,procammonia_1,summer,all-week,all-day,4.68670000000
-1,ammonia,2045,7,R1,2040,procammonia_1,summer,all-week,all-day,2.04560000000
-1,ammonia,2050,5,R1,2030,procammonia_1,summer,all-week,all-day,5.32550000000
-1,ammonia,2050,6,R1,2035,procammonia_1,summer,all-week,all-day,4.68670000000
-1,ammonia,2050,7,R1,2040,procammonia_1,summer,all-week,all-day,2.04560000000
-1,ammonia,2050,8,R1,2045,procammonia_1,summer,all-week,all-day,2.04560000000
-2,CO2f,2045,4,R1,2025,procammonia_1,spring-autumn,all-week,all-day,9748.27500000000
-2,CO2f,2045,5,R1,2030,procammonia_1,spring-autumn,all-week,all-day,20879.16630000000
-2,CO2f,2045,6,R1,2035,procammonia_1,spring-autumn,all-week,all-day,18228.27250000000
-2,CO2f,2045,7,R1,2040,procammonia_1,spring-autumn,all-week,all-day,7892.26240000000
-2,CO2f,2050,5,R1,2030,procammonia_1,spring-autumn,all-week,all-day,20879.16640000000
-2,CO2f,2050,6,R1,2035,procammonia_1,spring-autumn,all-week,all-day,18228.27250000000
-2,CO2f,2050,7,R1,2040,procammonia_1,spring-autumn,all-week,all-day,7892.26240000000
-2,CO2f,2050,8,R1,2045,procammonia_1,spring-autumn,all-week,all-day,7828.40920000000
-2,ammonia,2045,4,R1,2025,procammonia_1,spring-autumn,all-week,all-day,2.39420000000
-2,ammonia,2045,5,R1,2030,procammonia_1,spring-autumn,all-week,all-day,5.16890000000
-2,ammonia,2045,6,R1,2035,procammonia_1,spring-autumn,all-week,all-day,4.54880000000
-2,ammonia,2045,7,R1,2040,procammonia_1,spring-autumn,all-week,all-day,1.98540000000
-2,ammonia,2050,5,R1,2030,procammonia_1,spring-autumn,all-week,all-day,5.16890000000
-2,ammonia,2050,6,R1,2035,procammonia_1,spring-autumn,all-week,all-day,4.54880000000
-2,ammonia,2050,7,R1,2040,procammonia_1,spring-autumn,all-week,all-day,1.98540000000
-2,ammonia,2050,8,R1,2045,procammonia_1,spring-autumn,all-week,all-day,1.98540000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,CO2f,2045,3,R1,winter,all-week,all-day,procammonia_1,2025,9748.27500000000
+0,CO2f,2045,4,R1,winter,all-week,all-day,procammonia_1,2030,20879.16630000000
+0,CO2f,2045,5,R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
+0,CO2f,2045,6,R1,winter,all-week,all-day,procammonia_1,2040,7892.26240000000
+0,CO2f,2050,4,R1,winter,all-week,all-day,procammonia_1,2030,20879.16640000000
+0,CO2f,2050,5,R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
+0,CO2f,2050,6,R1,winter,all-week,all-day,procammonia_1,2040,7892.26240000000
+0,CO2f,2050,7,R1,winter,all-week,all-day,procammonia_1,2045,7828.40920000000
+0,ammonia,2045,3,R1,winter,all-week,all-day,procammonia_1,2025,2.39420000000
+0,ammonia,2045,4,R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
+0,ammonia,2045,5,R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
+0,ammonia,2045,6,R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000
+0,ammonia,2050,4,R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
+0,ammonia,2050,5,R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
+0,ammonia,2050,6,R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000
+0,ammonia,2050,7,R1,winter,all-week,all-day,procammonia_1,2045,1.98540000000
+1,CO2f,2045,3,R1,summer,all-week,all-day,procammonia_1,2025,10043.67720000000
+1,CO2f,2045,4,R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
+1,CO2f,2045,5,R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
+1,CO2f,2045,6,R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000
+1,CO2f,2050,4,R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
+1,CO2f,2050,5,R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
+1,CO2f,2050,6,R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000
+1,CO2f,2050,7,R1,summer,all-week,all-day,procammonia_1,2045,8065.63370000000
+1,ammonia,2045,3,R1,summer,all-week,all-day,procammonia_1,2025,2.46680000000
+1,ammonia,2045,4,R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
+1,ammonia,2045,5,R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
+1,ammonia,2045,6,R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000
+1,ammonia,2050,4,R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
+1,ammonia,2050,5,R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
+1,ammonia,2050,6,R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000
+1,ammonia,2050,7,R1,summer,all-week,all-day,procammonia_1,2045,2.04560000000
+2,CO2f,2045,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,9748.27500000000
+2,CO2f,2045,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16630000000
+2,CO2f,2045,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
+2,CO2f,2045,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000
+2,CO2f,2050,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16640000000
+2,CO2f,2050,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
+2,CO2f,2050,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000
+2,CO2f,2050,7,R1,spring-autumn,all-week,all-day,procammonia_1,2045,7828.40920000000
+2,ammonia,2045,3,R1,spring-autumn,all-week,all-day,procammonia_1,2025,2.39420000000
+2,ammonia,2045,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
+2,ammonia,2045,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
+2,ammonia,2045,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,1.98540000000
+2,ammonia,2050,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
+2,ammonia,2050,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
+2,ammonia,2050,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,1.98540000000
+2,ammonia,2050,7,R1,spring-autumn,all-week,all-day,procammonia_1,2045,1.98540000000
diff --git a/tests/example_outputs/minimum_service/Industry/Supply/2050.csv b/tests/example_outputs/minimum_service/Industry/Supply/2050.csv
index aaf0dd601..5c1490c8b 100644
--- a/tests/example_outputs/minimum_service/Industry/Supply/2050.csv
+++ b/tests/example_outputs/minimum_service/Industry/Supply/2050.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,CO2f,2050,5,R1,2030,procammonia_1,winter,all-week,all-day,20879.16640000000
-0,CO2f,2050,6,R1,2035,procammonia_1,winter,all-week,all-day,18228.27250000000
-0,CO2f,2050,7,R1,2040,procammonia_1,winter,all-week,all-day,7892.26240000000
-0,CO2f,2050,8,R1,2045,procammonia_1,winter,all-week,all-day,7828.40920000000
-0,CO2f,2055,6,R1,2035,procammonia_1,winter,all-week,all-day,18228.27250000000
-0,CO2f,2055,7,R1,2040,procammonia_1,winter,all-week,all-day,7892.26240000000
-0,CO2f,2055,8,R1,2045,procammonia_1,winter,all-week,all-day,7828.40920000000
-0,CO2f,2055,9,R1,2050,procammonia_1,winter,all-week,all-day,20214.22470000000
-0,ammonia,2050,5,R1,2030,procammonia_1,winter,all-week,all-day,5.16890000000
-0,ammonia,2050,6,R1,2035,procammonia_1,winter,all-week,all-day,4.54880000000
-0,ammonia,2050,7,R1,2040,procammonia_1,winter,all-week,all-day,1.98540000000
-0,ammonia,2050,8,R1,2045,procammonia_1,winter,all-week,all-day,1.98540000000
-0,ammonia,2055,6,R1,2035,procammonia_1,winter,all-week,all-day,4.54880000000
-0,ammonia,2055,7,R1,2040,procammonia_1,winter,all-week,all-day,1.98540000000
-0,ammonia,2055,8,R1,2045,procammonia_1,winter,all-week,all-day,1.98540000000
-0,ammonia,2055,9,R1,2050,procammonia_1,winter,all-week,all-day,5.16890000000
-1,CO2f,2050,5,R1,2030,procammonia_1,summer,all-week,all-day,21511.86840000000
-1,CO2f,2050,6,R1,2035,procammonia_1,summer,all-week,all-day,18780.64440000000
-1,CO2f,2050,7,R1,2040,procammonia_1,summer,all-week,all-day,8131.42190000000
-1,CO2f,2050,8,R1,2045,procammonia_1,summer,all-week,all-day,8065.63370000000
-1,CO2f,2055,6,R1,2035,procammonia_1,summer,all-week,all-day,18780.64440000000
-1,CO2f,2055,7,R1,2040,procammonia_1,summer,all-week,all-day,8131.42190000000
-1,CO2f,2055,8,R1,2045,procammonia_1,summer,all-week,all-day,8065.63370000000
-1,CO2f,2055,9,R1,2050,procammonia_1,summer,all-week,all-day,20826.77700000000
-1,ammonia,2050,5,R1,2030,procammonia_1,summer,all-week,all-day,5.32550000000
-1,ammonia,2050,6,R1,2035,procammonia_1,summer,all-week,all-day,4.68670000000
-1,ammonia,2050,7,R1,2040,procammonia_1,summer,all-week,all-day,2.04560000000
-1,ammonia,2050,8,R1,2045,procammonia_1,summer,all-week,all-day,2.04560000000
-1,ammonia,2055,6,R1,2035,procammonia_1,summer,all-week,all-day,4.68670000000
-1,ammonia,2055,7,R1,2040,procammonia_1,summer,all-week,all-day,2.04560000000
-1,ammonia,2055,8,R1,2045,procammonia_1,summer,all-week,all-day,2.04560000000
-1,ammonia,2055,9,R1,2050,procammonia_1,summer,all-week,all-day,5.32550000000
-2,CO2f,2050,5,R1,2030,procammonia_1,spring-autumn,all-week,all-day,20879.16640000000
-2,CO2f,2050,6,R1,2035,procammonia_1,spring-autumn,all-week,all-day,18228.27250000000
-2,CO2f,2050,7,R1,2040,procammonia_1,spring-autumn,all-week,all-day,7892.26240000000
-2,CO2f,2050,8,R1,2045,procammonia_1,spring-autumn,all-week,all-day,7828.40920000000
-2,CO2f,2055,6,R1,2035,procammonia_1,spring-autumn,all-week,all-day,18228.27250000000
-2,CO2f,2055,7,R1,2040,procammonia_1,spring-autumn,all-week,all-day,7892.26240000000
-2,CO2f,2055,8,R1,2045,procammonia_1,spring-autumn,all-week,all-day,7828.40920000000
-2,CO2f,2055,9,R1,2050,procammonia_1,spring-autumn,all-week,all-day,20214.22470000000
-2,ammonia,2050,5,R1,2030,procammonia_1,spring-autumn,all-week,all-day,5.16890000000
-2,ammonia,2050,6,R1,2035,procammonia_1,spring-autumn,all-week,all-day,4.54880000000
-2,ammonia,2050,7,R1,2040,procammonia_1,spring-autumn,all-week,all-day,1.98540000000
-2,ammonia,2050,8,R1,2045,procammonia_1,spring-autumn,all-week,all-day,1.98540000000
-2,ammonia,2055,6,R1,2035,procammonia_1,spring-autumn,all-week,all-day,4.54880000000
-2,ammonia,2055,7,R1,2040,procammonia_1,spring-autumn,all-week,all-day,1.98540000000
-2,ammonia,2055,8,R1,2045,procammonia_1,spring-autumn,all-week,all-day,1.98540000000
-2,ammonia,2055,9,R1,2050,procammonia_1,spring-autumn,all-week,all-day,5.16890000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,CO2f,2050,4,R1,winter,all-week,all-day,procammonia_1,2030,20879.16640000000
+0,CO2f,2050,5,R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
+0,CO2f,2050,6,R1,winter,all-week,all-day,procammonia_1,2040,7892.26240000000
+0,CO2f,2050,7,R1,winter,all-week,all-day,procammonia_1,2045,7828.40920000000
+0,CO2f,2055,5,R1,winter,all-week,all-day,procammonia_1,2035,18228.27250000000
+0,CO2f,2055,6,R1,winter,all-week,all-day,procammonia_1,2040,7892.26240000000
+0,CO2f,2055,7,R1,winter,all-week,all-day,procammonia_1,2045,7828.40920000000
+0,CO2f,2055,8,R1,winter,all-week,all-day,procammonia_1,2050,20214.22470000000
+0,ammonia,2050,4,R1,winter,all-week,all-day,procammonia_1,2030,5.16890000000
+0,ammonia,2050,5,R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
+0,ammonia,2050,6,R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000
+0,ammonia,2050,7,R1,winter,all-week,all-day,procammonia_1,2045,1.98540000000
+0,ammonia,2055,5,R1,winter,all-week,all-day,procammonia_1,2035,4.54880000000
+0,ammonia,2055,6,R1,winter,all-week,all-day,procammonia_1,2040,1.98540000000
+0,ammonia,2055,7,R1,winter,all-week,all-day,procammonia_1,2045,1.98540000000
+0,ammonia,2055,8,R1,winter,all-week,all-day,procammonia_1,2050,5.16890000000
+1,CO2f,2050,4,R1,summer,all-week,all-day,procammonia_1,2030,21511.86840000000
+1,CO2f,2050,5,R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
+1,CO2f,2050,6,R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000
+1,CO2f,2050,7,R1,summer,all-week,all-day,procammonia_1,2045,8065.63370000000
+1,CO2f,2055,5,R1,summer,all-week,all-day,procammonia_1,2035,18780.64440000000
+1,CO2f,2055,6,R1,summer,all-week,all-day,procammonia_1,2040,8131.42190000000
+1,CO2f,2055,7,R1,summer,all-week,all-day,procammonia_1,2045,8065.63370000000
+1,CO2f,2055,8,R1,summer,all-week,all-day,procammonia_1,2050,20826.77700000000
+1,ammonia,2050,4,R1,summer,all-week,all-day,procammonia_1,2030,5.32550000000
+1,ammonia,2050,5,R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
+1,ammonia,2050,6,R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000
+1,ammonia,2050,7,R1,summer,all-week,all-day,procammonia_1,2045,2.04560000000
+1,ammonia,2055,5,R1,summer,all-week,all-day,procammonia_1,2035,4.68670000000
+1,ammonia,2055,6,R1,summer,all-week,all-day,procammonia_1,2040,2.04560000000
+1,ammonia,2055,7,R1,summer,all-week,all-day,procammonia_1,2045,2.04560000000
+1,ammonia,2055,8,R1,summer,all-week,all-day,procammonia_1,2050,5.32550000000
+2,CO2f,2050,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,20879.16640000000
+2,CO2f,2050,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
+2,CO2f,2050,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000
+2,CO2f,2050,7,R1,spring-autumn,all-week,all-day,procammonia_1,2045,7828.40920000000
+2,CO2f,2055,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,18228.27250000000
+2,CO2f,2055,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,7892.26240000000
+2,CO2f,2055,7,R1,spring-autumn,all-week,all-day,procammonia_1,2045,7828.40920000000
+2,CO2f,2055,8,R1,spring-autumn,all-week,all-day,procammonia_1,2050,20214.22470000000
+2,ammonia,2050,4,R1,spring-autumn,all-week,all-day,procammonia_1,2030,5.16890000000
+2,ammonia,2050,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
+2,ammonia,2050,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,1.98540000000
+2,ammonia,2050,7,R1,spring-autumn,all-week,all-day,procammonia_1,2045,1.98540000000
+2,ammonia,2055,5,R1,spring-autumn,all-week,all-day,procammonia_1,2035,4.54880000000
+2,ammonia,2055,6,R1,spring-autumn,all-week,all-day,procammonia_1,2040,1.98540000000
+2,ammonia,2055,7,R1,spring-autumn,all-week,all-day,procammonia_1,2045,1.98540000000
+2,ammonia,2055,8,R1,spring-autumn,all-week,all-day,procammonia_1,2050,5.16890000000
diff --git a/tests/example_outputs/minimum_service/MCAMetric_Supply.csv b/tests/example_outputs/minimum_service/MCAMetric_Supply.csv
index ea65fda6a..9cf2795af 100644
--- a/tests/example_outputs/minimum_service/MCAMetric_Supply.csv
+++ b/tests/example_outputs/minimum_service/MCAMetric_Supply.csv
@@ -1,205 +1,205 @@
 ,agent,asset,category,comm_usage,commodity,dst_region,index,installed,region,sector,supply,technology,timeslice,units_prices,year
-0,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,0,2010.00000000000,R1,industry,30397.66158285232,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2010.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,1,2010.00000000000,R1,industry,22694.61779869451,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2010.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,2,2010.00000000000,R1,industry,7.29300000068,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2010.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,3,2010.00000000000,R1,industry,7.29300000068,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2010.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,10,2010.00000000000,R1,industry,31318.80283429535,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2010.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,11,2010.00000000000,R1,industry,23382.33348311096,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2010.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,12,2010.00000000000,R1,industry,7.51399999863,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2010.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,13,2010.00000000000,R1,industry,7.51399999863,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2010.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,20,2010.00000000000,R1,industry,30397.66158285232,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2010.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,21,2010.00000000000,R1,industry,22694.61779869451,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2010.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,22,2010.00000000000,R1,industry,7.29300000068,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2010.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,23,2010.00000000000,R1,industry,7.29300000068,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2010.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,0,2010.00000000000,R1,industry,34007.42989250853,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2015.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,1,2010.00000000000,R1,industry,20680.82894531053,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2015.00000000000
-2,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,3,2010.00000000000,R1,industry,8.22250000227,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2015.00000000000
-3,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,4,2010.00000000000,R1,industry,6.69753999773,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2015.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,15,2010.00000000000,R1,industry,35037.95806139958,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2015.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,16,2010.00000000000,R1,industry,21307.52072565159,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2015.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,18,2010.00000000000,R1,industry,8.47166666667,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2015.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,19,2010.00000000000,R1,industry,6.90049575333,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2015.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,30,2010.00000000000,R1,industry,34007.42989250853,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2015.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,31,2010.00000000000,R1,industry,20680.82894531053,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2015.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,33,2010.00000000000,R1,industry,8.22250000227,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2015.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,34,2010.00000000000,R1,industry,6.69753999773,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2015.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,0,2010.00000000000,R1,industry,28852.69853027302,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2020.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,1,2010.00000000000,R1,industry,16868.96930416728,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2020.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,2,2015.00000000000,R1,industry,9780.57579057130,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2020.00000000000
-3,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,4,2010.00000000000,R1,industry,7.03083333344,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2020.00000000000
-4,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,5,2010.00000000000,R1,industry,5.50587332890,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2020.00000000000
-5,A1,2.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,6,2015.00000000000,R1,industry,2.38333333766,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2020.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,20,2010.00000000000,R1,industry,29727.02271995599,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2020.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,21,2010.00000000000,R1,industry,17380.15018737576,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2020.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,22,2015.00000000000,R1,industry,10076.95687235302,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2020.00000000000
-9,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,24,2010.00000000000,R1,industry,7.24388888700,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2020.00000000000
-10,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,25,2010.00000000000,R1,industry,5.67271797367,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2020.00000000000
-11,A1,2.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,26,2015.00000000000,R1,industry,2.45555555933,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2020.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,40,2010.00000000000,R1,industry,28852.69853027302,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2020.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,41,2010.00000000000,R1,industry,16868.96930416728,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2020.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,42,2015.00000000000,R1,industry,9780.57579057130,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2020.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,44,2010.00000000000,R1,industry,7.03083333344,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2020.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,45,2010.00000000000,R1,industry,5.50587332890,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2020.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,46,2015.00000000000,R1,industry,2.38333333766,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2020.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,0,2010.00000000000,R1,industry,23774.61745868617,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,1,2010.00000000000,R1,industry,13114.33607353469,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,2,2015.00000000000,R1,industry,9703.92550979380,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,3,2020.00000000000,R1,industry,9748.27496047046,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,5,2010.00000000000,R1,industry,5.83916666713,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,6,2010.00000000000,R1,industry,4.31420666265,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,7,2015.00000000000,R1,industry,2.38333333756,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
-7,A1,3.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,8,2020.00000000000,R1,industry,2.39422578765,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,25,2010.00000000000,R1,industry,24495.06040618948,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,26,2010.00000000000,R1,industry,13511.74019378120,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,27,2015.00000000000,R1,industry,9997.98385621208,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2020.00000000000,R1,industry,10043.67722962572,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,30,2010.00000000000,R1,industry,6.01611111017,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,31,2010.00000000000,R1,industry,4.44494019683,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,32,2015.00000000000,R1,industry,2.45555555933,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,33,2020.00000000000,R1,industry,2.46677808367,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,50,2010.00000000000,R1,industry,23774.61745868617,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,51,2010.00000000000,R1,industry,13114.33607353469,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,52,2015.00000000000,R1,industry,9703.92550979380,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,53,2020.00000000000,R1,industry,9748.27496047046,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,55,2010.00000000000,R1,industry,5.83916666713,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,56,2010.00000000000,R1,industry,4.31420666265,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,57,2015.00000000000,R1,industry,2.38333333756,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,58,2020.00000000000,R1,industry,2.39422578765,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,0,2010.00000000000,R1,industry,18773.18666438033,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,1,2010.00000000000,R1,industry,9416.92924324588,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,2,2015.00000000000,R1,industry,9627.27522902292,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,3,2020.00000000000,R1,industry,9671.27436808157,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,4,2025.00000000000,R1,industry,9671.27437474663,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
-5,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,6,2010.00000000000,R1,industry,4.64750000009,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
-6,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,7,2010.00000000000,R1,industry,3.12253999567,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
-7,A1,2.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,8,2015.00000000000,R1,industry,2.38333333747,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
-8,A1,3.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,9,2020.00000000000,R1,industry,2.39422578756,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
-9,A1,4.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,10,2025.00000000000,R1,industry,2.39422578921,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
-10,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,30,2010.00000000000,R1,industry,19342.07110494816,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
-11,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,31,2010.00000000000,R1,industry,9702.29073355564,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
-12,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,32,2015.00000000000,R1,industry,9919.01084007114,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
-13,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,33,2020.00000000000,R1,industry,9964.34328636507,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
-14,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,34,2025.00000000000,R1,industry,9964.34329323210,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
-15,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,36,2010.00000000000,R1,industry,4.78833333248,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
-16,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,37,2010.00000000000,R1,industry,3.21716241915,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
-17,A1,2.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,38,2015.00000000000,R1,industry,2.45555555933,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
-18,A1,3.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,39,2020.00000000000,R1,industry,2.46677808367,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
-19,A1,4.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,40,2025.00000000000,R1,industry,2.46677808537,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,60,2010.00000000000,R1,industry,18773.18666438033,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,61,2010.00000000000,R1,industry,9416.92924324588,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,62,2015.00000000000,R1,industry,9627.27522902292,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,63,2020.00000000000,R1,industry,9671.27436808157,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
-24,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,64,2025.00000000000,R1,industry,9671.27437474663,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
-25,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,66,2010.00000000000,R1,industry,4.64750000009,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
-26,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,67,2010.00000000000,R1,industry,3.12253999567,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
-27,A1,2.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,68,2015.00000000000,R1,industry,2.38333333747,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
-28,A1,3.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,69,2020.00000000000,R1,industry,2.39422578756,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
-29,A1,4.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,70,2025.00000000000,R1,industry,2.39422578921,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,0,2010.00000000000,R1,industry,4775.31246614086,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,1,2010.00000000000,R1,industry,3565.20487545684,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,2,2015.00000000000,R1,industry,9550.62494770967,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,3,2020.00000000000,R1,industry,9594.27377514783,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
-4,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,4,2025.00000000000,R1,industry,9594.27378175982,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
-5,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,5,2030.00000000000,R1,industry,20712.93095079165,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
-6,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,7,2010.00000000000,R1,industry,1.19166666669,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
-7,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,8,2010.00000000000,R1,industry,1.19166666669,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
-8,A1,2.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,9,2015.00000000000,R1,industry,2.38333333724,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
-9,A1,3.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,10,2020.00000000000,R1,industry,2.39422578733,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
-10,A1,4.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,11,2025.00000000000,R1,industry,2.39422578898,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
-11,A1,5.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,12,2030.00000000000,R1,industry,5.16885744307,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,35,2010.00000000000,R1,industry,4920.01890401737,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,36,2010.00000000000,R1,industry,3673.24138646744,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,37,2015.00000000000,R1,industry,9840.03782393020,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,38,2020.00000000000,R1,industry,9885.00934310442,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
-16,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,39,2025.00000000000,R1,industry,9885.00934991677,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
-17,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,40,2030.00000000000,R1,industry,21340.59552292663,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
-18,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,42,2010.00000000000,R1,industry,1.22777777768,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
-19,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,43,2010.00000000000,R1,industry,1.22777777768,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
-20,A1,2.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,44,2015.00000000000,R1,industry,2.45555555933,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
-21,A1,3.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,45,2020.00000000000,R1,industry,2.46677808367,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
-22,A1,4.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,46,2025.00000000000,R1,industry,2.46677808537,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
-23,A1,5.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,47,2030.00000000000,R1,industry,5.32548948627,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
-24,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,70,2010.00000000000,R1,industry,4775.31246614086,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
-25,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,71,2010.00000000000,R1,industry,3565.20487545684,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
-26,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,72,2015.00000000000,R1,industry,9550.62494770967,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
-27,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,73,2020.00000000000,R1,industry,9594.27377514783,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
-28,A1,4.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,74,2025.00000000000,R1,industry,9594.27378175982,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
-29,A1,5.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,75,2030.00000000000,R1,industry,20712.93095079165,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
-30,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,77,2010.00000000000,R1,industry,1.19166666669,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
-31,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,78,2010.00000000000,R1,industry,1.19166666669,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
-32,A1,2.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,79,2015.00000000000,R1,industry,2.38333333724,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
-33,A1,3.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,80,2020.00000000000,R1,industry,2.39422578733,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
-34,A1,4.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,81,2025.00000000000,R1,industry,2.39422578898,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
-35,A1,5.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,82,2030.00000000000,R1,industry,5.16885744307,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,0,2020.00000000000,R1,industry,9517.27318220130,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,1,2025.00000000000,R1,industry,9517.27318876022,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,2,2030.00000000000,R1,industry,20546.69554806604,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,3,2035.00000000000,R1,industry,18081.97813945044,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,5,2020.00000000000,R1,industry,2.39422578709,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,6,2025.00000000000,R1,industry,2.39422578874,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,7,2030.00000000000,R1,industry,5.16885744255,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
-7,A1,3.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,8,2035.00000000000,R1,industry,4.54881745162,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,25,2020.00000000000,R1,industry,9805.67539984376,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,26,2025.00000000000,R1,industry,9805.67540660144,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,27,2030.00000000000,R1,industry,21169.32268588622,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2035.00000000000,R1,industry,18629.91687094894,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,30,2020.00000000000,R1,industry,2.46677808367,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,31,2025.00000000000,R1,industry,2.46677808537,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,32,2030.00000000000,R1,industry,5.32548948627,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,33,2035.00000000000,R1,industry,4.68666040470,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,50,2020.00000000000,R1,industry,9517.27318220130,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,51,2025.00000000000,R1,industry,9517.27318876022,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,52,2030.00000000000,R1,industry,20546.69554806604,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,53,2035.00000000000,R1,industry,18081.97813945044,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,55,2020.00000000000,R1,industry,2.39422578709,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,56,2025.00000000000,R1,industry,2.39422578874,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,57,2030.00000000000,R1,industry,5.16885744255,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,58,2035.00000000000,R1,industry,4.54881745162,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,0,2025.00000000000,R1,industry,9440.27259691583,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,1,2030.00000000000,R1,industry,20380.46014783439,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,2,2035.00000000000,R1,industry,17935.68381849942,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,3,2040.00000000000,R1,industry,7828.40914377240,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,5,2025.00000000000,R1,industry,2.39422578879,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,6,2030.00000000000,R1,industry,5.16885744266,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,7,2035.00000000000,R1,industry,4.54881745172,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
-7,A1,3.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,8,2040.00000000000,R1,industry,1.98542773684,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,25,2025.00000000000,R1,industry,9726.34146328612,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,26,2030.00000000000,R1,industry,20998.04984884582,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,27,2035.00000000000,R1,industry,18479.18938837145,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2040.00000000000,R1,industry,8065.63366311238,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,30,2025.00000000000,R1,industry,2.46677808537,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,31,2030.00000000000,R1,industry,5.32548948627,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,32,2035.00000000000,R1,industry,4.68666040470,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,33,2040.00000000000,R1,industry,2.04559221367,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,50,2025.00000000000,R1,industry,9440.27259691583,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,51,2030.00000000000,R1,industry,20380.46014783439,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,52,2035.00000000000,R1,industry,17935.68381849942,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,53,2040.00000000000,R1,industry,7828.40914377240,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,55,2025.00000000000,R1,industry,2.39422578879,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,56,2030.00000000000,R1,industry,5.16885744266,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,57,2035.00000000000,R1,industry,4.54881745172,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,58,2040.00000000000,R1,industry,1.98542773684,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
-0,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,0,2030.00000000000,R1,industry,20214.22474762098,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
-1,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,1,2035.00000000000,R1,industry,17789.38949756447,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
-2,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,2,2040.00000000000,R1,industry,7764.55588836946,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
-3,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,3,2045.00000000000,R1,industry,7764.55589482225,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
-4,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,5,2030.00000000000,R1,industry,5.16885744278,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
-5,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,6,2035.00000000000,R1,industry,4.54881745182,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
-6,A1,2.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,7,2040.00000000000,R1,industry,1.98542773688,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
-7,A1,3.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,8,2045.00000000000,R1,industry,1.98542773853,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
-8,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,25,2030.00000000000,R1,industry,20826.77701180542,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
-9,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,26,2035.00000000000,R1,industry,18328.46190579395,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
-10,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,27,2040.00000000000,R1,industry,7999.84546040051,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
-11,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,28,2045.00000000000,R1,industry,7999.84546704884,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
-12,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,30,2030.00000000000,R1,industry,5.32548948627,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
-13,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,31,2035.00000000000,R1,industry,4.68666040470,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
-14,A1,2.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,32,2040.00000000000,R1,industry,2.04559221367,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
-15,A1,3.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,33,2045.00000000000,R1,industry,2.04559221537,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
-16,A1,0.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,50,2030.00000000000,R1,industry,20214.22474762098,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
-17,A1,1.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,51,2035.00000000000,R1,industry,17789.38949756447,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
-18,A1,2.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,52,2040.00000000000,R1,industry,7764.55588836946,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
-19,A1,3.00000000000,retrofit,CommodityUsage.ENVIRONMENTAL|PRODUCT,CO2f,R1,53,2045.00000000000,R1,industry,7764.55589482225,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
-20,A1,0.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,55,2030.00000000000,R1,industry,5.16885744278,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
-21,A1,1.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,56,2035.00000000000,R1,industry,4.54881745182,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
-22,A1,2.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,57,2040.00000000000,R1,industry,1.98542773688,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
-23,A1,3.00000000000,retrofit,CommodityUsage.PRODUCT,ammonia,R1,58,2045.00000000000,R1,industry,1.98542773853,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,0,2010.00000000000,R1,industry,30397.66158285232,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2010.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,1,2010.00000000000,R1,industry,22694.61779869451,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2010.00000000000
+2,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,2,2010.00000000000,R1,industry,7.29300000068,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2010.00000000000
+3,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,3,2010.00000000000,R1,industry,7.29300000068,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2010.00000000000
+4,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,10,2010.00000000000,R1,industry,31318.80283429535,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2010.00000000000
+5,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,11,2010.00000000000,R1,industry,23382.33348311096,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2010.00000000000
+6,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,12,2010.00000000000,R1,industry,7.51399999863,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2010.00000000000
+7,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,13,2010.00000000000,R1,industry,7.51399999863,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2010.00000000000
+8,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,20,2010.00000000000,R1,industry,30397.66158285232,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2010.00000000000
+9,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,21,2010.00000000000,R1,industry,22694.61779869451,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2010.00000000000
+10,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,22,2010.00000000000,R1,industry,7.29300000068,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2010.00000000000
+11,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,23,2010.00000000000,R1,industry,7.29300000068,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2010.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,0,2010.00000000000,R1,industry,34007.42989250853,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2015.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,1,2010.00000000000,R1,industry,20680.82894531053,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2015.00000000000
+2,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,3,2010.00000000000,R1,industry,8.22250000227,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2015.00000000000
+3,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,4,2010.00000000000,R1,industry,6.69753999773,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2015.00000000000
+4,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,15,2010.00000000000,R1,industry,35037.95806139958,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2015.00000000000
+5,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,16,2010.00000000000,R1,industry,21307.52072565159,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2015.00000000000
+6,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,18,2010.00000000000,R1,industry,8.47166666667,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2015.00000000000
+7,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,19,2010.00000000000,R1,industry,6.90049575333,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2015.00000000000
+8,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,30,2010.00000000000,R1,industry,34007.42989250853,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2015.00000000000
+9,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,31,2010.00000000000,R1,industry,20680.82894531053,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2015.00000000000
+10,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,33,2010.00000000000,R1,industry,8.22250000227,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2015.00000000000
+11,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,34,2010.00000000000,R1,industry,6.69753999773,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2015.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,0,2010.00000000000,R1,industry,28852.69853027302,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2020.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,1,2010.00000000000,R1,industry,16868.96930416728,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2020.00000000000
+2,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,2,2015.00000000000,R1,industry,9780.57579057130,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2020.00000000000
+3,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,4,2010.00000000000,R1,industry,7.03083333344,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2020.00000000000
+4,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,5,2010.00000000000,R1,industry,5.50587332890,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2020.00000000000
+5,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,6,2015.00000000000,R1,industry,2.38333333766,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2020.00000000000
+6,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,20,2010.00000000000,R1,industry,29727.02271995599,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2020.00000000000
+7,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,21,2010.00000000000,R1,industry,17380.15018737576,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2020.00000000000
+8,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,22,2015.00000000000,R1,industry,10076.95687235302,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2020.00000000000
+9,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,24,2010.00000000000,R1,industry,7.24388888700,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2020.00000000000
+10,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,25,2010.00000000000,R1,industry,5.67271797367,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2020.00000000000
+11,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,26,2015.00000000000,R1,industry,2.45555555933,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2020.00000000000
+12,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,40,2010.00000000000,R1,industry,28852.69853027302,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2020.00000000000
+13,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,41,2010.00000000000,R1,industry,16868.96930416728,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2020.00000000000
+14,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,42,2015.00000000000,R1,industry,9780.57579057130,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2020.00000000000
+15,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,44,2010.00000000000,R1,industry,7.03083333344,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2020.00000000000
+16,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,45,2010.00000000000,R1,industry,5.50587332890,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2020.00000000000
+17,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,46,2015.00000000000,R1,industry,2.38333333766,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2020.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,0,2010.00000000000,R1,industry,23774.61745868616,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,1,2010.00000000000,R1,industry,13114.33607353469,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
+2,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,2,2015.00000000000,R1,industry,9703.92550979379,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
+3,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,3,2020.00000000000,R1,industry,9748.27496047046,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
+4,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,5,2010.00000000000,R1,industry,5.83916666713,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
+5,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,6,2010.00000000000,R1,industry,4.31420666265,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
+6,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,7,2015.00000000000,R1,industry,2.38333333756,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
+7,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,8,2020.00000000000,R1,industry,2.39422578765,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
+8,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,25,2010.00000000000,R1,industry,24495.06040618948,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
+9,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,26,2010.00000000000,R1,industry,13511.74019378120,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
+10,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,27,2015.00000000000,R1,industry,9997.98385621208,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
+11,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,28,2020.00000000000,R1,industry,10043.67722962572,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
+12,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,30,2010.00000000000,R1,industry,6.01611111017,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
+13,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,31,2010.00000000000,R1,industry,4.44494019683,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
+14,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,32,2015.00000000000,R1,industry,2.45555555933,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
+15,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,33,2020.00000000000,R1,industry,2.46677808367,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
+16,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,50,2010.00000000000,R1,industry,23774.61745868616,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
+17,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,51,2010.00000000000,R1,industry,13114.33607353469,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
+18,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,52,2015.00000000000,R1,industry,9703.92550979379,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
+19,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,53,2020.00000000000,R1,industry,9748.27496047046,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2025.00000000000
+20,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,55,2010.00000000000,R1,industry,5.83916666713,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
+21,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,56,2010.00000000000,R1,industry,4.31420666265,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
+22,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,57,2015.00000000000,R1,industry,2.38333333756,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
+23,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,58,2020.00000000000,R1,industry,2.39422578765,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2025.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,0,2010.00000000000,R1,industry,18773.18666438033,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,1,2010.00000000000,R1,industry,9416.92924324588,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
+2,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,2,2015.00000000000,R1,industry,9627.27522902292,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
+3,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,3,2020.00000000000,R1,industry,9671.27436808157,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
+4,A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,4,2025.00000000000,R1,industry,9671.27437474662,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
+5,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,6,2010.00000000000,R1,industry,4.64750000009,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
+6,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,7,2010.00000000000,R1,industry,3.12253999567,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
+7,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,8,2015.00000000000,R1,industry,2.38333333747,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
+8,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,9,2020.00000000000,R1,industry,2.39422578756,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
+9,A1,4.00000000000,retrofit,PRODUCT,ammonia,R1,10,2025.00000000000,R1,industry,2.39422578921,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
+10,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,30,2010.00000000000,R1,industry,19342.07110494816,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
+11,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,31,2010.00000000000,R1,industry,9702.29073355563,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
+12,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,32,2015.00000000000,R1,industry,9919.01084007114,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
+13,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,33,2020.00000000000,R1,industry,9964.34328636507,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
+14,A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,34,2025.00000000000,R1,industry,9964.34329323209,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
+15,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,36,2010.00000000000,R1,industry,4.78833333248,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
+16,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,37,2010.00000000000,R1,industry,3.21716241915,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
+17,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,38,2015.00000000000,R1,industry,2.45555555933,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
+18,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,39,2020.00000000000,R1,industry,2.46677808367,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
+19,A1,4.00000000000,retrofit,PRODUCT,ammonia,R1,40,2025.00000000000,R1,industry,2.46677808537,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
+20,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,60,2010.00000000000,R1,industry,18773.18666438033,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
+21,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,61,2010.00000000000,R1,industry,9416.92924324588,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
+22,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,62,2015.00000000000,R1,industry,9627.27522902292,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
+23,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,63,2020.00000000000,R1,industry,9671.27436808157,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
+24,A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,64,2025.00000000000,R1,industry,9671.27437474662,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2030.00000000000
+25,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,66,2010.00000000000,R1,industry,4.64750000009,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
+26,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,67,2010.00000000000,R1,industry,3.12253999567,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
+27,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,68,2015.00000000000,R1,industry,2.38333333747,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
+28,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,69,2020.00000000000,R1,industry,2.39422578756,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
+29,A1,4.00000000000,retrofit,PRODUCT,ammonia,R1,70,2025.00000000000,R1,industry,2.39422578921,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2030.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,0,2010.00000000000,R1,industry,4775.31246614086,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,1,2010.00000000000,R1,industry,3565.20487545684,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
+2,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,2,2015.00000000000,R1,industry,9550.62494770967,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
+3,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,3,2020.00000000000,R1,industry,9594.27377514783,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
+4,A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,4,2025.00000000000,R1,industry,9594.27378175981,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
+5,A1,5.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,5,2030.00000000000,R1,industry,20712.93095079166,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
+6,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,7,2010.00000000000,R1,industry,1.19166666669,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
+7,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,8,2010.00000000000,R1,industry,1.19166666669,procammonia_2,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
+8,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,9,2015.00000000000,R1,industry,2.38333333724,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
+9,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,10,2020.00000000000,R1,industry,2.39422578733,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
+10,A1,4.00000000000,retrofit,PRODUCT,ammonia,R1,11,2025.00000000000,R1,industry,2.39422578898,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
+11,A1,5.00000000000,retrofit,PRODUCT,ammonia,R1,12,2030.00000000000,R1,industry,5.16885744307,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
+12,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,35,2010.00000000000,R1,industry,4920.01890401737,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
+13,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,36,2010.00000000000,R1,industry,3673.24138646744,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
+14,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,37,2015.00000000000,R1,industry,9840.03782393019,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
+15,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,38,2020.00000000000,R1,industry,9885.00934310442,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
+16,A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,39,2025.00000000000,R1,industry,9885.00934991676,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
+17,A1,5.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,40,2030.00000000000,R1,industry,21340.59552292663,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
+18,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,42,2010.00000000000,R1,industry,1.22777777768,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
+19,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,43,2010.00000000000,R1,industry,1.22777777768,procammonia_2,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
+20,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,44,2015.00000000000,R1,industry,2.45555555933,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
+21,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,45,2020.00000000000,R1,industry,2.46677808367,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
+22,A1,4.00000000000,retrofit,PRODUCT,ammonia,R1,46,2025.00000000000,R1,industry,2.46677808537,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
+23,A1,5.00000000000,retrofit,PRODUCT,ammonia,R1,47,2030.00000000000,R1,industry,5.32548948627,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
+24,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,70,2010.00000000000,R1,industry,4775.31246614086,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
+25,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,71,2010.00000000000,R1,industry,3565.20487545684,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
+26,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,72,2015.00000000000,R1,industry,9550.62494770967,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
+27,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,73,2020.00000000000,R1,industry,9594.27377514783,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
+28,A1,4.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,74,2025.00000000000,R1,industry,9594.27378175981,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
+29,A1,5.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,75,2030.00000000000,R1,industry,20712.93095079166,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2035.00000000000
+30,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,77,2010.00000000000,R1,industry,1.19166666669,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
+31,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,78,2010.00000000000,R1,industry,1.19166666669,procammonia_2,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
+32,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,79,2015.00000000000,R1,industry,2.38333333724,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
+33,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,80,2020.00000000000,R1,industry,2.39422578733,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
+34,A1,4.00000000000,retrofit,PRODUCT,ammonia,R1,81,2025.00000000000,R1,industry,2.39422578898,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
+35,A1,5.00000000000,retrofit,PRODUCT,ammonia,R1,82,2030.00000000000,R1,industry,5.16885744307,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2035.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,0,2020.00000000000,R1,industry,9517.27318220130,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,1,2025.00000000000,R1,industry,9517.27318876022,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+2,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,2,2030.00000000000,R1,industry,20546.69554806604,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+3,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,3,2035.00000000000,R1,industry,18081.97813945043,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+4,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,5,2020.00000000000,R1,industry,2.39422578709,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+5,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,6,2025.00000000000,R1,industry,2.39422578874,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+6,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,7,2030.00000000000,R1,industry,5.16885744255,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+7,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,8,2035.00000000000,R1,industry,4.54881745162,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+8,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,25,2020.00000000000,R1,industry,9805.67539984377,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+9,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,26,2025.00000000000,R1,industry,9805.67540660143,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+10,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,27,2030.00000000000,R1,industry,21169.32268588623,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+11,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,28,2035.00000000000,R1,industry,18629.91687094893,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+12,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,30,2020.00000000000,R1,industry,2.46677808367,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+13,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,31,2025.00000000000,R1,industry,2.46677808537,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+14,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,32,2030.00000000000,R1,industry,5.32548948627,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+15,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,33,2035.00000000000,R1,industry,4.68666040470,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+16,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,50,2020.00000000000,R1,industry,9517.27318220130,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+17,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,51,2025.00000000000,R1,industry,9517.27318876022,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+18,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,52,2030.00000000000,R1,industry,20546.69554806604,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+19,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,53,2035.00000000000,R1,industry,18081.97813945043,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2040.00000000000
+20,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,55,2020.00000000000,R1,industry,2.39422578709,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+21,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,56,2025.00000000000,R1,industry,2.39422578874,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+22,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,57,2030.00000000000,R1,industry,5.16885744255,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+23,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,58,2035.00000000000,R1,industry,4.54881745162,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2040.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,0,2025.00000000000,R1,industry,9440.27259691583,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,1,2030.00000000000,R1,industry,20380.46014783439,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+2,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,2,2035.00000000000,R1,industry,17935.68381849941,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+3,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,3,2040.00000000000,R1,industry,7828.40914377241,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+4,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,5,2025.00000000000,R1,industry,2.39422578879,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+5,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,6,2030.00000000000,R1,industry,5.16885744266,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+6,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,7,2035.00000000000,R1,industry,4.54881745172,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+7,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,8,2040.00000000000,R1,industry,1.98542773684,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+8,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,25,2025.00000000000,R1,industry,9726.34146328611,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+9,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,26,2030.00000000000,R1,industry,20998.04984884583,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+10,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,27,2035.00000000000,R1,industry,18479.18938837144,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+11,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,28,2040.00000000000,R1,industry,8065.63366311239,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+12,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,30,2025.00000000000,R1,industry,2.46677808537,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+13,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,31,2030.00000000000,R1,industry,5.32548948627,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+14,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,32,2035.00000000000,R1,industry,4.68666040470,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+15,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,33,2040.00000000000,R1,industry,2.04559221367,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+16,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,50,2025.00000000000,R1,industry,9440.27259691583,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+17,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,51,2030.00000000000,R1,industry,20380.46014783439,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+18,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,52,2035.00000000000,R1,industry,17935.68381849941,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+19,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,53,2040.00000000000,R1,industry,7828.40914377241,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2045.00000000000
+20,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,55,2025.00000000000,R1,industry,2.39422578879,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+21,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,56,2030.00000000000,R1,industry,5.16885744266,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+22,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,57,2035.00000000000,R1,industry,4.54881745172,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+23,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,58,2040.00000000000,R1,industry,1.98542773684,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2045.00000000000
+0,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,0,2030.00000000000,R1,industry,20214.22474762099,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+1,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,1,2035.00000000000,R1,industry,17789.38949756446,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+2,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,2,2040.00000000000,R1,industry,7764.55588836946,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+3,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,3,2045.00000000000,R1,industry,7764.55589482224,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+4,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,5,2030.00000000000,R1,industry,5.16885744278,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+5,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,6,2035.00000000000,R1,industry,4.54881745182,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+6,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,7,2040.00000000000,R1,industry,1.98542773688,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+7,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,8,2045.00000000000,R1,industry,1.98542773853,procammonia_1,"('winter', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+8,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,25,2030.00000000000,R1,industry,20826.77701180542,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+9,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,26,2035.00000000000,R1,industry,18328.46190579394,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+10,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,27,2040.00000000000,R1,industry,7999.84546040052,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+11,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,28,2045.00000000000,R1,industry,7999.84546704883,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+12,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,30,2030.00000000000,R1,industry,5.32548948627,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+13,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,31,2035.00000000000,R1,industry,4.68666040470,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+14,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,32,2040.00000000000,R1,industry,2.04559221367,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+15,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,33,2045.00000000000,R1,industry,2.04559221537,procammonia_1,"('summer', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+16,A1,0.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,50,2030.00000000000,R1,industry,20214.22474762099,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+17,A1,1.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,51,2035.00000000000,R1,industry,17789.38949756446,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+18,A1,2.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,52,2040.00000000000,R1,industry,7764.55588836946,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+19,A1,3.00000000000,retrofit,PRODUCT|ENVIRONMENTAL,CO2f,R1,53,2045.00000000000,R1,industry,7764.55589482224,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/kt,2050.00000000000
+20,A1,0.00000000000,retrofit,PRODUCT,ammonia,R1,55,2030.00000000000,R1,industry,5.16885744278,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+21,A1,1.00000000000,retrofit,PRODUCT,ammonia,R1,56,2035.00000000000,R1,industry,4.54881745182,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+22,A1,2.00000000000,retrofit,PRODUCT,ammonia,R1,57,2040.00000000000,R1,industry,1.98542773688,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
+23,A1,3.00000000000,retrofit,PRODUCT,ammonia,R1,58,2045.00000000000,R1,industry,1.98542773853,procammonia_1,"('spring-autumn', 'all-week', 'all-day')",MUS$2010/Mt,2050.00000000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2020.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2020.csv
index fdbb2d279..d1ee882b2 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2020.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2020.csv
@@ -1,4 +1,4 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gassupply1,15.00000000000
-0,2025,R1,2020,gassupply1,15.00000000000
-0,2030,R1,2020,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gassupply1,2020,15.00000000000
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2025.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2025.csv
index 33746c9c2..d1fb99f56 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2025.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2025.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-0,2025,R1,2020,gassupply1,15.00000000000
-0,2030,R1,2020,gassupply1,7.50000000000
-1,2030,R1,2025,gassupply1,2.79440000000
-1,2035,R1,2025,gassupply1,2.79440000000
-1,2040,R1,2025,gassupply1,2.79440000000
-1,2045,R1,2025,gassupply1,2.79440000000
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
+asset,year,region,technology,installed,capacity
+0,2025,R1,gassupply1,2020,15.00000000000
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2030,R1,gassupply1,2025,2.79440000000
+1,2035,R1,gassupply1,2025,2.79440000000
+1,2040,R1,gassupply1,2025,2.79440000000
+1,2045,R1,gassupply1,2025,2.79440000000
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2030.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2030.csv
index 298f6c891..e84ef6dc7 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2030.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2030.csv
@@ -1,15 +1,15 @@
-asset,year,region,installed,technology,capacity
-0,2030,R1,2020,gassupply1,7.50000000000
-1,2030,R1,2025,gassupply1,2.79440000000
-1,2035,R1,2025,gassupply1,2.79440000000
-1,2040,R1,2025,gassupply1,2.79440000000
-1,2045,R1,2025,gassupply1,2.79440000000
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2035,R1,2030,gassupply1,7.50000000000
-2,2040,R1,2030,gassupply1,7.50000000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+0,2030,R1,gassupply1,2020,7.50000000000
+1,2030,R1,gassupply1,2025,2.79440000000
+1,2035,R1,gassupply1,2025,2.79440000000
+1,2040,R1,gassupply1,2025,2.79440000000
+1,2045,R1,gassupply1,2025,2.79440000000
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2035,R1,gassupply1,2030,7.50000000000
+2,2040,R1,gassupply1,2030,7.50000000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2035.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2035.csv
index e368dd50c..ccf34c3db 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2035.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2035.csv
@@ -1,13 +1,13 @@
-asset,year,region,installed,technology,capacity
-1,2035,R1,2025,gassupply1,2.79440000000
-1,2040,R1,2025,gassupply1,2.79440000000
-1,2045,R1,2025,gassupply1,2.79440000000
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2035,R1,2030,gassupply1,7.50000000000
-2,2040,R1,2030,gassupply1,7.50000000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2035,R1,gassupply1,2025,2.79440000000
+1,2040,R1,gassupply1,2025,2.79440000000
+1,2045,R1,gassupply1,2025,2.79440000000
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2035,R1,gassupply1,2030,7.50000000000
+2,2040,R1,gassupply1,2030,7.50000000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2040.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2040.csv
index 4d55f6f79..79fdfddb6 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2040.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2040.csv
@@ -1,11 +1,11 @@
-asset,year,region,installed,technology,capacity
-1,2040,R1,2025,gassupply1,2.79440000000
-1,2045,R1,2025,gassupply1,2.79440000000
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2040,R1,2030,gassupply1,7.50000000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2040,R1,gassupply1,2025,2.79440000000
+1,2045,R1,gassupply1,2025,2.79440000000
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2040,R1,gassupply1,2030,7.50000000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2045.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2045.csv
index e5d560fce..b2ca194fb 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2045.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2045.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-1,2045,R1,2025,gassupply1,2.79440000000
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2045,R1,2030,gassupply1,7.50000000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2045,R1,gassupply1,2025,2.79440000000
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2045,R1,gassupply1,2030,7.50000000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/tests/example_outputs/multiple_agents/Gas/Capacity/2050.csv b/tests/example_outputs/multiple_agents/Gas/Capacity/2050.csv
index 4a7d05fa4..4f3e3a180 100644
--- a/tests/example_outputs/multiple_agents/Gas/Capacity/2050.csv
+++ b/tests/example_outputs/multiple_agents/Gas/Capacity/2050.csv
@@ -1,9 +1,9 @@
-asset,year,region,installed,technology,capacity
-1,2050,R1,2025,gassupply1,2.79440000000
-1,2055,R1,2025,gassupply1,2.79440000000
-1,2064,R1,2025,gassupply1,2.79440000000
-2,2050,R1,2030,gassupply1,7.50000000000
-2,2055,R1,2030,gassupply1,7.50000000000
-2,2064,R1,2030,gassupply1,7.50000000000
-2,2065,R1,2030,gassupply1,7.50000000000
-2,2069,R1,2030,gassupply1,7.50000000000
+asset,year,region,technology,installed,capacity
+1,2050,R1,gassupply1,2025,2.79440000000
+1,2055,R1,gassupply1,2025,2.79440000000
+1,2064,R1,gassupply1,2025,2.79440000000
+2,2050,R1,gassupply1,2030,7.50000000000
+2,2055,R1,gassupply1,2030,7.50000000000
+2,2064,R1,gassupply1,2030,7.50000000000
+2,2065,R1,gassupply1,2030,7.50000000000
+2,2069,R1,gassupply1,2030,7.50000000000
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2020.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2020.csv
index 62349ecf1..bdc2b6a78 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2020.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2020.csv
@@ -1,16 +1,16 @@
-asset,year,region,installed,technology,capacity
-0,2020,R1,2020,gasCCGT,1.00000000000
-0,2025,R1,2020,gasCCGT,4.00000000000
-0,2030,R1,2020,gasCCGT,3.00000000000
-0,2035,R1,2020,gasCCGT,3.00000000000
-0,2040,R1,2020,gasCCGT,3.00000000000
-0,2045,R1,2020,gasCCGT,3.00000000000
-0,2049,R1,2020,gasCCGT,3.00000000000
-0,2050,R1,2020,gasCCGT,3.00000000000
-0,2059,R1,2020,gasCCGT,3.00000000000
-1,2025,R1,2020,windturbine,10.00000000000
-1,2030,R1,2020,windturbine,10.00000000000
-1,2035,R1,2020,windturbine,10.00000000000
-1,2040,R1,2020,windturbine,10.00000000000
-1,2045,R1,2020,windturbine,10.00000000000
-1,2049,R1,2020,windturbine,10.00000000000
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasCCGT,2020,1.00000000000
+0,2025,R1,gasCCGT,2020,4.00000000000
+0,2030,R1,gasCCGT,2020,3.00000000000
+0,2035,R1,gasCCGT,2020,3.00000000000
+0,2040,R1,gasCCGT,2020,3.00000000000
+0,2045,R1,gasCCGT,2020,3.00000000000
+0,2049,R1,gasCCGT,2020,3.00000000000
+0,2050,R1,gasCCGT,2020,3.00000000000
+0,2059,R1,gasCCGT,2020,3.00000000000
+1,2025,R1,windturbine,2020,10.00000000000
+1,2030,R1,windturbine,2020,10.00000000000
+1,2035,R1,windturbine,2020,10.00000000000
+1,2040,R1,windturbine,2020,10.00000000000
+1,2045,R1,windturbine,2020,10.00000000000
+1,2049,R1,windturbine,2020,10.00000000000
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2030.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2030.csv
index 62db4566a..a6c53c55f 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2030.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2030.csv
@@ -1,30 +1,30 @@
-asset,year,region,installed,technology,capacity
-0,2030,R1,2020,gasCCGT,3.00000000000
-0,2035,R1,2020,gasCCGT,3.00000000000
-0,2040,R1,2020,gasCCGT,3.00000000000
-0,2045,R1,2020,gasCCGT,3.00000000000
-0,2049,R1,2020,gasCCGT,3.00000000000
-0,2050,R1,2020,gasCCGT,3.00000000000
-0,2054,R1,2020,gasCCGT,3.00000000000
-0,2055,R1,2020,gasCCGT,3.00000000000
-0,2059,R1,2020,gasCCGT,3.00000000000
-1,2030,R1,2020,windturbine,10.00000000000
-1,2035,R1,2020,windturbine,10.00000000000
-1,2040,R1,2020,windturbine,10.00000000000
-1,2045,R1,2020,windturbine,10.00000000000
-1,2049,R1,2020,windturbine,10.00000000000
-2,2030,R1,2025,windturbine,9.15000000000
-2,2035,R1,2025,windturbine,9.15000000000
-2,2040,R1,2025,windturbine,9.15000000000
-2,2045,R1,2025,windturbine,9.15000000000
-2,2049,R1,2025,windturbine,9.15000000000
-2,2050,R1,2025,windturbine,9.15000000000
-2,2054,R1,2025,windturbine,9.15000000000
-3,2035,R1,2030,windturbine,6.00000000000
-3,2040,R1,2030,windturbine,6.00000000000
-3,2045,R1,2030,windturbine,6.00000000000
-3,2049,R1,2030,windturbine,6.00000000000
-3,2050,R1,2030,windturbine,6.00000000000
-3,2054,R1,2030,windturbine,6.00000000000
-3,2055,R1,2030,windturbine,6.00000000000
-3,2059,R1,2030,windturbine,6.00000000000
+asset,year,region,technology,installed,capacity
+0,2030,R1,gasCCGT,2020,3.00000000000
+0,2035,R1,gasCCGT,2020,3.00000000000
+0,2040,R1,gasCCGT,2020,3.00000000000
+0,2045,R1,gasCCGT,2020,3.00000000000
+0,2049,R1,gasCCGT,2020,3.00000000000
+0,2050,R1,gasCCGT,2020,3.00000000000
+0,2054,R1,gasCCGT,2020,3.00000000000
+0,2055,R1,gasCCGT,2020,3.00000000000
+0,2059,R1,gasCCGT,2020,3.00000000000
+1,2030,R1,windturbine,2020,10.00000000000
+1,2035,R1,windturbine,2020,10.00000000000
+1,2040,R1,windturbine,2020,10.00000000000
+1,2045,R1,windturbine,2020,10.00000000000
+1,2049,R1,windturbine,2020,10.00000000000
+2,2030,R1,windturbine,2025,9.15000000000
+2,2035,R1,windturbine,2025,9.15000000000
+2,2040,R1,windturbine,2025,9.15000000000
+2,2045,R1,windturbine,2025,9.15000000000
+2,2049,R1,windturbine,2025,9.15000000000
+2,2050,R1,windturbine,2025,9.15000000000
+2,2054,R1,windturbine,2025,9.15000000000
+3,2035,R1,windturbine,2030,6.00000000000
+3,2040,R1,windturbine,2030,6.00000000000
+3,2045,R1,windturbine,2030,6.00000000000
+3,2049,R1,windturbine,2030,6.00000000000
+3,2050,R1,windturbine,2030,6.00000000000
+3,2054,R1,windturbine,2030,6.00000000000
+3,2055,R1,windturbine,2030,6.00000000000
+3,2059,R1,windturbine,2030,6.00000000000
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2035.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2035.csv
index 048c07aed..60e997eaf 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2035.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2035.csv
@@ -1,36 +1,36 @@
-asset,year,region,installed,technology,capacity
-0,2035,R1,2020,gasCCGT,3.00000000000
-0,2040,R1,2020,gasCCGT,3.00000000000
-0,2045,R1,2020,gasCCGT,3.00000000000
-0,2049,R1,2020,gasCCGT,3.00000000000
-0,2050,R1,2020,gasCCGT,3.00000000000
-0,2054,R1,2020,gasCCGT,3.00000000000
-0,2055,R1,2020,gasCCGT,3.00000000000
-0,2059,R1,2020,gasCCGT,3.00000000000
-1,2035,R1,2020,windturbine,10.00000000000
-1,2040,R1,2020,windturbine,10.00000000000
-1,2045,R1,2020,windturbine,10.00000000000
-1,2049,R1,2020,windturbine,10.00000000000
-2,2035,R1,2025,windturbine,9.15000000000
-2,2040,R1,2025,windturbine,9.15000000000
-2,2045,R1,2025,windturbine,9.15000000000
-2,2049,R1,2025,windturbine,9.15000000000
-2,2050,R1,2025,windturbine,9.15000000000
-2,2054,R1,2025,windturbine,9.15000000000
-3,2035,R1,2030,windturbine,6.00000000000
-3,2040,R1,2030,windturbine,6.00000000000
-3,2045,R1,2030,windturbine,6.00000000000
-3,2049,R1,2030,windturbine,6.00000000000
-3,2050,R1,2030,windturbine,6.00000000000
-3,2054,R1,2030,windturbine,6.00000000000
-3,2055,R1,2030,windturbine,6.00000000000
-3,2059,R1,2030,windturbine,6.00000000000
-4,2040,R1,2035,windturbine,9.19000000000
-4,2045,R1,2035,windturbine,9.19000000000
-4,2049,R1,2035,windturbine,9.19000000000
-4,2050,R1,2035,windturbine,9.19000000000
-4,2054,R1,2035,windturbine,9.19000000000
-4,2055,R1,2035,windturbine,9.19000000000
-4,2059,R1,2035,windturbine,9.19000000000
-4,2060,R1,2035,windturbine,9.19000000000
-4,2064,R1,2035,windturbine,9.19000000000
+asset,year,region,technology,installed,capacity
+0,2035,R1,gasCCGT,2020,3.00000000000
+0,2040,R1,gasCCGT,2020,3.00000000000
+0,2045,R1,gasCCGT,2020,3.00000000000
+0,2049,R1,gasCCGT,2020,3.00000000000
+0,2050,R1,gasCCGT,2020,3.00000000000
+0,2054,R1,gasCCGT,2020,3.00000000000
+0,2055,R1,gasCCGT,2020,3.00000000000
+0,2059,R1,gasCCGT,2020,3.00000000000
+1,2035,R1,windturbine,2020,10.00000000000
+1,2040,R1,windturbine,2020,10.00000000000
+1,2045,R1,windturbine,2020,10.00000000000
+1,2049,R1,windturbine,2020,10.00000000000
+2,2035,R1,windturbine,2025,9.15000000000
+2,2040,R1,windturbine,2025,9.15000000000
+2,2045,R1,windturbine,2025,9.15000000000
+2,2049,R1,windturbine,2025,9.15000000000
+2,2050,R1,windturbine,2025,9.15000000000
+2,2054,R1,windturbine,2025,9.15000000000
+3,2035,R1,windturbine,2030,6.00000000000
+3,2040,R1,windturbine,2030,6.00000000000
+3,2045,R1,windturbine,2030,6.00000000000
+3,2049,R1,windturbine,2030,6.00000000000
+3,2050,R1,windturbine,2030,6.00000000000
+3,2054,R1,windturbine,2030,6.00000000000
+3,2055,R1,windturbine,2030,6.00000000000
+3,2059,R1,windturbine,2030,6.00000000000
+4,2040,R1,windturbine,2035,9.19000000000
+4,2045,R1,windturbine,2035,9.19000000000
+4,2049,R1,windturbine,2035,9.19000000000
+4,2050,R1,windturbine,2035,9.19000000000
+4,2054,R1,windturbine,2035,9.19000000000
+4,2055,R1,windturbine,2035,9.19000000000
+4,2059,R1,windturbine,2035,9.19000000000
+4,2060,R1,windturbine,2035,9.19000000000
+4,2064,R1,windturbine,2035,9.19000000000
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2040.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2040.csv
index 715ec9ef6..1cba828be 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2040.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2040.csv
@@ -1,42 +1,42 @@
-asset,year,region,installed,technology,capacity
-0,2040,R1,2020,gasCCGT,3.00000000000
-0,2045,R1,2020,gasCCGT,3.00000000000
-0,2049,R1,2020,gasCCGT,3.00000000000
-0,2050,R1,2020,gasCCGT,3.00000000000
-0,2054,R1,2020,gasCCGT,3.00000000000
-0,2055,R1,2020,gasCCGT,3.00000000000
-0,2059,R1,2020,gasCCGT,3.00000000000
-1,2040,R1,2020,windturbine,10.00000000000
-1,2045,R1,2020,windturbine,10.00000000000
-1,2049,R1,2020,windturbine,10.00000000000
-2,2040,R1,2025,windturbine,9.15000000000
-2,2045,R1,2025,windturbine,9.15000000000
-2,2049,R1,2025,windturbine,9.15000000000
-2,2050,R1,2025,windturbine,9.15000000000
-2,2054,R1,2025,windturbine,9.15000000000
-3,2040,R1,2030,windturbine,6.00000000000
-3,2045,R1,2030,windturbine,6.00000000000
-3,2049,R1,2030,windturbine,6.00000000000
-3,2050,R1,2030,windturbine,6.00000000000
-3,2054,R1,2030,windturbine,6.00000000000
-3,2055,R1,2030,windturbine,6.00000000000
-3,2059,R1,2030,windturbine,6.00000000000
-4,2040,R1,2035,windturbine,9.19000000000
-4,2045,R1,2035,windturbine,9.19000000000
-4,2049,R1,2035,windturbine,9.19000000000
-4,2050,R1,2035,windturbine,9.19000000000
-4,2054,R1,2035,windturbine,9.19000000000
-4,2055,R1,2035,windturbine,9.19000000000
-4,2059,R1,2035,windturbine,9.19000000000
-4,2060,R1,2035,windturbine,9.19000000000
-4,2064,R1,2035,windturbine,9.19000000000
-5,2045,R1,2040,windturbine,6.00000000000
-5,2049,R1,2040,windturbine,6.00000000000
-5,2050,R1,2040,windturbine,6.00000000000
-5,2054,R1,2040,windturbine,6.00000000000
-5,2055,R1,2040,windturbine,6.00000000000
-5,2059,R1,2040,windturbine,6.00000000000
-5,2060,R1,2040,windturbine,6.00000000000
-5,2064,R1,2040,windturbine,6.00000000000
-5,2065,R1,2040,windturbine,6.00000000000
-5,2069,R1,2040,windturbine,6.00000000000
+asset,year,region,technology,installed,capacity
+0,2040,R1,gasCCGT,2020,3.00000000000
+0,2045,R1,gasCCGT,2020,3.00000000000
+0,2049,R1,gasCCGT,2020,3.00000000000
+0,2050,R1,gasCCGT,2020,3.00000000000
+0,2054,R1,gasCCGT,2020,3.00000000000
+0,2055,R1,gasCCGT,2020,3.00000000000
+0,2059,R1,gasCCGT,2020,3.00000000000
+1,2040,R1,windturbine,2020,10.00000000000
+1,2045,R1,windturbine,2020,10.00000000000
+1,2049,R1,windturbine,2020,10.00000000000
+2,2040,R1,windturbine,2025,9.15000000000
+2,2045,R1,windturbine,2025,9.15000000000
+2,2049,R1,windturbine,2025,9.15000000000
+2,2050,R1,windturbine,2025,9.15000000000
+2,2054,R1,windturbine,2025,9.15000000000
+3,2040,R1,windturbine,2030,6.00000000000
+3,2045,R1,windturbine,2030,6.00000000000
+3,2049,R1,windturbine,2030,6.00000000000
+3,2050,R1,windturbine,2030,6.00000000000
+3,2054,R1,windturbine,2030,6.00000000000
+3,2055,R1,windturbine,2030,6.00000000000
+3,2059,R1,windturbine,2030,6.00000000000
+4,2040,R1,windturbine,2035,9.19000000000
+4,2045,R1,windturbine,2035,9.19000000000
+4,2049,R1,windturbine,2035,9.19000000000
+4,2050,R1,windturbine,2035,9.19000000000
+4,2054,R1,windturbine,2035,9.19000000000
+4,2055,R1,windturbine,2035,9.19000000000
+4,2059,R1,windturbine,2035,9.19000000000
+4,2060,R1,windturbine,2035,9.19000000000
+4,2064,R1,windturbine,2035,9.19000000000
+5,2045,R1,windturbine,2040,6.00000000000
+5,2049,R1,windturbine,2040,6.00000000000
+5,2050,R1,windturbine,2040,6.00000000000
+5,2054,R1,windturbine,2040,6.00000000000
+5,2055,R1,windturbine,2040,6.00000000000
+5,2059,R1,windturbine,2040,6.00000000000
+5,2060,R1,windturbine,2040,6.00000000000
+5,2064,R1,windturbine,2040,6.00000000000
+5,2065,R1,windturbine,2040,6.00000000000
+5,2069,R1,windturbine,2040,6.00000000000
diff --git a/tests/example_outputs/multiple_agents/Power/Capacity/2050.csv b/tests/example_outputs/multiple_agents/Power/Capacity/2050.csv
index 6fa217fce..13bd77c97 100644
--- a/tests/example_outputs/multiple_agents/Power/Capacity/2050.csv
+++ b/tests/example_outputs/multiple_agents/Power/Capacity/2050.csv
@@ -1,45 +1,45 @@
-asset,year,region,installed,technology,capacity
-0,2050,R1,2020,gasCCGT,3.00000000000
-0,2054,R1,2020,gasCCGT,3.00000000000
-0,2055,R1,2020,gasCCGT,3.00000000000
-0,2059,R1,2020,gasCCGT,3.00000000000
-2,2050,R1,2025,windturbine,9.15000000000
-2,2054,R1,2025,windturbine,9.15000000000
-3,2050,R1,2030,windturbine,6.00000000000
-3,2054,R1,2030,windturbine,6.00000000000
-3,2055,R1,2030,windturbine,6.00000000000
-3,2059,R1,2030,windturbine,6.00000000000
-4,2050,R1,2035,windturbine,9.19000000000
-4,2054,R1,2035,windturbine,9.19000000000
-4,2055,R1,2035,windturbine,9.19000000000
-4,2059,R1,2035,windturbine,9.19000000000
-4,2060,R1,2035,windturbine,9.19000000000
-4,2064,R1,2035,windturbine,9.19000000000
-5,2050,R1,2040,windturbine,6.00000000000
-5,2054,R1,2040,windturbine,6.00000000000
-5,2055,R1,2040,windturbine,6.00000000000
-5,2059,R1,2040,windturbine,6.00000000000
-5,2060,R1,2040,windturbine,6.00000000000
-5,2064,R1,2040,windturbine,6.00000000000
-5,2065,R1,2040,windturbine,6.00000000000
-5,2069,R1,2040,windturbine,6.00000000000
-6,2050,R1,2045,windturbine,16.91000000000
-6,2054,R1,2045,windturbine,16.91000000000
-6,2055,R1,2045,windturbine,16.91000000000
-6,2059,R1,2045,windturbine,16.91000000000
-6,2060,R1,2045,windturbine,16.91000000000
-6,2064,R1,2045,windturbine,16.91000000000
-6,2065,R1,2045,windturbine,16.91000000000
-6,2069,R1,2045,windturbine,16.91000000000
-6,2070,R1,2045,windturbine,16.91000000000
-6,2074,R1,2045,windturbine,16.91000000000
-7,2055,R1,2050,windturbine,9.15000000000
-7,2059,R1,2050,windturbine,9.15000000000
-7,2060,R1,2050,windturbine,9.15000000000
-7,2064,R1,2050,windturbine,9.15000000000
-7,2065,R1,2050,windturbine,9.15000000000
-7,2069,R1,2050,windturbine,9.15000000000
-7,2070,R1,2050,windturbine,9.15000000000
-7,2074,R1,2050,windturbine,9.15000000000
-7,2075,R1,2050,windturbine,9.15000000000
-7,2079,R1,2050,windturbine,9.15000000000
+asset,year,region,technology,installed,capacity
+0,2050,R1,gasCCGT,2020,3.00000000000
+0,2054,R1,gasCCGT,2020,3.00000000000
+0,2055,R1,gasCCGT,2020,3.00000000000
+0,2059,R1,gasCCGT,2020,3.00000000000
+2,2050,R1,windturbine,2025,9.15000000000
+2,2054,R1,windturbine,2025,9.15000000000
+3,2050,R1,windturbine,2030,6.00000000000
+3,2054,R1,windturbine,2030,6.00000000000
+3,2055,R1,windturbine,2030,6.00000000000
+3,2059,R1,windturbine,2030,6.00000000000
+4,2050,R1,windturbine,2035,9.19000000000
+4,2054,R1,windturbine,2035,9.19000000000
+4,2055,R1,windturbine,2035,9.19000000000
+4,2059,R1,windturbine,2035,9.19000000000
+4,2060,R1,windturbine,2035,9.19000000000
+4,2064,R1,windturbine,2035,9.19000000000
+5,2050,R1,windturbine,2040,6.00000000000
+5,2054,R1,windturbine,2040,6.00000000000
+5,2055,R1,windturbine,2040,6.00000000000
+5,2059,R1,windturbine,2040,6.00000000000
+5,2060,R1,windturbine,2040,6.00000000000
+5,2064,R1,windturbine,2040,6.00000000000
+5,2065,R1,windturbine,2040,6.00000000000
+5,2069,R1,windturbine,2040,6.00000000000
+6,2050,R1,windturbine,2045,16.91000000000
+6,2054,R1,windturbine,2045,16.91000000000
+6,2055,R1,windturbine,2045,16.91000000000
+6,2059,R1,windturbine,2045,16.91000000000
+6,2060,R1,windturbine,2045,16.91000000000
+6,2064,R1,windturbine,2045,16.91000000000
+6,2065,R1,windturbine,2045,16.91000000000
+6,2069,R1,windturbine,2045,16.91000000000
+6,2070,R1,windturbine,2045,16.91000000000
+6,2074,R1,windturbine,2045,16.91000000000
+7,2055,R1,windturbine,2050,9.15000000000
+7,2059,R1,windturbine,2050,9.15000000000
+7,2060,R1,windturbine,2050,9.15000000000
+7,2064,R1,windturbine,2050,9.15000000000
+7,2065,R1,windturbine,2050,9.15000000000
+7,2069,R1,windturbine,2050,9.15000000000
+7,2070,R1,windturbine,2050,9.15000000000
+7,2074,R1,windturbine,2050,9.15000000000
+7,2075,R1,windturbine,2050,9.15000000000
+7,2079,R1,windturbine,2050,9.15000000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Capacity/2050.csv b/tests/example_outputs/multiple_agents/Residential/Capacity/2050.csv
index 305b627b2..42f4be20c 100644
--- a/tests/example_outputs/multiple_agents/Residential/Capacity/2050.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Capacity/2050.csv
@@ -1,11 +1,11 @@
-asset,year,region,installed,technology,capacity
-2,2050,R1,2040,heatpump,31.00000000000
-2,2054,R1,2040,heatpump,31.00000000000
-3,2050,R1,2045,heatpump,23.00000000000
-3,2054,R1,2045,heatpump,23.00000000000
-3,2055,R1,2045,heatpump,23.00000000000
-3,2059,R1,2045,heatpump,23.00000000000
-4,2055,R1,2050,heatpump,31.00000000000
-4,2059,R1,2050,heatpump,31.00000000000
-4,2060,R1,2050,heatpump,31.00000000000
-4,2064,R1,2050,heatpump,31.00000000000
+asset,year,region,technology,installed,capacity
+2,2050,R1,heatpump,2040,31.00000000000
+2,2054,R1,heatpump,2040,31.00000000000
+3,2050,R1,heatpump,2045,23.00000000000
+3,2054,R1,heatpump,2045,23.00000000000
+3,2055,R1,heatpump,2045,23.00000000000
+3,2059,R1,heatpump,2045,23.00000000000
+4,2055,R1,heatpump,2050,31.00000000000
+4,2059,R1,heatpump,2050,31.00000000000
+4,2060,R1,heatpump,2050,31.00000000000
+4,2064,R1,heatpump,2050,31.00000000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2020.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2020.csv
index a44059a3e..7b8c4061d 100644
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2020.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Supply/2020.csv
@@ -1,31 +1,31 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2020,0,R1,gasboiler,2020,all-year,all-week,night,1.00000000000
-0,heat,2025,0,R1,gasboiler,2020,all-year,all-week,night,0.27780000000
-0,heat,2025,1,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,night,64.71000000000
-0,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,night,17.97500000000
-1,heat,2020,0,R1,gasboiler,2020,all-year,all-week,morning,1.50000000000
-1,heat,2025,0,R1,gasboiler,2020,all-year,all-week,morning,0.41670000000
-1,heat,2025,1,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,morning,97.06500000000
-1,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,morning,26.96250000000
-2,heat,2020,0,R1,gasboiler,2020,all-year,all-week,afternoon,1.00000000000
-2,heat,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.27780000000
-2,heat,2025,1,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,afternoon,64.71000000000
-2,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,17.97500000000
-3,heat,2020,0,R1,gasboiler,2020,all-year,all-week,early-peak,1.50000000000
-3,heat,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.41670000000
-3,heat,2025,1,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,early-peak,97.06500000000
-3,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,26.96250000000
-4,heat,2020,0,R1,gasboiler,2020,all-year,all-week,late-peak,3.00000000000
-4,heat,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,0.83330000000
-4,heat,2025,1,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,late-peak,194.13000000000
-4,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,53.92500000000
-5,heat,2020,0,R1,gasboiler,2020,all-year,all-week,evening,2.00000000000
-5,heat,2025,0,R1,gasboiler,2020,all-year,all-week,evening,0.55560000000
-5,heat,2025,1,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,CO2f,2020,0,R1,gasboiler,2020,all-year,all-week,evening,129.42000000000
-5,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,evening,35.95000000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2020,0,R1,all-year,all-week,night,gasboiler,2020,1.00000000000
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+0,heat,2025,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,CO2f,2020,0,R1,all-year,all-week,night,gasboiler,2020,64.71000000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+1,heat,2020,0,R1,all-year,all-week,morning,gasboiler,2020,1.50000000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+1,heat,2025,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,CO2f,2020,0,R1,all-year,all-week,morning,gasboiler,2020,97.06500000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+2,heat,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,1.00000000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+2,heat,2025,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,CO2f,2020,0,R1,all-year,all-week,afternoon,gasboiler,2020,64.71000000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+3,heat,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,1.50000000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+3,heat,2025,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,CO2f,2020,0,R1,all-year,all-week,early-peak,gasboiler,2020,97.06500000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+4,heat,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,3.00000000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+4,heat,2025,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,CO2f,2020,0,R1,all-year,all-week,late-peak,gasboiler,2020,194.13000000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+5,heat,2020,0,R1,all-year,all-week,evening,gasboiler,2020,2.00000000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+5,heat,2025,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,CO2f,2020,0,R1,all-year,all-week,evening,gasboiler,2020,129.42000000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2025.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2025.csv
index c9ed8c00b..bfe116d0b 100644
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2025.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Supply/2025.csv
@@ -1,43 +1,43 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2025,0,R1,gasboiler,2020,all-year,all-week,night,0.27780000000
-0,heat,2025,2,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,heat,2030,1,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2030,2,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,heat,2030,3,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,night,17.97500000000
-0,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-1,heat,2025,0,R1,gasboiler,2020,all-year,all-week,morning,0.41670000000
-1,heat,2025,2,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,heat,2030,1,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2030,2,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,heat,2030,3,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,morning,26.96250000000
-1,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-2,heat,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,0.27780000000
-2,heat,2025,2,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,heat,2030,1,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2030,2,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,heat,2030,3,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,afternoon,17.97500000000
-2,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-3,heat,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,0.41670000000
-3,heat,2025,2,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,heat,2030,1,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2030,2,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,heat,2030,3,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,early-peak,26.96250000000
-3,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-4,heat,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,0.83330000000
-4,heat,2025,2,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,heat,2030,1,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2030,2,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,heat,2030,3,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,late-peak,53.92500000000
-4,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-5,heat,2025,0,R1,gasboiler,2020,all-year,all-week,evening,0.55560000000
-5,heat,2025,2,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,heat,2030,1,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2030,2,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,heat,2030,3,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,CO2f,2025,0,R1,gasboiler,2020,all-year,all-week,evening,35.95000000000
-5,CO2f,2030,1,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2025,0,R1,all-year,all-week,night,gasboiler,2020,0.27780000000
+0,heat,2025,2,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,1,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,3,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,CO2f,2025,0,R1,all-year,all-week,night,gasboiler,2020,17.97500000000
+0,CO2f,2030,1,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+1,heat,2025,0,R1,all-year,all-week,morning,gasboiler,2020,0.41670000000
+1,heat,2025,2,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,1,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,3,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,CO2f,2025,0,R1,all-year,all-week,morning,gasboiler,2020,26.96250000000
+1,CO2f,2030,1,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+2,heat,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,0.27780000000
+2,heat,2025,2,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,3,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,CO2f,2025,0,R1,all-year,all-week,afternoon,gasboiler,2020,17.97500000000
+2,CO2f,2030,1,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+3,heat,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,0.41670000000
+3,heat,2025,2,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,3,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,CO2f,2025,0,R1,all-year,all-week,early-peak,gasboiler,2020,26.96250000000
+3,CO2f,2030,1,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+4,heat,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,0.83330000000
+4,heat,2025,2,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,3,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,CO2f,2025,0,R1,all-year,all-week,late-peak,gasboiler,2020,53.92500000000
+4,CO2f,2030,1,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+5,heat,2025,0,R1,all-year,all-week,evening,gasboiler,2020,0.55560000000
+5,heat,2025,2,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,1,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,3,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,CO2f,2025,0,R1,all-year,all-week,evening,gasboiler,2020,35.95000000000
+5,CO2f,2030,1,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2030.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2030.csv
index 61ae11982..82873caab 100644
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2030.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Supply/2030.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2030,0,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2030,1,R1,heatpump,2020,all-year,all-week,night,1.05560000000
-0,heat,2030,2,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,heat,2035,0,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2035,2,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,heat,2035,3,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-0,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-1,heat,2030,0,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2030,1,R1,heatpump,2020,all-year,all-week,morning,1.58330000000
-1,heat,2030,2,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,heat,2035,0,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2035,2,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,heat,2035,3,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-1,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-2,heat,2030,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2030,1,R1,heatpump,2020,all-year,all-week,afternoon,1.05560000000
-2,heat,2030,2,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,heat,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2035,2,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,heat,2035,3,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-2,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-3,heat,2030,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2030,1,R1,heatpump,2020,all-year,all-week,early-peak,1.58330000000
-3,heat,2030,2,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,heat,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2035,2,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,heat,2035,3,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-3,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-4,heat,2030,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2030,1,R1,heatpump,2020,all-year,all-week,late-peak,3.16670000000
-4,heat,2030,2,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,heat,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2035,2,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,heat,2035,3,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-4,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-5,heat,2030,0,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2030,1,R1,heatpump,2020,all-year,all-week,evening,2.11110000000
-5,heat,2030,2,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,heat,2035,0,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2035,2,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,heat,2035,3,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,CO2f,2030,0,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
-5,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2030,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2030,1,R1,all-year,all-week,night,heatpump,2020,1.05560000000
+0,heat,2030,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,CO2f,2030,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+1,heat,2030,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2030,1,R1,all-year,all-week,morning,heatpump,2020,1.58330000000
+1,heat,2030,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,CO2f,2030,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+2,heat,2030,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2030,1,R1,all-year,all-week,afternoon,heatpump,2020,1.05560000000
+2,heat,2030,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,CO2f,2030,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+3,heat,2030,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2030,1,R1,all-year,all-week,early-peak,heatpump,2020,1.58330000000
+3,heat,2030,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,CO2f,2030,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+4,heat,2030,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2030,1,R1,all-year,all-week,late-peak,heatpump,2020,3.16670000000
+4,heat,2030,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,CO2f,2030,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+5,heat,2030,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2030,1,R1,all-year,all-week,evening,heatpump,2020,2.11110000000
+5,heat,2030,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,CO2f,2030,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2035.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2035.csv
index 89e0bd4e1..741ea3c65 100644
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2035.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Supply/2035.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2035,0,R1,gasboiler,2025,all-year,all-week,night,0.22780000000
-0,heat,2035,2,R1,heatpump,2025,all-year,all-week,night,0.38330000000
-0,heat,2035,3,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,heat,2040,1,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2040,3,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,heat,2040,4,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,night,14.73950000000
-0,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-1,heat,2035,0,R1,gasboiler,2025,all-year,all-week,morning,0.34170000000
-1,heat,2035,2,R1,heatpump,2025,all-year,all-week,morning,0.57500000000
-1,heat,2035,3,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,heat,2040,1,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2040,3,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,heat,2040,4,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,morning,22.10920000000
-1,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-2,heat,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,0.22780000000
-2,heat,2035,2,R1,heatpump,2025,all-year,all-week,afternoon,0.38330000000
-2,heat,2035,3,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,heat,2040,1,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2040,3,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,heat,2040,4,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,afternoon,14.73950000000
-2,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-3,heat,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,0.34170000000
-3,heat,2035,2,R1,heatpump,2025,all-year,all-week,early-peak,0.57500000000
-3,heat,2035,3,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,heat,2040,1,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2040,3,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,heat,2040,4,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,early-peak,22.10920000000
-3,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-4,heat,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,0.68330000000
-4,heat,2035,2,R1,heatpump,2025,all-year,all-week,late-peak,1.15000000000
-4,heat,2035,3,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,heat,2040,1,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2040,3,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,heat,2040,4,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,late-peak,44.21850000000
-4,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-5,heat,2035,0,R1,gasboiler,2025,all-year,all-week,evening,0.45560000000
-5,heat,2035,2,R1,heatpump,2025,all-year,all-week,evening,0.76670000000
-5,heat,2035,3,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,heat,2040,1,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2040,3,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,heat,2040,4,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,CO2f,2035,0,R1,gasboiler,2025,all-year,all-week,evening,29.47900000000
-5,CO2f,2040,1,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2035,0,R1,all-year,all-week,night,gasboiler,2025,0.22780000000
+0,heat,2035,2,R1,all-year,all-week,night,heatpump,2025,0.38330000000
+0,heat,2035,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,1,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2040,3,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,4,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,CO2f,2035,0,R1,all-year,all-week,night,gasboiler,2025,14.73950000000
+0,CO2f,2040,1,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+1,heat,2035,0,R1,all-year,all-week,morning,gasboiler,2025,0.34170000000
+1,heat,2035,2,R1,all-year,all-week,morning,heatpump,2025,0.57500000000
+1,heat,2035,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,1,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2040,3,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,4,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,CO2f,2035,0,R1,all-year,all-week,morning,gasboiler,2025,22.10920000000
+1,CO2f,2040,1,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+2,heat,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,0.22780000000
+2,heat,2035,2,R1,all-year,all-week,afternoon,heatpump,2025,0.38330000000
+2,heat,2035,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,1,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2040,3,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,4,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,CO2f,2035,0,R1,all-year,all-week,afternoon,gasboiler,2025,14.73950000000
+2,CO2f,2040,1,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+3,heat,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,0.34170000000
+3,heat,2035,2,R1,all-year,all-week,early-peak,heatpump,2025,0.57500000000
+3,heat,2035,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,1,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2040,3,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,4,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,CO2f,2035,0,R1,all-year,all-week,early-peak,gasboiler,2025,22.10920000000
+3,CO2f,2040,1,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+4,heat,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,0.68330000000
+4,heat,2035,2,R1,all-year,all-week,late-peak,heatpump,2025,1.15000000000
+4,heat,2035,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,1,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2040,3,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,4,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,CO2f,2035,0,R1,all-year,all-week,late-peak,gasboiler,2025,44.21850000000
+4,CO2f,2040,1,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+5,heat,2035,0,R1,all-year,all-week,evening,gasboiler,2025,0.45560000000
+5,heat,2035,2,R1,all-year,all-week,evening,heatpump,2025,0.76670000000
+5,heat,2035,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,1,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2040,3,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,4,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,CO2f,2035,0,R1,all-year,all-week,evening,gasboiler,2025,29.47900000000
+5,CO2f,2040,1,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2040.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2040.csv
index 663e47a5a..c802f3409 100644
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2040.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Supply/2040.csv
@@ -1,49 +1,49 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2040,0,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2040,1,R1,heatpump,2030,all-year,all-week,night,1.38890000000
-0,heat,2040,2,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,heat,2045,0,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2045,2,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,heat,2045,3,R1,heatpump,2040,all-year,all-week,night,1.72220000000
-0,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-0,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-1,heat,2040,0,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2040,1,R1,heatpump,2030,all-year,all-week,morning,2.08330000000
-1,heat,2040,2,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,heat,2045,0,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2045,2,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,heat,2045,3,R1,heatpump,2040,all-year,all-week,morning,2.58330000000
-1,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-1,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-2,heat,2040,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2040,1,R1,heatpump,2030,all-year,all-week,afternoon,1.38890000000
-2,heat,2040,2,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,heat,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2045,2,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,heat,2045,3,R1,heatpump,2040,all-year,all-week,afternoon,1.72220000000
-2,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-2,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-3,heat,2040,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2040,1,R1,heatpump,2030,all-year,all-week,early-peak,2.08330000000
-3,heat,2040,2,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,heat,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2045,2,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,heat,2045,3,R1,heatpump,2040,all-year,all-week,early-peak,2.58330000000
-3,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-3,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-4,heat,2040,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2040,1,R1,heatpump,2030,all-year,all-week,late-peak,4.16670000000
-4,heat,2040,2,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,heat,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2045,2,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,heat,2045,3,R1,heatpump,2040,all-year,all-week,late-peak,5.16670000000
-4,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-4,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-5,heat,2040,0,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2040,1,R1,heatpump,2030,all-year,all-week,evening,2.77780000000
-5,heat,2040,2,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,heat,2045,0,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2045,2,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,heat,2045,3,R1,heatpump,2040,all-year,all-week,evening,3.44440000000
-5,CO2f,2040,0,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
-5,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2040,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2040,1,R1,all-year,all-week,night,heatpump,2030,1.38890000000
+0,heat,2040,2,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,heat,2045,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2045,2,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,heat,2045,3,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,CO2f,2040,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+0,CO2f,2045,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+1,heat,2040,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2040,1,R1,all-year,all-week,morning,heatpump,2030,2.08330000000
+1,heat,2040,2,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,heat,2045,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2045,2,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,heat,2045,3,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,CO2f,2040,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+1,CO2f,2045,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+2,heat,2040,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2040,1,R1,all-year,all-week,afternoon,heatpump,2030,1.38890000000
+2,heat,2040,2,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,heat,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2045,2,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,heat,2045,3,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,CO2f,2040,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+2,CO2f,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+3,heat,2040,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2040,1,R1,all-year,all-week,early-peak,heatpump,2030,2.08330000000
+3,heat,2040,2,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,heat,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2045,2,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,heat,2045,3,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,CO2f,2040,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+3,CO2f,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+4,heat,2040,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2040,1,R1,all-year,all-week,late-peak,heatpump,2030,4.16670000000
+4,heat,2040,2,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,heat,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2045,2,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,heat,2045,3,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,CO2f,2040,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+4,CO2f,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+5,heat,2040,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2040,1,R1,all-year,all-week,evening,heatpump,2030,2.77780000000
+5,heat,2040,2,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,heat,2045,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2045,2,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,heat,2045,3,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,CO2f,2040,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
+5,CO2f,2045,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2045.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2045.csv
index 6e2884e67..c7be86b20 100644
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2045.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Supply/2045.csv
@@ -1,37 +1,37 @@
-timeslice,commodity,year,asset,region,technology,installed,month,day,hour,supply
-0,heat,2045,0,R1,gasboiler,2035,all-year,all-week,night,0.05060000000
-0,heat,2045,1,R1,heatpump,2035,all-year,all-week,night,0.89390000000
-0,heat,2045,2,R1,heatpump,2040,all-year,all-week,night,1.72220000000
-0,heat,2050,2,R1,heatpump,2040,all-year,all-week,night,1.72220000000
-0,heat,2050,3,R1,heatpump,2045,all-year,all-week,night,1.27780000000
-0,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,night,3.27140000000
-1,heat,2045,0,R1,gasboiler,2035,all-year,all-week,morning,0.07580000000
-1,heat,2045,1,R1,heatpump,2035,all-year,all-week,morning,1.34080000000
-1,heat,2045,2,R1,heatpump,2040,all-year,all-week,morning,2.58330000000
-1,heat,2050,2,R1,heatpump,2040,all-year,all-week,morning,2.58330000000
-1,heat,2050,3,R1,heatpump,2045,all-year,all-week,morning,1.91670000000
-1,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,morning,4.90720000000
-2,heat,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,0.05060000000
-2,heat,2045,1,R1,heatpump,2035,all-year,all-week,afternoon,0.89390000000
-2,heat,2045,2,R1,heatpump,2040,all-year,all-week,afternoon,1.72220000000
-2,heat,2050,2,R1,heatpump,2040,all-year,all-week,afternoon,1.72220000000
-2,heat,2050,3,R1,heatpump,2045,all-year,all-week,afternoon,1.27780000000
-2,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,afternoon,3.27140000000
-3,heat,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,0.07580000000
-3,heat,2045,1,R1,heatpump,2035,all-year,all-week,early-peak,1.34080000000
-3,heat,2045,2,R1,heatpump,2040,all-year,all-week,early-peak,2.58330000000
-3,heat,2050,2,R1,heatpump,2040,all-year,all-week,early-peak,2.58330000000
-3,heat,2050,3,R1,heatpump,2045,all-year,all-week,early-peak,1.91670000000
-3,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,early-peak,4.90720000000
-4,heat,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,0.15170000000
-4,heat,2045,1,R1,heatpump,2035,all-year,all-week,late-peak,2.68170000000
-4,heat,2045,2,R1,heatpump,2040,all-year,all-week,late-peak,5.16670000000
-4,heat,2050,2,R1,heatpump,2040,all-year,all-week,late-peak,5.16670000000
-4,heat,2050,3,R1,heatpump,2045,all-year,all-week,late-peak,3.83330000000
-4,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,late-peak,9.81430000000
-5,heat,2045,0,R1,gasboiler,2035,all-year,all-week,evening,0.10110000000
-5,heat,2045,1,R1,heatpump,2035,all-year,all-week,evening,1.78780000000
-5,heat,2045,2,R1,heatpump,2040,all-year,all-week,evening,3.44440000000
-5,heat,2050,2,R1,heatpump,2040,all-year,all-week,evening,3.44440000000
-5,heat,2050,3,R1,heatpump,2045,all-year,all-week,evening,2.55560000000
-5,CO2f,2045,0,R1,gasboiler,2035,all-year,all-week,evening,6.54290000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2045,0,R1,all-year,all-week,night,gasboiler,2035,0.05060000000
+0,heat,2045,1,R1,all-year,all-week,night,heatpump,2035,0.89390000000
+0,heat,2045,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,CO2f,2045,0,R1,all-year,all-week,night,gasboiler,2035,3.27140000000
+1,heat,2045,0,R1,all-year,all-week,morning,gasboiler,2035,0.07580000000
+1,heat,2045,1,R1,all-year,all-week,morning,heatpump,2035,1.34080000000
+1,heat,2045,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,CO2f,2045,0,R1,all-year,all-week,morning,gasboiler,2035,4.90720000000
+2,heat,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,0.05060000000
+2,heat,2045,1,R1,all-year,all-week,afternoon,heatpump,2035,0.89390000000
+2,heat,2045,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,CO2f,2045,0,R1,all-year,all-week,afternoon,gasboiler,2035,3.27140000000
+3,heat,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,0.07580000000
+3,heat,2045,1,R1,all-year,all-week,early-peak,heatpump,2035,1.34080000000
+3,heat,2045,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,CO2f,2045,0,R1,all-year,all-week,early-peak,gasboiler,2035,4.90720000000
+4,heat,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,0.15170000000
+4,heat,2045,1,R1,all-year,all-week,late-peak,heatpump,2035,2.68170000000
+4,heat,2045,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,CO2f,2045,0,R1,all-year,all-week,late-peak,gasboiler,2035,9.81430000000
+5,heat,2045,0,R1,all-year,all-week,evening,gasboiler,2035,0.10110000000
+5,heat,2045,1,R1,all-year,all-week,evening,heatpump,2035,1.78780000000
+5,heat,2045,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,CO2f,2045,0,R1,all-year,all-week,evening,gasboiler,2035,6.54290000000
diff --git a/tests/example_outputs/multiple_agents/Residential/Supply/2050.csv b/tests/example_outputs/multiple_agents/Residential/Supply/2050.csv
index 61004cae8..8c1871538 100644
--- a/tests/example_outputs/multiple_agents/Residential/Supply/2050.csv
+++ b/tests/example_outputs/multiple_agents/Residential/Supply/2050.csv
@@ -1,25 +1,25 @@
-timeslice,commodity,year,asset,region,installed,technology,month,day,hour,supply
-0,heat,2050,2,R1,2040,heatpump,all-year,all-week,night,1.72220000000
-0,heat,2050,3,R1,2045,heatpump,all-year,all-week,night,1.27780000000
-0,heat,2055,3,R1,2045,heatpump,all-year,all-week,night,1.27780000000
-0,heat,2055,4,R1,2050,heatpump,all-year,all-week,night,1.72220000000
-1,heat,2050,2,R1,2040,heatpump,all-year,all-week,morning,2.58330000000
-1,heat,2050,3,R1,2045,heatpump,all-year,all-week,morning,1.91670000000
-1,heat,2055,3,R1,2045,heatpump,all-year,all-week,morning,1.91670000000
-1,heat,2055,4,R1,2050,heatpump,all-year,all-week,morning,2.58330000000
-2,heat,2050,2,R1,2040,heatpump,all-year,all-week,afternoon,1.72220000000
-2,heat,2050,3,R1,2045,heatpump,all-year,all-week,afternoon,1.27780000000
-2,heat,2055,3,R1,2045,heatpump,all-year,all-week,afternoon,1.27780000000
-2,heat,2055,4,R1,2050,heatpump,all-year,all-week,afternoon,1.72220000000
-3,heat,2050,2,R1,2040,heatpump,all-year,all-week,early-peak,2.58330000000
-3,heat,2050,3,R1,2045,heatpump,all-year,all-week,early-peak,1.91670000000
-3,heat,2055,3,R1,2045,heatpump,all-year,all-week,early-peak,1.91670000000
-3,heat,2055,4,R1,2050,heatpump,all-year,all-week,early-peak,2.58330000000
-4,heat,2050,2,R1,2040,heatpump,all-year,all-week,late-peak,5.16670000000
-4,heat,2050,3,R1,2045,heatpump,all-year,all-week,late-peak,3.83330000000
-4,heat,2055,3,R1,2045,heatpump,all-year,all-week,late-peak,3.83330000000
-4,heat,2055,4,R1,2050,heatpump,all-year,all-week,late-peak,5.16670000000
-5,heat,2050,2,R1,2040,heatpump,all-year,all-week,evening,3.44440000000
-5,heat,2050,3,R1,2045,heatpump,all-year,all-week,evening,2.55560000000
-5,heat,2055,3,R1,2045,heatpump,all-year,all-week,evening,2.55560000000
-5,heat,2055,4,R1,2050,heatpump,all-year,all-week,evening,3.44440000000
+timeslice,commodity,year,asset,region,month,day,hour,technology,installed,supply
+0,heat,2050,2,R1,all-year,all-week,night,heatpump,2040,1.72220000000
+0,heat,2050,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,3,R1,all-year,all-week,night,heatpump,2045,1.27780000000
+0,heat,2055,4,R1,all-year,all-week,night,heatpump,2050,1.72220000000
+1,heat,2050,2,R1,all-year,all-week,morning,heatpump,2040,2.58330000000
+1,heat,2050,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,3,R1,all-year,all-week,morning,heatpump,2045,1.91670000000
+1,heat,2055,4,R1,all-year,all-week,morning,heatpump,2050,2.58330000000
+2,heat,2050,2,R1,all-year,all-week,afternoon,heatpump,2040,1.72220000000
+2,heat,2050,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,3,R1,all-year,all-week,afternoon,heatpump,2045,1.27780000000
+2,heat,2055,4,R1,all-year,all-week,afternoon,heatpump,2050,1.72220000000
+3,heat,2050,2,R1,all-year,all-week,early-peak,heatpump,2040,2.58330000000
+3,heat,2050,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,3,R1,all-year,all-week,early-peak,heatpump,2045,1.91670000000
+3,heat,2055,4,R1,all-year,all-week,early-peak,heatpump,2050,2.58330000000
+4,heat,2050,2,R1,all-year,all-week,late-peak,heatpump,2040,5.16670000000
+4,heat,2050,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,3,R1,all-year,all-week,late-peak,heatpump,2045,3.83330000000
+4,heat,2055,4,R1,all-year,all-week,late-peak,heatpump,2050,5.16670000000
+5,heat,2050,2,R1,all-year,all-week,evening,heatpump,2040,3.44440000000
+5,heat,2050,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,3,R1,all-year,all-week,evening,heatpump,2045,2.55560000000
+5,heat,2055,4,R1,all-year,all-week,evening,heatpump,2050,3.44440000000
diff --git a/tests/example_outputs/trade/Gas/Capacity/2020.csv b/tests/example_outputs/trade/Gas/Capacity/2020.csv
new file mode 100644
index 000000000..a35c2ed52
--- /dev/null
+++ b/tests/example_outputs/trade/Gas/Capacity/2020.csv
@@ -0,0 +1,11 @@
+dst_region,year,asset,region,technology,installed,capacity
+R1,2020,0,R1,gassupply1,2010,3000.00000000000
+R2,2020,1,R2,gassupply1,2010,1200.00000000000
+R1,2025,0,R1,gassupply1,2010,2100.00000000000
+R2,2025,1,R2,gassupply1,2010,700.00000000000
+R1,2030,0,R1,gassupply1,2010,2100.00000000000
+R2,2030,1,R2,gassupply1,2010,700.00000000000
+R1,2040,0,R1,gassupply1,2010,1470.00000000000
+R2,2040,1,R2,gassupply1,2010,490.00000000000
+R1,2050,0,R1,gassupply1,2010,1029.00000000000
+R2,2050,1,R2,gassupply1,2010,343.00000000000
diff --git a/tests/example_outputs/trade/Gas/Capacity/2025.csv b/tests/example_outputs/trade/Gas/Capacity/2025.csv
new file mode 100644
index 000000000..9777d7947
--- /dev/null
+++ b/tests/example_outputs/trade/Gas/Capacity/2025.csv
@@ -0,0 +1,9 @@
+dst_region,year,asset,region,technology,installed,capacity
+R1,2025,0,R1,gassupply1,2010,2100.00000000000
+R2,2025,1,R2,gassupply1,2010,700.00000000000
+R1,2030,0,R1,gassupply1,2010,2100.00000000000
+R2,2030,1,R2,gassupply1,2010,700.00000000000
+R1,2040,0,R1,gassupply1,2010,1470.00000000000
+R2,2040,1,R2,gassupply1,2010,490.00000000000
+R1,2050,0,R1,gassupply1,2010,1029.00000000000
+R2,2050,1,R2,gassupply1,2010,343.00000000000
diff --git a/tests/example_outputs/trade/Gas/Capacity/2030.csv b/tests/example_outputs/trade/Gas/Capacity/2030.csv
new file mode 100644
index 000000000..023078ee8
--- /dev/null
+++ b/tests/example_outputs/trade/Gas/Capacity/2030.csv
@@ -0,0 +1,9 @@
+dst_region,year,asset,region,technology,installed,capacity
+R1,2030,0,R1,gassupply1,2010,2100.00000000000
+R2,2030,1,R2,gassupply1,2010,700.00000000000
+R1,2035,0,R1,gassupply1,2010,1470.00000000000
+R2,2035,1,R2,gassupply1,2010,490.00000000000
+R1,2040,0,R1,gassupply1,2010,1470.00000000000
+R2,2040,1,R2,gassupply1,2010,490.00000000000
+R1,2050,0,R1,gassupply1,2010,1029.00000000000
+R2,2050,1,R2,gassupply1,2010,343.00000000000
diff --git a/tests/example_outputs/trade/Gas/Capacity/2035.csv b/tests/example_outputs/trade/Gas/Capacity/2035.csv
new file mode 100644
index 000000000..c232f0772
--- /dev/null
+++ b/tests/example_outputs/trade/Gas/Capacity/2035.csv
@@ -0,0 +1,7 @@
+dst_region,year,asset,region,technology,installed,capacity
+R1,2035,0,R1,gassupply1,2010,1470.00000000000
+R2,2035,1,R2,gassupply1,2010,490.00000000000
+R1,2040,0,R1,gassupply1,2010,1470.00000000000
+R2,2040,1,R2,gassupply1,2010,490.00000000000
+R1,2050,0,R1,gassupply1,2010,1029.00000000000
+R2,2050,1,R2,gassupply1,2010,343.00000000000
diff --git a/tests/example_outputs/trade/Power/Capacity/2020.csv b/tests/example_outputs/trade/Power/Capacity/2020.csv
new file mode 100644
index 000000000..66b1b1731
--- /dev/null
+++ b/tests/example_outputs/trade/Power/Capacity/2020.csv
@@ -0,0 +1,15 @@
+dst_region,year,asset,region,technology,installed,capacity
+R1,2020,0,R1,gasCCGT,2010,240.00000000000
+R2,2020,1,R2,gasCCGT,2010,200.00000000000
+R1,2025,0,R1,gasCCGT,2010,192.00000000000
+R2,2025,1,R2,gasCCGT,2010,140.00000000000
+R1,2030,0,R1,gasCCGT,2010,153.60000000000
+R2,2030,1,R2,gasCCGT,2010,98.00000000000
+R1,2035,0,R1,gasCCGT,2010,122.88000000000
+R2,2035,1,R2,gasCCGT,2010,68.60000000000
+R1,2040,0,R1,gasCCGT,2010,98.30400000000
+R2,2040,1,R2,gasCCGT,2010,48.02000000000
+R1,2045,0,R1,gasCCGT,2010,78.64320000000
+R2,2045,1,R2,gasCCGT,2010,33.61400000000
+R1,2050,0,R1,gasCCGT,2010,62.91460000000
+R2,2050,1,R2,gasCCGT,2010,23.52980000000
diff --git a/tests/example_outputs/trade/Power/Capacity/2025.csv b/tests/example_outputs/trade/Power/Capacity/2025.csv
new file mode 100644
index 000000000..2e29060bd
--- /dev/null
+++ b/tests/example_outputs/trade/Power/Capacity/2025.csv
@@ -0,0 +1,13 @@
+dst_region,year,asset,region,technology,installed,capacity
+R1,2025,0,R1,gasCCGT,2010,192.00000000000
+R2,2025,1,R2,gasCCGT,2010,140.00000000000
+R1,2030,0,R1,gasCCGT,2010,153.60000000000
+R2,2030,1,R2,gasCCGT,2010,98.00000000000
+R1,2035,0,R1,gasCCGT,2010,122.88000000000
+R2,2035,1,R2,gasCCGT,2010,68.60000000000
+R1,2040,0,R1,gasCCGT,2010,98.30400000000
+R2,2040,1,R2,gasCCGT,2010,48.02000000000
+R1,2045,0,R1,gasCCGT,2010,78.64320000000
+R2,2045,1,R2,gasCCGT,2010,33.61400000000
+R1,2050,0,R1,gasCCGT,2010,62.91460000000
+R2,2050,1,R2,gasCCGT,2010,23.52980000000
diff --git a/tests/example_outputs/trade/Power/Capacity/2030.csv b/tests/example_outputs/trade/Power/Capacity/2030.csv
new file mode 100644
index 000000000..bb6edddab
--- /dev/null
+++ b/tests/example_outputs/trade/Power/Capacity/2030.csv
@@ -0,0 +1,11 @@
+dst_region,year,asset,region,technology,installed,capacity
+R1,2030,0,R1,gasCCGT,2010,153.60000000000
+R2,2030,1,R2,gasCCGT,2010,98.00000000000
+R1,2035,0,R1,gasCCGT,2010,122.88000000000
+R2,2035,1,R2,gasCCGT,2010,68.60000000000
+R1,2040,0,R1,gasCCGT,2010,98.30400000000
+R2,2040,1,R2,gasCCGT,2010,48.02000000000
+R1,2045,0,R1,gasCCGT,2010,78.64320000000
+R2,2045,1,R2,gasCCGT,2010,33.61400000000
+R1,2050,0,R1,gasCCGT,2010,62.91460000000
+R2,2050,1,R2,gasCCGT,2010,23.52980000000
diff --git a/tests/example_outputs/trade/Power/Capacity/2035.csv b/tests/example_outputs/trade/Power/Capacity/2035.csv
new file mode 100644
index 000000000..768699fc8
--- /dev/null
+++ b/tests/example_outputs/trade/Power/Capacity/2035.csv
@@ -0,0 +1,9 @@
+dst_region,year,asset,region,technology,installed,capacity
+R1,2035,0,R1,gasCCGT,2010,122.88000000000
+R2,2035,1,R2,gasCCGT,2010,68.60000000000
+R1,2040,0,R1,gasCCGT,2010,98.30400000000
+R2,2040,1,R2,gasCCGT,2010,48.02000000000
+R1,2045,0,R1,gasCCGT,2010,78.64320000000
+R2,2045,1,R2,gasCCGT,2010,33.61400000000
+R1,2050,0,R1,gasCCGT,2010,62.91460000000
+R2,2050,1,R2,gasCCGT,2010,23.52980000000
diff --git a/tests/example_outputs/trade/Residential/Capacity/2020.csv b/tests/example_outputs/trade/Residential/Capacity/2020.csv
new file mode 100644
index 000000000..67b762ddf
--- /dev/null
+++ b/tests/example_outputs/trade/Residential/Capacity/2020.csv
@@ -0,0 +1,18 @@
+asset,year,region,technology,installed,capacity
+0,2020,R1,gasboiler,2010,662.76000000000
+0,2025,R1,gasboiler,2010,463.93200000000
+0,2030,R1,gasboiler,2010,463.93200000000
+0,2034,R1,gasboiler,2010,408.26020000000
+0,2035,R1,gasboiler,2010,394.34220000000
+0,2040,R1,gasboiler,2010,324.75240000000
+0,2050,R1,gasboiler,2010,227.32670000000
+1,2025,R1,gasboiler,2020,355.93470000000
+1,2030,R1,gasboiler,2020,355.93470000000
+1,2034,R1,gasboiler,2020,355.93470000000
+2,2020,R2,gasboiler,2010,35.00000000000
+2,2025,R2,gasboiler,2010,24.50000000000
+2,2030,R2,gasboiler,2010,24.50000000000
+2,2034,R2,gasboiler,2010,21.56000000000
+2,2035,R2,gasboiler,2010,20.82500000000
+2,2040,R2,gasboiler,2010,17.15000000000
+2,2050,R2,gasboiler,2010,12.00500000000
diff --git a/tests/example_outputs/trade/Residential/Capacity/2025.csv b/tests/example_outputs/trade/Residential/Capacity/2025.csv
new file mode 100644
index 000000000..7a0a26c09
--- /dev/null
+++ b/tests/example_outputs/trade/Residential/Capacity/2025.csv
@@ -0,0 +1,22 @@
+asset,year,region,technology,installed,capacity
+0,2025,R1,gasboiler,2010,463.93200000000
+0,2030,R1,gasboiler,2010,463.93200000000
+0,2034,R1,gasboiler,2010,408.26020000000
+0,2035,R1,gasboiler,2010,394.34220000000
+0,2039,R1,gasboiler,2010,338.67040000000
+0,2040,R1,gasboiler,2010,324.75240000000
+0,2050,R1,gasboiler,2010,227.32670000000
+1,2025,R1,gasboiler,2020,355.93470000000
+1,2030,R1,gasboiler,2020,355.93470000000
+1,2034,R1,gasboiler,2020,355.93470000000
+2,2030,R1,gasboiler,2025,74.53330000000
+2,2034,R1,gasboiler,2025,74.53330000000
+2,2035,R1,gasboiler,2025,74.53330000000
+2,2039,R1,gasboiler,2025,74.53330000000
+3,2025,R2,gasboiler,2010,24.50000000000
+3,2030,R2,gasboiler,2010,24.50000000000
+3,2034,R2,gasboiler,2010,21.56000000000
+3,2035,R2,gasboiler,2010,20.82500000000
+3,2039,R2,gasboiler,2010,17.88500000000
+3,2040,R2,gasboiler,2010,17.15000000000
+3,2050,R2,gasboiler,2010,12.00500000000
diff --git a/tests/example_outputs/trade/Residential/Capacity/2030.csv b/tests/example_outputs/trade/Residential/Capacity/2030.csv
new file mode 100644
index 000000000..1609a5d56
--- /dev/null
+++ b/tests/example_outputs/trade/Residential/Capacity/2030.csv
@@ -0,0 +1,32 @@
+asset,year,region,technology,installed,capacity
+0,2030,R1,gasboiler,2010,463.93200000000
+0,2034,R1,gasboiler,2010,408.26020000000
+0,2035,R1,gasboiler,2010,394.34220000000
+0,2039,R1,gasboiler,2010,338.67040000000
+0,2040,R1,gasboiler,2010,324.75240000000
+0,2044,R1,gasboiler,2010,285.78210000000
+0,2045,R1,gasboiler,2010,276.03950000000
+0,2050,R1,gasboiler,2010,227.32670000000
+1,2030,R1,gasboiler,2020,355.93470000000
+1,2034,R1,gasboiler,2020,355.93470000000
+2,2030,R1,gasboiler,2025,74.53330000000
+2,2034,R1,gasboiler,2025,74.53330000000
+2,2035,R1,gasboiler,2025,74.53330000000
+2,2039,R1,gasboiler,2025,74.53330000000
+3,2035,R1,gasboiler,2030,444.15780000000
+3,2039,R1,gasboiler,2030,444.15780000000
+3,2040,R1,gasboiler,2030,444.15780000000
+3,2044,R1,gasboiler,2030,444.15780000000
+4,2030,R2,gasboiler,2010,24.50000000000
+4,2034,R2,gasboiler,2010,18.62000000000
+4,2035,R2,gasboiler,2010,17.15000000000
+4,2039,R2,gasboiler,2010,17.15000000000
+4,2040,R2,gasboiler,2010,17.15000000000
+4,2044,R2,gasboiler,2010,15.09200000000
+4,2045,R2,gasboiler,2010,14.57750000000
+4,2050,R2,gasboiler,2010,12.00500000000
+5,2034,R2,gasboiler,2030,1.00000000000
+5,2035,R2,gasboiler,2030,1.63330000000
+5,2039,R2,gasboiler,2030,1.63330000000
+5,2040,R2,gasboiler,2030,1.63330000000
+5,2044,R2,gasboiler,2030,1.63330000000
diff --git a/tests/example_outputs/trade/Residential/Capacity/2035.csv b/tests/example_outputs/trade/Residential/Capacity/2035.csv
new file mode 100644
index 000000000..ab3a38486
--- /dev/null
+++ b/tests/example_outputs/trade/Residential/Capacity/2035.csv
@@ -0,0 +1,34 @@
+asset,year,region,technology,installed,capacity
+0,2035,R1,gasboiler,2010,394.34220000000
+0,2039,R1,gasboiler,2010,338.67040000000
+0,2040,R1,gasboiler,2010,324.75240000000
+0,2044,R1,gasboiler,2010,285.78210000000
+0,2045,R1,gasboiler,2010,276.03950000000
+0,2049,R1,gasboiler,2010,237.06930000000
+0,2050,R1,gasboiler,2010,227.32670000000
+1,2035,R1,gasboiler,2025,74.53330000000
+1,2039,R1,gasboiler,2025,74.53330000000
+2,2035,R1,gasboiler,2030,444.15780000000
+2,2039,R1,gasboiler,2030,444.15780000000
+2,2040,R1,gasboiler,2030,444.15780000000
+2,2044,R1,gasboiler,2030,444.15780000000
+3,2040,R1,gasboiler,2035,162.75650000000
+3,2044,R1,gasboiler,2035,162.75650000000
+3,2045,R1,gasboiler,2035,162.75650000000
+3,2049,R1,gasboiler,2035,162.75650000000
+4,2035,R2,gasboiler,2010,17.15000000000
+4,2039,R2,gasboiler,2010,17.15000000000
+4,2040,R2,gasboiler,2010,17.15000000000
+4,2044,R2,gasboiler,2010,15.09200000000
+4,2045,R2,gasboiler,2010,14.57750000000
+4,2049,R2,gasboiler,2010,12.51950000000
+4,2050,R2,gasboiler,2010,12.00500000000
+5,2035,R2,gasboiler,2030,1.63330000000
+5,2039,R2,gasboiler,2030,1.63330000000
+5,2040,R2,gasboiler,2030,1.63330000000
+5,2044,R2,gasboiler,2030,1.63330000000
+6,2039,R2,gasboiler,2035,0.30670000000
+6,2040,R2,gasboiler,2035,0.38330000000
+6,2044,R2,gasboiler,2035,0.38330000000
+6,2045,R2,gasboiler,2035,0.38330000000
+6,2049,R2,gasboiler,2035,0.38330000000
diff --git a/tests/test_constraints.py b/tests/test_constraints.py
index 25adaff09..e88149ed8 100644
--- a/tests/test_constraints.py
+++ b/tests/test_constraints.py
@@ -170,6 +170,9 @@ def test_max_production_constraint_diagonal(constraint, lpcosts):
     )
     decision_dims = {f"d({x})" for x in lpcosts.production.dims}
     assert set(result.dims) == decision_dims.union(constraint_dims)
+    result = result.reset_index("d(timeslice)", drop=True).assign_coords(
+        {"d(timeslice)": result["d(timeslice)"].values}
+    )
     stacked = result.stack(d=sorted(decision_dims), c=sorted(constraint_dims))
     assert stacked.shape[0] == stacked.shape[1]
     assert stacked.values == approx(np.eye(stacked.shape[0]))
@@ -403,9 +406,13 @@ def test_scipy_adapter_back_to_muse(technologies, costs, timeslices, rng):
 def _as_list(data: Union[xr.DataArray, xr.Dataset]) -> Union[xr.DataArray, xr.Dataset]:
     if "timeslice" in data.dims:
         data = data.copy(deep=False)
-        data["timeslice"] = pd.MultiIndex.from_tuples(
+        index = pd.MultiIndex.from_tuples(
             data.get_index("timeslice"), names=("month", "day", "hour")
         )
+        mindex_coords = xr.Coordinates.from_pandas_multiindex(index, "timeslice")
+        data = data.drop_vars(["timeslice", "month", "day", "hour"]).assign_coords(
+            mindex_coords
+        )
     return data
 
 
diff --git a/tests/test_demand_share.py b/tests/test_demand_share.py
index 642c68798..cb9ccbd63 100644
--- a/tests/test_demand_share.py
+++ b/tests/test_demand_share.py
@@ -27,7 +27,7 @@ def _matching_market(technologies, stock, timeslice):
     market["supply"] = production.sum("asset")
     market["consumption"] = (
         consumption(technologies, production).sum("asset") + market.supply
-    )
+    ).drop_vars(["timeslice", "month", "day", "hour"])
     market["prices"] = market.supply.dims, random(market.supply.shape)
 
     return market
diff --git a/tests/test_fullsim_regression.py b/tests/test_fullsim_regression.py
index 54e41dbcd..8e285a5e8 100644
--- a/tests/test_fullsim_regression.py
+++ b/tests/test_fullsim_regression.py
@@ -6,6 +6,7 @@
 
 @mark.usefixtures("save_timeslice_globals")
 @mark.regression
+@mark.example
 @mark.parametrize("model", available_examples())
 def test_fullsim_regression(model, tmpdir, compare_dirs):
     from warnings import simplefilter
@@ -39,6 +40,7 @@ def available_tutorials():
 
 @mark.usefixtures("save_timeslice_globals")
 @mark.regression
+@mark.tutorial
 @mark.parametrize("tutorial_path", available_tutorials())
 def test_tutorial_regression(tutorial_path, tmpdir, compare_dirs):
     import shutil
diff --git a/tests/test_mca.py b/tests/test_mca.py
index b82fac82c..d1b4fb8ea 100644
--- a/tests/test_mca.py
+++ b/tests/test_mca.py
@@ -16,14 +16,20 @@ def test_check_equilibrium(market: Dataset):
     new_market = market.copy(deep=True)
 
     assert check_equilibrium(new_market, market, tol, equilibrium_variable)
-    new_market["supply"] += tol * 1.5
+    new_market["supply"] = (
+        new_market["supply"].drop_vars(["timeslice", "month", "day", "hour"])
+        + tol * 1.5
+    )
 
     assert not check_equilibrium(new_market, market, tol, equilibrium_variable)
 
     equilibrium_variable = "prices"
 
     assert check_equilibrium(new_market, market, tol, equilibrium_variable)
-    new_market["prices"] += tol * 1.5
+    new_market["prices"] = (
+        new_market["prices"].drop_vars(["timeslice", "month", "day", "hour"])
+        + tol * 1.5
+    )
     assert not check_equilibrium(new_market, market, tol, equilibrium_variable)
 
 
@@ -33,12 +39,17 @@ def test_check_demand_fulfillment(market):
 
     tolerance_unmet_demand = -0.1
 
-    market["supply"] = market.consumption.copy(deep=True)
+    market["supply"] = market.consumption.copy(deep=True).drop_vars(
+        ["timeslice", "month", "day", "hour"]
+    )
     assert check_demand_fulfillment(
         market,
         tolerance_unmet_demand,
     )
-    market["supply"] += tolerance_unmet_demand * 1.5
+    market["supply"] = (
+        market["supply"].drop_vars(["timeslice", "month", "day", "hour"])
+        + tolerance_unmet_demand * 1.5
+    )
     assert not check_demand_fulfillment(
         market,
         tolerance_unmet_demand,
diff --git a/tests/test_quantities.py b/tests/test_quantities.py
index da99c3db1..de16b0c0b 100644
--- a/tests/test_quantities.py
+++ b/tests/test_quantities.py
@@ -459,7 +459,7 @@ def test_costed_production_exact_match(market, capacity, technologies):
         market,
         QuantityType.EXTENSIVE,
     )
-    market["consumption"] = maxdemand
+    market["consumption"] = maxdemand.drop_vars(["timeslice", "month", "day", "hour"])
     result = costed_production(market.consumption, costs, capacity, technologies)
     assert isinstance(result, xr.DataArray)
     actual = xr.Dataset(dict(r=result)).groupby("region").sum("asset").r
@@ -486,7 +486,9 @@ def test_costed_production_single_region(market, capacity, technologies):
         market,
         QuantityType.EXTENSIVE,
     )
-    market["consumption"] = 0.9 * maxdemand
+    market["consumption"] = (0.9 * maxdemand).drop_vars(
+        ["timeslice", "month", "day", "hour"]
+    )
     technodata = broadcast_techs(technologies, capacity)
     costs = annual_levelized_cost_of_energy(
         market.prices.sel(region=technodata.region), technodata
@@ -519,7 +521,9 @@ def test_costed_production_single_year(market, capacity, technologies):
         market,
         QuantityType.EXTENSIVE,
     )
-    market["consumption"] = 0.9 * maxdemand
+    market["consumption"] = (0.9 * maxdemand).drop_vars(
+        ["timeslice", "month", "day", "hour"]
+    )
     technodata = broadcast_techs(technologies, capacity)
     costs = annual_levelized_cost_of_energy(
         market.prices.sel(region=technodata.region), technodata
@@ -555,7 +559,9 @@ def test_costed_production_over_capacity(market, capacity, technologies):
         market,
         QuantityType.EXTENSIVE,
     )
-    market["consumption"] = maxdemand * 0.9
+    market["consumption"] = (maxdemand * 0.9).drop_vars(
+        ["timeslice", "month", "day", "hour"]
+    )
     technodata = broadcast_techs(technologies, capacity)
     costs = annual_levelized_cost_of_energy(
         market.prices.sel(region=technodata.region), technodata
@@ -591,7 +597,9 @@ def test_costed_production_with_minimum_service(market, capacity, technologies,
     )
     minprod = maxprod * broadcast_techs(technologies.minimum_service_factor, maxprod)
     maxdemand = xr.Dataset(dict(mp=minprod)).groupby("region").sum("asset").mp
-    market["consumption"] = maxdemand * 0.9
+    market["consumption"] = (maxdemand * 0.9).drop_vars(
+        ["timeslice", "month", "day", "hour"]
+    )
     technodata = broadcast_techs(technologies, capacity)
     costs = annual_levelized_cost_of_energy(
         market.prices.sel(region=technodata.region), technodata